From fb3f7aa747d4d196abd3963ef1cbdfae910551a5 Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Tue, 10 Jan 2012 13:35:59 +0100
Subject: [PATCH 001/312] [IMP] delivery: move picking's net weight to extended
 view

bzr revid: ls@numerigraphe.fr-20120110123559-1llywc42k606hryj
---
 addons/delivery/delivery_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index c46253777d2..47ed9d6d274 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -194,7 +194,7 @@
                     <field name="carrier_tracking_ref" groups="base.group_extended"/>
                     <field name="number_of_packages" groups="base.group_extended"/>
                     <field name="weight"/>
-                    <field name="weight_net"/>
+                    <field name="weight_net" groups="base.group_extended/>
                 </field>
             </field>
         </record>
@@ -207,7 +207,7 @@
             <field name="arch" type="xml">
                 <field name="type" position="after">
                     <field name="weight"/>
-                    <field name="weight_net"/>
+                    <field name="weight_net" groups="base.group_extended/>
                 </field>
             </field>
         </record>
@@ -220,7 +220,7 @@
             <field name="arch" type="xml">
                 <field name="type" position="after">
                     <field name="weight"/>
-                    <field name="weight_net"/>
+                    <field name="weight_net" groups="base.group_extended"/>
                 </field>
             </field>
         </record>
@@ -245,7 +245,7 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
-                    <field name="weight_net"/>
+                    <field name="weight_net" groups="base.group_extended"/>
                 </xpath>
             </field>
         </record>
@@ -258,7 +258,7 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
-                    <field name="weight_net"/>
+                    <field name="weight_net" groups="base.group_extended"/>
                 </xpath>
             </field>
         </record>
@@ -271,7 +271,7 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
-                    <field name="weight_net"/>
+                    <field name="weight_net" groups="base.group_extended"/>
                 </xpath>
             </field>
         </record>

From 32781b0268a8b3583869cd14809e466568ee2a7f Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Mon, 16 Jan 2012 11:34:06 +0100
Subject: [PATCH 002/312] [FIX] typo in XML file

bzr revid: ls@numerigraphe.fr-20120116103406-gwx3w8zlnrnvlyyr
---
 addons/delivery/delivery_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 47ed9d6d274..6c9e8c85cdb 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -194,7 +194,7 @@
                     <field name="carrier_tracking_ref" groups="base.group_extended"/>
                     <field name="number_of_packages" groups="base.group_extended"/>
                     <field name="weight"/>
-                    <field name="weight_net" groups="base.group_extended/>
+                    <field name="weight_net" groups="base.group_extended"/>
                 </field>
             </field>
         </record>
@@ -207,7 +207,7 @@
             <field name="arch" type="xml">
                 <field name="type" position="after">
                     <field name="weight"/>
-                    <field name="weight_net" groups="base.group_extended/>
+                    <field name="weight_net" groups="base.group_extended"/>
                 </field>
             </field>
         </record>

From 438cde1f2f9b6204a0cb71338eacc7dfa1fab4e9 Mon Sep 17 00:00:00 2001
From: "nicolas.bessi@camptocamp.com" <>
Date: Wed, 8 Feb 2012 11:37:15 +0100
Subject: [PATCH 003/312] [FIX] l10n_ch bvr report to follow last patches of
 report_webkit addons

bzr revid: nicolas.bessi@camptocamp.com-20120208103715-gk6upkf3b47av9h1
---
 addons/l10n_ch/report/report_webkit_html.py | 154 +++++++-------------
 1 file changed, 51 insertions(+), 103 deletions(-)

diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py
index e6f7239c4e4..72158361da7 100644
--- a/addons/l10n_ch/report/report_webkit_html.py
+++ b/addons/l10n_ch/report/report_webkit_html.py
@@ -20,22 +20,31 @@
 ##############################################################################
 
 import time
-from report import report_sxw
-from report_webkit import webkit_report
-from report_webkit import report_helper 
-from osv import osv
-from tools import mod10r
 import sys
 import os
 import re
+
+from mako.template import Template
+from mako.lookup import TemplateLookup
+from mako import exceptions
+
+
+from report import report_sxw
+from report_webkit import webkit_report
+from report_webkit import report_helper 
+
+from osv import osv
+from osv.osv import except_osv
+
+from tools import mod10r
+from tools.translate import _
+from tools.config import config
+
 import wizard
 import addons
 import pooler
-from tools.config import config
-from mako.template import Template
-from mako import exceptions
-from tools.translate import _
-from osv.osv import except_osv
+
+
 
 
 class l10n_ch_report_webkit_html(report_sxw.rml_parse):
@@ -143,53 +152,26 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
                           'digits!\nPlease check your company '
                           'information for the invoice:\n%s') %(invoice_name)))
         return ''
+        
+def mako_template(text):
+    """Build a Mako template.
+
+    This template uses UTF-8 encoding
+    """
+    tmp_lookup  = TemplateLookup() #we need it in order to allow inclusion and inheritance
+    return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup)
 
 class BVRWebKitParser(webkit_report.WebKitParser):
     
-    def setLang(self, lang):
-        if not lang:
-            lang = 'en_US'
-        self.localcontext['lang'] = lang
-        
-    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):
-        """format using the know cursor, language from localcontext"""
-        if digits is None:
-            digits = self.parser_instance.get_digits(value)
-        if isinstance(value, (str, unicode)) and not value:
-            return ''
-        pool_lang = self.pool.get('res.lang')
-        lang = self.localcontext['lang']
-
-        lang_ids = pool_lang.search(self.parser_instance.cr, self.parser_instance.uid, [('code','=',lang)])[0]
-        lang_obj = pool_lang.browse(self.parser_instance.cr, self.parser_instance.uid, lang_ids)
-
-        if date or date_time:
-            if not str(value):
-                return ''
-
-            date_format = lang_obj.date_format
-            parse_format = '%Y-%m-%d'
-            if date_time:
-                value=value.split('.')[0]
-                date_format = date_format + " " + lang_obj.time_format
-                parse_format = '%Y-%m-%d %H:%M:%S'
-            if not isinstance(value, time.struct_time):
-                return time.strftime(date_format, time.strptime(value, parse_format))
-
-            else:
-                date = datetime(*value.timetuple()[:6])
-            return date.strftime(date_format)
-
-        return lang_obj.format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
-    
     def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None):
         """generate the PDF"""
-        self.parser_instance = self.parser(
-                                            cursor, 
+        context = context or {}
+        if report_xml.report_type != 'webkit':
+            return super(WebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context)
+        self.parser_instance = self.parser(cursor, 
                                             uid, 
                                             self.name2, 
-                                            context=context
-                                        )
+                                            context=context)
         self.pool = pooler.get_pool(cursor.dbname)
         objs = self.getObjects(cursor, uid, ids, context)
         self.parser_instance.set_context(objs, data, ids, report_xml.report_type)
@@ -201,7 +183,7 @@ class BVRWebKitParser(webkit_report.WebKitParser):
         if not template and report_xml.report_webkit_data :
             template =  report_xml.report_webkit_data
         if not template :
-            raise except_osv(_('Webkit Report template not found !'), _(''))
+            raise except_osv(_('Error'),_('Webkit Report template not found !'))
         header = report_xml.webkit_header.html
         footer = report_xml.webkit_header.footer_html
         if not header and report_xml.header:
@@ -210,43 +192,19 @@ class BVRWebKitParser(webkit_report.WebKitParser):
                 _('Please set a header in company settings')
             )
         if not report_xml.header :
-            #I know it could be cleaner ...
-            header = u"""
-<html>
-    <head>
-        <style type="text/css"> 
-            ${css}
-        </style>
-        <script>
-        function subst() {
-           var vars={};
-           var x=document.location.search.substring(1).split('&');
-           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
-           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
-           for(var i in x) {
-             var y = document.getElementsByClassName(x[i]);
-             for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
-           }
-         }
-        </script>
-    </head>
-<body style="border:0; margin: 0;" onload="subst()">
-</body>
-</html>"""
-        self.parser_instance.localcontext.update({'setLang':self.setLang})
-        self.parser_instance.localcontext.update({'formatLang':self.formatLang})
+            header = ''
+            default_head = addons.get_module_resource('report_webkit', 'default_header.html')
+            with open(default_head,'r') as f:
+                header = f.read()
         css = report_xml.webkit_header.css
         if not css :
             css = ''
         user = self.pool.get('res.users').browse(cursor, uid, uid)
         company = user.company_id
-        parse_template = template
-        #default_filters=['unicode', 'entity'] can be used to set global filter
-        body_mako_tpl = Template(parse_template ,input_encoding='utf-8', output_encoding='utf-8')
+        body_mako_tpl = mako_template(template)
         #BVR specific
         bvr_path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr.mako'))
-        body_bvr_tpl = Template(file(bvr_path).read(), input_encoding='utf-8', output_encoding='utf-8')
-
+        body_bvr_tpl = mako_template(file(bvr_path).read())
         helper = report_helper.WebKitHelper(cursor, uid, report_xml.id, context)
         ##BVR Specific
         htmls = []
@@ -254,58 +212,48 @@ class BVRWebKitParser(webkit_report.WebKitParser):
             self.parser_instance.localcontext['objects'] = [obj]
             if not company.bvr_only:
                 try:
-                    html = body_mako_tpl.render(
-                                                helper=helper, 
+                    html = body_mako_tpl.render(helper=helper, 
                                                 css=css,
                                                 _=self.translate_call,
-                                                **self.parser_instance.localcontext
-                                                )
+                                                **self.parser_instance.localcontext)
                 except Exception, e:
                    raise Exception(exceptions.text_error_template().render())
                 htmls.append(html)
             if not company.invoice_only:
                 try:
-                    bvr = body_bvr_tpl.render(
-                                        helper=helper, 
-                                        css=css,
-                                        _=self.translate_call,
-                                        **self.parser_instance.localcontext
-                                        )
+                    bvr = body_bvr_tpl.render(helper=helper, 
+                                              css=css,
+                                              _=self.translate_call,
+                                              **self.parser_instance.localcontext)
                 except Exception, e:
                    raise Exception(exceptions.text_error_template().render())
                 htmls.append(bvr)                            
         head_mako_tpl = Template(header, input_encoding='utf-8', output_encoding='utf-8')
         try:
-            head = head_mako_tpl.render(
-                                        helper=helper, 
+            head = head_mako_tpl.render(helper=helper, 
                                         css=css,
                                         _debug=False,
                                         _=self.translate_call,
-                                        **self.parser_instance.localcontext
-                                    )
+                                        **self.parser_instance.localcontext)
         except Exception, e:
            raise Exception(exceptions.text_error_template().render())
         foot = False
         if footer and company.invoice_only :
             foot_mako_tpl = Template(footer, input_encoding='utf-8', output_encoding='utf-8')
             try:
-                foot = foot_mako_tpl.render(
-                                            helper=helper, 
+                foot = foot_mako_tpl.render(helper=helper, 
                                             css=css, 
                                             _=self.translate_call,
-                                            **self.parser_instance.localcontext
-                                            )
+                                            **self.parser_instance.localcontext)
             except Exception, e:
                raise Exception(exceptions.text_error_template().render())
         if report_xml.webkit_debug :
             try:
-                deb = head_mako_tpl.render(
-                                            helper=helper, 
+                deb = head_mako_tpl.render(helper=helper, 
                                             css=css, 
                                             _debug=html,
                                             _=self.translate_call,
-                                            **self.parser_instance.localcontext
-                                            )
+                                            **self.parser_instance.localcontext)
             except Exception, e:
                raise Exception(exceptions.text_error_template().render())
             return (deb, 'html')

From 4c54457489044ad7c7e4f8c54241e32dba6d4a10 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 20 Feb 2012 15:00:37 +0530
Subject: [PATCH 004/312] [FIX]purchase: added domain of supplier in the
 partner_id field

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

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

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1c936055aff..e358bfc2ced 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -172,7 +172,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"  options='{"quick_create": false}'/>
+                            <field name="partner_id" domain="[('supplier','=',True)]" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"  options='{"quick_create": false}'/>
                             <field name="partner_address_id" options='{"quick_create": false}'/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="origin" groups="base.group_extended"/>

From 156da2b3503a4449106fa78a2883431e1f6663aa Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
Date: Sat, 9 Jun 2012 11:45:22 -0400
Subject: [PATCH 005/312] [IMP] Use account.data_account_type. Remove notax.
 Improve chart of taxes.

bzr revid: maxime.chambreuil@savoirfairelinux.com-20120609154522-htduc8596i18pj93
---
 addons/l10n_ca/__openerp__.py          |   2 -
 addons/l10n_ca/account_chart_en.xml    | 166 +++---
 addons/l10n_ca/account_chart_fr.xml    | 174 +++---
 addons/l10n_ca/account_tax_code_en.xml |  18 +-
 addons/l10n_ca/account_tax_code_fr.xml |  16 +-
 addons/l10n_ca/account_tax_en.xml      | 481 +++++++++++++----
 addons/l10n_ca/account_tax_fr.xml      | 477 +++++++++++++----
 addons/l10n_ca/account_types_en.xml    |  64 ---
 addons/l10n_ca/account_types_fr.xml    |  79 ---
 addons/l10n_ca/fiscal_templates_en.xml | 712 +++++++++++++++++--------
 addons/l10n_ca/fiscal_templates_fr.xml | 522 +++++++++++++-----
 11 files changed, 1828 insertions(+), 883 deletions(-)
 delete mode 100644 addons/l10n_ca/account_types_en.xml
 delete mode 100644 addons/l10n_ca/account_types_fr.xml

diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 800ca7937eb..bd5fe4e6ea0 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -33,13 +33,11 @@ Canadian accounting charts and localizations.
     "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
     "init_xml" : [],
     "update_xml" : [
-        'account_types_en.xml',
         'account_chart_en.xml',
         'account_tax_code_en.xml',
         'account_chart_template_en.xml',
         'account_tax_en.xml',
         'fiscal_templates_en.xml',
-        'account_types_fr.xml',
         'account_chart_fr.xml',
         'account_tax_code_fr.xml',
         'account_chart_template_fr.xml',
diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 26db0bcef95..14cbc993b2b 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -8,7 +8,7 @@
             <field name="name">Account Chart CA EN</field>
             <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="user_type_view_en"/>
+            <field name="user_type" ref="account.data_account_type_view"/>
         </record>
 
 	<!-- ASSET -->
@@ -17,7 +17,7 @@
 		<field name="code">1</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ASSETS</field>
 	</record>
 	
@@ -25,7 +25,7 @@
 		<field name="code">11</field>
 		<field name="parent_id" ref="chart1_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT ASSETS</field>
 	</record>
 	
@@ -33,7 +33,7 @@
 		<field name="code">111</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CASH</field>
 	</record>
 
@@ -41,7 +41,7 @@
 		<field name="code">1111</field>
 		<field name="parent_id" ref="chart111_en"/>
 		<field name="type">liquidity</field>
-		<field name="user_type" ref="user_type_asset_en"/>
+		<field name="user_type" ref="account.data_account_type_bank"/>
 		<field name="name">Checking Account</field>
 	</record>
 
@@ -49,7 +49,7 @@
 		<field name="code">112</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TREASURY OR TREASURY EQUIVALENTS</field>
 	</record>
 
@@ -57,7 +57,7 @@
 		<field name="code">113</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CERTIFICATES OF DEPOSITS</field>
 	</record>
 
@@ -65,7 +65,7 @@
 		<field name="code">114</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">STOCKS</field>
 	</record>
 
@@ -73,7 +73,7 @@
 		<field name="code">115</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACCOUNTS RECEIVABLES</field>
 	</record>
 
@@ -81,7 +81,7 @@
 		<field name="code">1151</field>
 		<field name="parent_id" ref="chart115_en"/>
 		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Customers Account</field>
 	</record>
@@ -90,7 +90,7 @@
 		<field name="code">1152</field>
 		<field name="parent_id" ref="chart115_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ALLOWANCE FOR DOUBTFUL ACCOUNTS</field>
 	</record>
 
@@ -98,7 +98,7 @@
 		<field name="code">116</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PREPAID EXPENSES</field>
 	</record>
 
@@ -106,7 +106,7 @@
 		<field name="code">117</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INVESTMENTS HELD FOR TRADING</field>
 	</record>
 
@@ -114,15 +114,15 @@
 		<field name="code">118</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TAXES RECEIVABLES</field>
 	</record>
 
 	<record id="chart1181_en" model="account.account.template">
 		<field name="code">1181</field>
 		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">GST receivable</field>
 	</record>
@@ -130,8 +130,8 @@
 	<record id="chart1182_en" model="account.account.template">
 		<field name="code">1182</field>
 		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">PST/QST receivable</field>
 	</record>
@@ -139,8 +139,8 @@
 	<record id="chart1183_en" model="account.account.template">
 		<field name="code">1183</field>
 		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">HST receivable</field>
 	</record>
@@ -149,7 +149,7 @@
 		<field name="code">15</field>
 		<field name="parent_id" ref="chart1_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT ASSETS</field>
 	</record>
 
@@ -157,7 +157,7 @@
 		<field name="code">151</field>
 		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INVESTMENTS AVAILABLE FOR SALE</field>
 	</record>
 
@@ -165,7 +165,7 @@
 		<field name="code">152</field>
 		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TANGIBLE ASSETS</field>
 	</record>
 
@@ -173,7 +173,7 @@
 		<field name="code">1527</field>
 		<field name="parent_id" ref="chart152_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACCUMULATED DEPRECIATIONS</field>
 	</record>
 
@@ -181,7 +181,7 @@
 		<field name="code">153</field>
 		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTANGIBLE ASSETS</field>
 	</record>
 
@@ -189,7 +189,7 @@
 		<field name="code">1531</field>
 		<field name="parent_id" ref="chart153_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS</field>
 	</record>
 
@@ -199,7 +199,7 @@
 		<field name="code">2</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">LIABILITIES</field>
 	</record>
 
@@ -207,7 +207,7 @@
 		<field name="code">21</field>
 		<field name="parent_id" ref="chart2_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT LIABILITIES</field>
 	</record>
 
@@ -215,7 +215,7 @@
 		<field name="code">211</field>
 		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACCOUNTS PAYABLES</field>
 	</record>
 
@@ -223,7 +223,7 @@
 		<field name="code">2111</field>
 		<field name="parent_id" ref="chart211_en"/>
 		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Suppliers Account</field>
 	</record>
@@ -232,15 +232,15 @@
 		<field name="code">212</field>
 		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TAXES PAYABLES</field>
 	</record>
 
 	<record id="chart2121_en" model="account.account.template">
 		<field name="code">2121</field>
 		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">GST to pay</field>
 	</record>
@@ -248,8 +248,8 @@
 	<record id="chart2122_en" model="account.account.template">
 		<field name="code">2122</field>
 		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">PST/QST to pay</field>
 	</record>
@@ -257,8 +257,8 @@
 	<record id="chart2123_en" model="account.account.template">
 		<field name="code">2123</field>
 		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">HST to pay</field>
 	</record>
@@ -267,7 +267,7 @@
 		<field name="code">213</field>
 		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT FINANCIAL DEBTS</field>
 	</record>
 
@@ -275,7 +275,7 @@
 		<field name="code">25</field>
 		<field name="parent_id" ref="chart2_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT LIABILITIES</field>
 	</record>
 
@@ -283,7 +283,7 @@
 		<field name="code">251</field>
 		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT FINANCIAL DEBTS</field>
 	</record>
 
@@ -291,7 +291,7 @@
 		<field name="code">252</field>
 		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
 	</record>
 
@@ -299,7 +299,7 @@
 		<field name="code">253</field>
 		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DEFERRED TAXES</field>
 	</record>
 
@@ -307,7 +307,7 @@
 		<field name="code">259</field>
 		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-CURRENT LIABILITIES</field>
 	</record>
 
@@ -317,7 +317,7 @@
 		<field name="code">3</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">EQUITY</field>
 	</record>
 
@@ -325,7 +325,7 @@
 		<field name="code">31</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">SHARE CAPITAL</field>
 	</record>
 
@@ -333,7 +333,7 @@
 		<field name="code">32</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PREMIUMS</field>
 	</record>
 
@@ -341,7 +341,7 @@
 		<field name="code">33</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">RETAINED EARNINGS</field>
 	</record>
 
@@ -349,7 +349,7 @@
 		<field name="code">34</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DIVIDENDS</field>
 	</record>
 
@@ -357,7 +357,7 @@
 		<field name="code">35</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TRANSLATION ADJUSTMENTS</field>
 	</record>
 
@@ -365,7 +365,7 @@
 		<field name="code">36</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CONTRIBUTED SURPLUS</field>
 	</record>
 
@@ -375,7 +375,7 @@
 		<field name="code">4</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INCOMES</field>
 	</record>
 
@@ -383,7 +383,7 @@
 		<field name="code">41</field>
 		<field name="parent_id" ref="chart4_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OPERATING INCOMES</field>
 	</record>
 
@@ -391,7 +391,7 @@
 		<field name="code">411</field>
 		<field name="parent_id" ref="chart41_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_income_en"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Inside Sales</field>
 	</record>
 
@@ -399,7 +399,7 @@
                 <field name="code">412</field>
                 <field name="parent_id" ref="chart41_en"/>
                 <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en"/>
+                <field name="user_type" ref="account.data_account_type_income"/>
                 <field name="name">Harmonized Provinces Sales</field>
         </record>
 
@@ -407,7 +407,7 @@
                 <field name="code">413</field>
                 <field name="parent_id" ref="chart41_en"/>
                 <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en"/>
+                <field name="user_type" ref="account.data_account_type_income"/>
                 <field name="name">Non-Harmonized Provinces Sales</field>
         </record>
 
@@ -415,7 +415,7 @@
                 <field name="code">414</field>
                 <field name="parent_id" ref="chart41_en"/>
                 <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en"/>
+                <field name="user_type" ref="account.data_account_type_income"/>
                 <field name="name">International Sales</field>
         </record>
 
@@ -423,7 +423,7 @@
 		<field name="code">419</field>
 		<field name="parent_id" ref="chart41_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER OPERATING INCOMES</field>
 	</record>
 
@@ -431,7 +431,7 @@
 		<field name="code">42</field>
 		<field name="parent_id" ref="chart4_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-OPERATING INCOMES</field>
 	</record>
 
@@ -439,7 +439,7 @@
 		<field name="code">421</field>
 		<field name="parent_id" ref="chart42_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTERESTS</field>
 	</record>
 
@@ -447,7 +447,7 @@
 		<field name="code">429</field>
 		<field name="parent_id" ref="chart42_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-OPERATING INCOMES</field>
 	</record>
 
@@ -457,7 +457,7 @@
 		<field name="code">5</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">EXPENSES</field>
 	</record>
 
@@ -465,7 +465,7 @@
 		<field name="code">51</field>
 		<field name="parent_id" ref="chart5_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OPERATING EXPENSES</field>
 	</record>
 
@@ -473,7 +473,7 @@
 		<field name="code">511</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">COST OF GOODS SOLD</field>
 	</record>
 
@@ -481,7 +481,7 @@
 		<field name="code">5111</field>
 		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Inside Purchases</field>
 	</record>
 
@@ -489,7 +489,7 @@
 		<field name="code">5112</field>
 		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Purchases in harmonized provinces</field>
 	</record>
 
@@ -497,7 +497,7 @@
 		<field name="code">5113</field>
 		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Purchases in non-harmonized provinces</field>
 	</record>
 
@@ -505,7 +505,7 @@
 		<field name="code">5114</field>
 		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">International Purchases</field>
 	</record>
 
@@ -513,7 +513,7 @@
 		<field name="code">512</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">LABOUR EXPENSES</field>
 	</record>
 
@@ -521,7 +521,7 @@
 		<field name="code">5121</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Salaries, wages and commissions</field>
 	</record>
 
@@ -529,7 +529,7 @@
 		<field name="code">5122</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Holidays</field>
 	</record>
 
@@ -537,7 +537,7 @@
 		<field name="code">5123</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Employment Insurance</field>
 	</record>
 
@@ -545,7 +545,7 @@
 		<field name="code">5124</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Health Services Fund</field>
 	</record>
 
@@ -553,7 +553,7 @@
 		<field name="code">5125</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Annuities</field>
 	</record>
 
@@ -561,7 +561,7 @@
 		<field name="code">5126</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Parental Insurance</field>
 	</record>
 
@@ -569,7 +569,7 @@
 		<field name="code">5127</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Labour Health and Safety</field>
 	</record>
 
@@ -577,7 +577,7 @@
 		<field name="code">5128</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Labour Standards</field>
 	</record>
 
@@ -585,7 +585,7 @@
 		<field name="code">513</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">SALES EXPENSES</field>
 	</record>
 
@@ -593,7 +593,7 @@
 		<field name="code">514</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">GENERAL EXPENSES</field>
 	</record>
 
@@ -601,7 +601,7 @@
 		<field name="code">515</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">RESEARCH AND DEVELOPMENT EXPENSES</field>
 	</record>
 
@@ -609,7 +609,7 @@
 		<field name="code">519</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER OPERATING EXPENSES</field>
 	</record>
 
@@ -617,7 +617,7 @@
 		<field name="code">55</field>
 		<field name="parent_id" ref="chart5_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-OPERATING EXPENSES</field>
 	</record>
 
@@ -625,7 +625,7 @@
 		<field name="code">551</field>
 		<field name="parent_id" ref="chart55_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTEREST EXPENSES</field>
 	</record>
 
@@ -633,7 +633,7 @@
 		<field name="code">559</field>
 		<field name="parent_id" ref="chart55_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-OPERATING EXPENSES</field>
 	</record>
 
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index b66dd5f02ba..e50ac7ff4dc 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -6,7 +6,7 @@
         <record id="chart0_fr" model="account.account.template">
             <field name="code">0</field>
             <field name="type">view</field>
-            <field name="user_type" ref="user_type_view_fr"/>
+            <field name="user_type" ref="account.data_account_type_view"/>
             <field name="name">Account Chart CA FR</field>
         </record>
 
@@ -16,7 +16,7 @@
 		<field name="code">1</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACTIF</field>
 	</record>
 	
@@ -24,7 +24,7 @@
 		<field name="code">11</field>
 		<field name="parent_id" ref="chart1_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACTIFS COURANTS</field>
 	</record>
 	
@@ -32,7 +32,7 @@
 		<field name="code">111</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ENCAISSE</field>
 	</record>
 
@@ -40,7 +40,7 @@
 		<field name="code">1111</field>
 		<field name="parent_id" ref="chart111_fr"/>
 		<field name="type">liquidity</field>
-		<field name="user_type" ref="user_type_immo_fr" />
+		<field name="user_type" ref="account.data_account_type_bank"/>
 		<field name="name">Compte chèque</field>
 	</record>
 
@@ -48,7 +48,7 @@
 		<field name="code">1112</field>
 		<field name="parent_id" ref="chart111_fr"/>
 		<field name="type">liquidity</field>
-		<field name="user_type" ref="user_type_immo_fr" />
+		<field name="user_type" ref="account.data_account_type_cash"/>
 		<field name="name">Petite caisse</field>
 	</record>
 
@@ -56,7 +56,7 @@
 		<field name="code">112</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE</field>
 	</record>
 
@@ -64,7 +64,7 @@
 		<field name="code">113</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CERTIFICATS DE DÉPÔTS</field>
 	</record>
 
@@ -72,7 +72,7 @@
 		<field name="code">114</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">STOCKS</field>
 	</record>
 
@@ -80,7 +80,7 @@
 		<field name="code">115</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">COMPTES CLIENTS</field>
 	</record>
 
@@ -88,7 +88,7 @@
 		<field name="code">1151</field>
 		<field name="parent_id" ref="chart115_fr"/>
 		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Comptes clients</field>
 	</record>
@@ -97,7 +97,7 @@
 		<field name="code">1152</field>
 		<field name="parent_id" ref="chart115_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
 	</record>
 
@@ -105,7 +105,7 @@
 		<field name="code">116</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS PAYÉS D'AVANCE</field>
 	</record>
 
@@ -113,7 +113,7 @@
 		<field name="code">117</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION</field>
 	</record>
 
@@ -121,15 +121,15 @@
 		<field name="code">118</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMPÔTS À RECEVOIR</field>
 	</record>
 
 	<record id="chart1181_fr" model="account.account.template">
 		<field name="code">1181</field>
 		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TPS à recevoir</field>
 	</record>
@@ -137,8 +137,8 @@
 	<record id="chart1182_fr" model="account.account.template">
 		<field name="code">1182</field>
 		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVP/TVQ à recevoir</field>
 	</record>
@@ -146,8 +146,8 @@
 	<record id="chart1183_fr" model="account.account.template">
 		<field name="code">1183</field>
 		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVH à recevoir</field>
 	</record>
@@ -156,7 +156,7 @@
 		<field name="code">15</field>
 		<field name="parent_id" ref="chart1_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACTIFS NON-COURANTS</field>
 	</record>
 
@@ -164,7 +164,7 @@
 		<field name="code">151</field>
 		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PLACEMENTS DISPONIBLES À LA VENTE</field>
 	</record>
 
@@ -172,7 +172,7 @@
 		<field name="code">152</field>
 		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMMOBILISATIONS CORPORELLES</field>
 	</record>
 
@@ -180,7 +180,7 @@
 		<field name="code">1527</field>
 		<field name="parent_id" ref="chart152_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AMORTISSEMENTS CUMULÉS</field>
 	</record>
 
@@ -188,7 +188,7 @@
 		<field name="code">153</field>
 		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMMOBILISATIONS INCORPORELLES</field>
 	</record>
 
@@ -196,7 +196,7 @@
 		<field name="code">1531</field>
 		<field name="parent_id" ref="chart153_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS</field>
 	</record>
 
@@ -206,7 +206,7 @@
 		<field name="code">2</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PASSIF</field>
 	</record>
 
@@ -214,7 +214,7 @@
 		<field name="code">21</field>
 		<field name="parent_id" ref="chart2_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS COURANTS</field>
 	</record>
 
@@ -222,7 +222,7 @@
 		<field name="code">211</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field>
 	</record>
 
@@ -230,7 +230,7 @@
 		<field name="code">2111</field>
 		<field name="parent_id" ref="chart211_fr"/>
 		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Comptes fournisseurs</field>
 	</record>
@@ -239,7 +239,7 @@
 		<field name="code">212</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES COMPTES CRÉDITEURS</field>
 	</record>
 
@@ -247,15 +247,15 @@
 		<field name="code">213</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMPÔTS À PAYER</field>
 	</record>
 
 	<record id="chart2131_fr" model="account.account.template">
 		<field name="code">2131</field>
 		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TPS à payer</field>
 	</record>
@@ -263,8 +263,8 @@
 	<record id="chart2132_fr" model="account.account.template">
 		<field name="code">2132</field>
 		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVP/TVQ à payer</field>
 	</record>
@@ -272,8 +272,8 @@
 	<record id="chart2133_fr" model="account.account.template">
 		<field name="code">2133</field>
 		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVH à payer</field>
 	</record>
@@ -282,7 +282,7 @@
 		<field name="code">214</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DETTES FINANCIÈRES COURANTES</field>
 	</record>
 
@@ -290,7 +290,7 @@
 		<field name="code">215</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION</field>
 	</record>
 
@@ -298,7 +298,7 @@
 		<field name="code">25</field>
 		<field name="parent_id" ref="chart2_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS NON-COURANTS</field>
 	</record>
 
@@ -306,7 +306,7 @@
 		<field name="code">251</field>
 		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DETTES FINANCIÈRES NON-COURANTES</field>
 	</record>
 
@@ -314,7 +314,7 @@
 		<field name="code">252</field>
 		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI</field>
 	</record>
 
@@ -322,7 +322,7 @@
 		<field name="code">253</field>
 		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMPÔTS DIFFÉRÉS</field>
 	</record>
 
@@ -330,7 +330,7 @@
 		<field name="code">254</field>
 		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES PASSIFS NON-COURANTS</field>
 	</record>
 
@@ -340,7 +340,7 @@
 		<field name="code">3</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CAPITAUX PROPRES</field>
 	</record>
 
@@ -348,7 +348,7 @@
 		<field name="code">31</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CAPITAL-ACTIONS</field>
 	</record>
 
@@ -356,7 +356,7 @@
 		<field name="code">32</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PRIMES</field>
 	</record>
 
@@ -364,7 +364,7 @@
 		<field name="code">33</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">BÉNÉFICES NON RÉPARTIS</field>
 	</record>
 
@@ -372,7 +372,7 @@
 		<field name="code">34</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DIVIDENDES</field>
 	</record>
 
@@ -380,7 +380,7 @@
 		<field name="code">35</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ÉCARTS DE CONVERSION</field>
 	</record>
 
@@ -388,7 +388,7 @@
 		<field name="code">36</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">SURPLUS D'APPORT</field>
 	</record>
 
@@ -396,7 +396,7 @@
 		<field name="code">39</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL</field>
 	</record>
 
@@ -406,7 +406,7 @@
 		<field name="code">4</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS</field>
 	</record>
 
@@ -414,7 +414,7 @@
 		<field name="code">41</field>
 		<field name="parent_id" ref="chart4_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS D'EXPLOITATION</field>
 	</record>
 
@@ -422,7 +422,7 @@
 		<field name="code">411</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Ventes</field>
 	</record>
 
@@ -430,7 +430,7 @@
 		<field name="code">412</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Ventes avec des provinces harmonisées</field>
 	</record>
 	
@@ -438,7 +438,7 @@
 		<field name="code">413</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Ventes avec des provinces non-harmonisées</field>
 	</record>
 
@@ -446,7 +446,7 @@
 		<field name="code">414</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Ventes à l'étranger</field>
 	</record>
 
@@ -454,7 +454,7 @@
 		<field name="code">419</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
 	</record>
 
@@ -462,7 +462,7 @@
 		<field name="code">42</field>
 		<field name="parent_id" ref="chart4_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
@@ -470,7 +470,7 @@
 		<field name="code">425</field>
 		<field name="parent_id" ref="chart42_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTÉRÊTS</field>
 	</record>
 
@@ -478,7 +478,7 @@
 		<field name="code">429</field>
 		<field name="parent_id" ref="chart42_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
@@ -488,7 +488,7 @@
 		<field name="code">5</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CHARGES</field>
 	</record>
 
@@ -496,7 +496,7 @@
 		<field name="code">51</field>
 		<field name="parent_id" ref="chart5_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CHARGES D'EXPLOITATION</field>
 	</record>
 
@@ -504,7 +504,7 @@
 		<field name="code">511</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">COÛT DES PRODUITS VENDUS</field>
 	</record>
 	
@@ -512,7 +512,7 @@
 		<field name="code">5111</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Achats</field>
 	</record>
 
@@ -520,7 +520,7 @@
 		<field name="code">5112</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Achats dans des provinces harmonisées</field>
 	</record>
 	
@@ -528,7 +528,7 @@
 		<field name="code">5113</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Achats dans des provinces non-harmonisées</field>
 	</record>
 
@@ -536,7 +536,7 @@
 		<field name="code">5114</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Achats à l'étranger</field>
 	</record>
 
@@ -544,7 +544,7 @@
 		<field name="code">512</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">SALAIRES ET CHARGES SOCIALES</field>
 	</record>
 
@@ -552,7 +552,7 @@
 		<field name="code">51201</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Salaires</field>
 	</record>
 
@@ -560,7 +560,7 @@
 		<field name="code">51202</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Vacances</field>
 	</record>
 
@@ -568,7 +568,7 @@
 		<field name="code">51203</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Assurance Emploi</field>
 	</record>
 
@@ -576,7 +576,7 @@
 		<field name="code">51204</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Fonds des services de santé</field>
 	</record>
 
@@ -584,7 +584,7 @@
 		<field name="code">51205</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Rentes</field>
 	</record>
 
@@ -592,7 +592,7 @@
 		<field name="code">51206</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Assurance parental</field>
 	</record>
 
@@ -600,7 +600,7 @@
 		<field name="code">51207</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Santé et sécurité au travail</field>
 	</record>
 
@@ -608,7 +608,7 @@
 		<field name="code">51208</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Normes du travail</field>
 	</record>
 
@@ -616,7 +616,7 @@
 		<field name="code">513</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS SUR VENTE</field>
 	</record>
 
@@ -624,7 +624,7 @@
 		<field name="code">514</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS GÉNÉRAUX</field>
 	</record>
 
@@ -632,7 +632,7 @@
 		<field name="code">515</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS DE RECHERCHE ET DÉVELOPPEMENT</field>
 	</record>
 
@@ -640,7 +640,7 @@
 		<field name="code">519</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES FRAIS D'EXPLOITATION</field>
 	</record>
 
@@ -648,7 +648,7 @@
 		<field name="code">52</field>
 		<field name="parent_id" ref="chart5_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
@@ -656,7 +656,7 @@
 		<field name="code">521</field>
 		<field name="parent_id" ref="chart52_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTÉRÊTS DÉBITEURS</field>
 	</record>
 
@@ -664,7 +664,7 @@
 		<field name="code">529</field>
 		<field name="parent_id" ref="chart52_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
diff --git a/addons/l10n_ca/account_tax_code_en.xml b/addons/l10n_ca/account_tax_code_en.xml
index 2fe144d6086..bb628a39f15 100644
--- a/addons/l10n_ca/account_tax_code_en.xml
+++ b/addons/l10n_ca/account_tax_code_en.xml
@@ -7,47 +7,47 @@
 	</record>
 	
 	<record model="account.tax.code.template" id="vat_code_balance_net_en">
-		<field name="name">Tax Balance to Pay</field>
+		<field name="name">Tax Balance</field>
 		<field name="parent_id" ref="vat_code_tax_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tva_en">
-		<field name="name">Receivable Taxes</field>
+		<field name="name">Taxes paid</field>
 		<field name="parent_id" ref="vat_code_balance_net_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_gst_en">
-		<field name="name">GST to Receive</field>
+		<field name="name">GST paid</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_pst_en">
-		<field name="name">PST to Receive</field>
+		<field name="name">PST paid</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_hst_en">
-		<field name="name">HST to Receive</field>
+		<field name="name">HST paid</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_en">
-		<field name="name">Payable Taxes</field>
+		<field name="name">Taxes received</field>
 		<field name="parent_id" ref="vat_code_balance_net_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_gst_en">
-		<field name="name">GST to Pay</field>
+		<field name="name">GST received</field>
 		<field name="parent_id" ref="vat_code_payable_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_pst_en">
-		<field name="name">PST to Pay</field>
+		<field name="name">PST received</field>
 		<field name="parent_id" ref="vat_code_payable_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_hst_en">
-		<field name="name">HST to Pay</field>
+		<field name="name">HST received</field>
 		<field name="parent_id" ref="vat_code_payable_en"/>
 	</record>
 
diff --git a/addons/l10n_ca/account_tax_code_fr.xml b/addons/l10n_ca/account_tax_code_fr.xml
index 849842b2453..d8abf73dd93 100644
--- a/addons/l10n_ca/account_tax_code_fr.xml
+++ b/addons/l10n_ca/account_tax_code_fr.xml
@@ -12,42 +12,42 @@
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tva_fr">
-		<field name="name">Taxes à recevoir</field>
+		<field name="name">Taxes payées</field>
 		<field name="parent_id" ref="vat_code_balance_net_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tps_fr">
-		<field name="name">TPS à recevoir</field>
+		<field name="name">TPS payée</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tvp_fr">
-		<field name="name">TVP/TVQ à recevoir</field>
+		<field name="name">TVP/TVQ payée</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tvh_fr">
-		<field name="name">TVH à recevoir</field>
+		<field name="name">TVH payée</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_fr">
-		<field name="name">Taxes à payer</field>
+		<field name="name">Taxes reçues</field>
 		<field name="parent_id" ref="vat_code_balance_net_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_tps_fr">
-		<field name="name">TPS à payer</field>
+		<field name="name">TPS reçue</field>
 		<field name="parent_id" ref="vat_code_payable_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_tvp_fr">
-		<field name="name">TVP/TVQ à payer</field>
+		<field name="name">TVP/TVQ reçue</field>
 		<field name="parent_id" ref="vat_code_payable_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_tvh_fr">
-		<field name="name">TVH à payer</field>
+		<field name="name">TVH reçue</field>
 		<field name="parent_id" ref="vat_code_payable_fr"/>
 	</record>
 
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index 662ac4b52fc..f185f7f9198 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -2,263 +2,544 @@
 <openerp>
     <data noupdate="1">
 
+    <!-- SALES TAXES -->
+
     <!-- Manitoba PST -->
 
-    <record id="gstpst_mb_en" model="account.tax.template">
+    <record id="gstpst_mb_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST (MB)</field>
-        <field name="description">GSTPST_MB</field>
+        <field name="name">GST + PST for sales (MB)</field>
+        <field name="description">GSTPST_MB_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="gstpst_mb_gst_en" model="account.tax.template">
+    <record id="gstpst_sale_mb_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST - 5% (MB)</field>
+        <field name="name">GST for sales - 5% (MB)</field>
         <field name="description">GST</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_mb_en"/>
+        <field name="parent_id" ref="gstpst_mb_sale_en"/>
     </record>
 
-    <record id="pst_mb_en" model="account.tax.template">
+    <record id="pst_mb_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST - 7%</field>
+        <field name="name">PST for sales - 7%</field>
         <field name="description">PST</field>
-        <field name="amount">0.070000</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">0.700000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2122_en"/>
         <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_mb_en"/>
+        <field name="parent_id" ref="gstpst_mb_sale_en"/>
     </record>
 
     <!-- Prince Edward Island PST -->
 
-    <record id="gstpst_pe_en" model="account.tax.template">
+    <record id="gstpst_pe_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST (PE)</field>
-        <field name="description">GSTPST_PE</field>
+        <field name="name">GST + PST for sales (PE)</field>
+        <field name="description">GSTPST_PE_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="gstpst_pe_gst_en" model="account.tax.template">
+    <record id="gstpst_sale_pe_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST - 5% (PE)</field>
+        <field name="name">GST for sales - 5% (PE)</field>
         <field name="description">GST</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_pe_en"/>
+        <field name="parent_id" ref="gstpst_pe_sale_en"/>
     </record>
 
-    <record id="pst_pe_en" model="account.tax.template">
+    <record id="pst_pe_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST - 10%</field>
+        <field name="name">PST for sale - 10%</field>
         <field name="description">PST</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2122_en"/>
         <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_pe_en"/>
+        <field name="parent_id" ref="gstpst_pe_sale_en"/>
     </record>
 
     <!-- Quebec PST -->
 
-    <record id="gstpst_qc_en" model="account.tax.template">
+    <record id="gsttvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST (QC)</field>
-        <field name="description">GSTPST_QC</field>
+        <field name="name">GST + TVQ for sales</field>
+        <field name="description">GSTTVQ_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="gstpst_qc_gst_en" model="account.tax.template">
+    <record id="gsttvq_sale_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST - 5% (QC)</field>
+        <field name="name">GST for sales - 5% (QC)</field>
         <field name="description">GST</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_qc_en"/>
+        <field name="parent_id" ref="gsttvq_sale_en"/>
     </record>
 
-    <record id="pst_qc_en" model="account.tax.template">
+    <record id="tvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST - 9.5%</field>
-        <field name="description">PST</field>
+        <field name="name">TVQ for sales - 9.5%</field>
+        <field name="description">TVQ</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.095000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2122_en"/>
         <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_qc_en"/>
+        <field name="parent_id" ref="gsttvq_sale_en"/>
     </record>
 
     <!-- Saskatchewan PST -->
 
-    <record id="gstpst_sk_en" model="account.tax.template">
+    <record id="gstpst_sk_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST (SK)</field>
-        <field name="description">GSTPST_SK</field>
+        <field name="name">GST + PST for sales (SK)</field>
+        <field name="description">GSTPST_SK_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="gstpst_sk_gst_en" model="account.tax.template">
+    <record id="gstpst_sale_sk_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST - 5% (SK)</field>
+        <field name="name">GST for sales - 5% (SK)</field>
         <field name="description">GST</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_sk_en"/>
+        <field name="parent_id" ref="gstpst_sk_sale_en"/>
     </record>
 
-    <record id="pst_sk_en" model="account.tax.template">
+    <record id="pst_sk_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST - 5%</field>
+        <field name="name">PST for sales - 5% (SK)</field>
         <field name="description">PST</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2122_en"/>
         <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_sk_en"/>
+        <field name="parent_id" ref="gstpst_sk_sale_en"/>
     </record>
 
     <!-- HST -->
 
-    <record id="hst12_en" model="account.tax.template">
+    <record id="hst12_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST - 12%</field>
-        <field name="description">HST12</field>
+        <field name="name">TVH for sales - 12%</field>
+        <field name="description">TVH12_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_collected_id" ref="chart2123_en"/>
         <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
     </record>
 
-    <record id="hst13_en" model="account.tax.template">
+    <record id="hst13_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST - 13%</field>
-        <field name="description">HST13</field>
+        <field name="name">TVH for sales - 13%</field>
+        <field name="description">TVH13_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_collected_id" ref="chart2123_en"/>
         <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
     </record>
 
-    <record id="hst135_en" model="account.tax.template">
+    <record id="hst135_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST - 13.5%</field>
-        <field name="description">HST135</field>
+        <field name="name">TVH for sales - 13.5%</field>
+        <field name="description">TVH135_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_collected_id" ref="chart2123_en"/>
         <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
     </record>
 
-    <record id="hst15_en" model="account.tax.template">
+    <record id="hst15_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST - 15%</field>
-        <field name="description">HST15</field>
+        <field name="name">TVH for sales - 15%</field>
+        <field name="description">TVH15_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_collected_id" ref="chart2123_en"/>
         <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
     </record>
 
     <!-- GST -->
 
-    <record id="gst_en" model="account.tax.template">
+    <record id="gst_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST - 5%</field>
-        <field name="description">GST</field>
+        <field name="name">GST for sales - 5%</field>
+        <field name="description">GST_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
     </record>
 
-    <record id="notax_en" model="account.tax.template">
+
+    <!-- PURCHASE TAXES -->
+
+    <!-- Manitoba PST -->
+
+    <record id="gstpst_mb_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">No tax</field>
-        <field name="description">No tax</field>
-        <field name="amount">0.00</field>
+        <field name="name">GST + PST for purchases (MB)</field>
+        <field name="description">GSTPST_MB_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
+    <record id="gstpst_purc_mb_gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST for purchases - 5% (MB)</field>
+        <field name="description">GST</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gstpst_mb_purc_en"/>
+    </record>
+
+    <record id="pst_mb_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">PST for purchases - 7%</field>
+        <field name="description">PST</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.700000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gstpst_mb_purc_en"/>
+    </record>
+
+    <!-- Prince Edward Island PST -->
+
+    <record id="gstpst_pe_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST + PST for purchases (PE)</field>
+        <field name="description">GSTPST_PE_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="gstpst_purc_pe_gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST for purchases - 5% (PE)</field>
+        <field name="description">GST</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gstpst_pe_purc_en"/>
+    </record>
+
+    <record id="pst_pe_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">PST for purchases - 10%</field>
+        <field name="description">PST</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.100000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gstpst_pe_purc_en"/>
+    </record>
+
+    <!-- Quebec PST -->
+
+    <record id="gsttvq_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST + TVQ for purchases</field>
+        <field name="description">GSTTVQ_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="gsttvq_purc_gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST for purchases - 5% (QC)</field>
+        <field name="description">GST</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gsttvq_purc_en"/>
+    </record>
+
+    <record id="tvq_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVQ for purchases - 9.5%</field>
+        <field name="description">TVQ</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.095000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gsttvq_purc_en"/>
+    </record>
+
+    <!-- Saskatchewan PST -->
+
+    <record id="gstpst_sk_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST + PST for purchases (SK)</field>
+        <field name="description">GSTPST_SK_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="gstpst_purc_sk_gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST for purchases - 5% (SK)</field>
+        <field name="description">GST</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gstpst_sk_purc_en"/>
+    </record>
+
+    <record id="pst_sk_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">PST for purchases - 5% (SK)</field>
+        <field name="description">PST</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gstpst_sk_purc_en"/>
+    </record>
+
+    <!-- HST -->
+
+    <record id="hst12_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVH for purchases - 12%</field>
+        <field name="description">TVH12_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.120000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart1183_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <record id="hst13_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVH for purchases - 13%</field>
+        <field name="description">TVH13_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.130000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart1183_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <record id="hst135_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVH for purchases - 13.5%</field>
+        <field name="description">TVH135_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.135000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart1183_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <record id="hst15_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVH for purchases - 15%</field>
+        <field name="description">TVH15_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.150000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart1183_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <!-- GST -->
+
+    <record id="gst_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST for purchases - 5%</field>
+        <field name="description">GST_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index 5df4446c611..169bfe4f20b 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -2,263 +2,544 @@
 <openerp>
     <data noupdate="1">
 
+    <!-- SALES TAXES -->
+
     <!-- Manitoba PST -->
 
-    <record id="tpstvp_mb_fr" model="account.tax.template">
+    <record id="tpstvp_mb_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVP (MB)</field>
-        <field name="description">TPSTVP_MB</field>
+        <field name="name">TPS + TVP sur les ventes (MB)</field>
+        <field name="description">TPSTVP_MB_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="tpstvp_mb_tps_fr" model="account.tax.template">
+    <record id="tpstvp_sale_mb_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5% (MB)</field>
+        <field name="name">TPS sur les ventes - 5% (MB)</field>
         <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_mb_fr"/>
+        <field name="parent_id" ref="tpstvp_mb_sale_fr"/>
     </record>
 
-    <record id="tvp_mb_fr" model="account.tax.template">
+    <record id="tvp_mb_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP - 7%</field>
+        <field name="name">TVP sur les ventes - 7%</field>
         <field name="description">TVP</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.700000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_mb_fr"/>
+        <field name="parent_id" ref="tpstvp_mb_sale_fr"/>
     </record>
 
     <!-- Prince Edward Island PST -->
 
-    <record id="tpstvp_pe_fr" model="account.tax.template">
+    <record id="tpstvp_pe_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVP (PE)</field>
-        <field name="description">TPSTVP_PE</field>
+        <field name="name">TPS + TVP sur les ventes (PE)</field>
+        <field name="description">TPSTVP_PE_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="tpstvp_pe_tps_fr" model="account.tax.template">
+    <record id="tpstvp_sale_pe_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5% (PE)</field>
+        <field name="name">TPS sur les ventes - 5% (PE)</field>
         <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_pe_fr"/>
+        <field name="parent_id" ref="tpstvp_pe_sale_fr"/>
     </record>
 
-    <record id="tvp_pe_fr" model="account.tax.template">
+    <record id="tvp_pe_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP - 10%</field>
+        <field name="name">TVP for sale - 10%</field>
         <field name="description">TVP</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_pe_fr"/>
+        <field name="parent_id" ref="tpstvp_pe_sale_fr"/>
     </record>
 
     <!-- Quebec PST -->
 
-    <record id="tpstvq_fr" model="account.tax.template">
+    <record id="tpstvq_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVQ</field>
-        <field name="description">TPSTVQ</field>
+        <field name="name">TPS + TVQ sur les ventes</field>
+        <field name="description">TPSTVQ_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="tpstvq_tps_fr" model="account.tax.template">
+    <record id="tpstvq_sale_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5% (QC)</field>
+        <field name="name">TPS sur les ventes - 5% (QC)</field>
         <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvq_fr"/>
+        <field name="parent_id" ref="tpstvq_sale_fr"/>
     </record>
 
-    <record id="tvq_fr" model="account.tax.template">
+    <record id="tvq_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVQ - 9.5%</field>
+        <field name="name">TVQ sur les ventes - 9.5%</field>
         <field name="description">TVQ</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.095000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvq_fr"/>
+        <field name="parent_id" ref="tpstvq_sale_fr"/>
     </record>
 
     <!-- Saskatchewan PST -->
 
-    <record id="tpstvp_sk_fr" model="account.tax.template">
+    <record id="tpstvp_sk_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVP (SK)</field>
-        <field name="description">TPSTVP_SK</field>
+        <field name="name">TPS + TVP sur les ventes (SK)</field>
+        <field name="description">TPSTVP_SK_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="tpstvp_sk_tps_fr" model="account.tax.template">
+    <record id="tpstvp_sale_sk_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5% (SK)</field>
+        <field name="name">TPS sur les ventes - 5% (SK)</field>
         <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_sk_fr"/>
+        <field name="parent_id" ref="tpstvp_sk_sale_fr"/>
     </record>
 
-    <record id="tvp_sk_fr" model="account.tax.template">
+    <record id="tvp_sk_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP - 5% (SK)</field>
+        <field name="name">TVP sur les ventes - 5% (SK)</field>
         <field name="description">TVP</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_sk_fr"/>
+        <field name="parent_id" ref="tpstvp_sk_sale_fr"/>
     </record>
 
     <!-- HST -->
 
-    <record id="tvh12_fr" model="account.tax.template">
+    <record id="tvh12_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH - 12%</field>
-        <field name="description">TVH12</field>
+        <field name="name">TVH sur les ventes - 12%</field>
+        <field name="description">TVH12_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_collected_id" ref="chart2133_fr"/>
         <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
     </record>
 
-    <record id="tvh13_fr" model="account.tax.template">
+    <record id="tvh13_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH - 13%</field>
-        <field name="description">TVH13</field>
+        <field name="name">TVH sur les ventes - 13%</field>
+        <field name="description">TVH13_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_collected_id" ref="chart2133_fr"/>
         <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
     </record>
 
-    <record id="tvh135_fr" model="account.tax.template">
+    <record id="tvh135_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH - 13.5%</field>
-        <field name="description">TVH135</field>
+        <field name="name">TVH sur les ventes - 13.5%</field>
+        <field name="description">TVH135_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_collected_id" ref="chart2133_fr"/>
         <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
     </record>
 
-    <record id="tvh15_fr" model="account.tax.template">
+    <record id="tvh15_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH - 15%</field>
-        <field name="description">TVH15</field>
+        <field name="name">TVH sur les ventes - 15%</field>
+        <field name="description">TVH15_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_collected_id" ref="chart2133_fr"/>
         <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
     </record>
 
     <!-- GST -->
 
-    <record id="tps_fr" model="account.tax.template">
+    <record id="tps_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5%</field>
-        <field name="description">TPS</field>
+        <field name="name">TPS sur les ventes - 5%</field>
+        <field name="description">TPS_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
     </record>
 
-    <record id="notax_fr" model="account.tax.template">
+
+    <!-- PURCHASE TAXES -->
+
+    <!-- Manitoba PST -->
+
+    <record id="tpstvp_mb_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">Pas de taxes</field>
-        <field name="description">Pas de taxes</field>
-        <field name="amount">0.00</field>
+        <field name="name">TPS + TVP sur les achats (MB)</field>
+        <field name="description">TPSTVP_MB_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
+    <record id="tpstvp_purc_mb_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (MB)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="parent_id" ref="tpstvp_mb_purc_fr"/>
+    </record>
+
+    <record id="tvp_mb_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVP sur les achats - 7%</field>
+        <field name="description">TVP</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.700000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="parent_id" ref="tpstvp_mb_purc_fr"/>
+    </record>
+
+    <!-- Prince Edward Island PST -->
+
+    <record id="tpstvp_pe_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS + TVP sur les achats (PE)</field>
+        <field name="description">TPSTVP_PE_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="tpstvp_purc_pe_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (PE)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="parent_id" ref="tpstvp_pe_purc_fr"/>
+    </record>
+
+    <record id="tvp_pe_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVP sur les achats - 10%</field>
+        <field name="description">TVP</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.100000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="parent_id" ref="tpstvp_pe_purc_fr"/>
+    </record>
+
+    <!-- Quebec PST -->
+
+    <record id="tpstvq_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS + TVQ sur les achats</field>
+        <field name="description">TPSTVQ_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="tpstvq_purc_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (QC)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="parent_id" ref="tpstvq_purc_fr"/>
+    </record>
+
+    <record id="tvq_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVQ sur les achats - 9.5%</field>
+        <field name="description">TVQ</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.095000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="parent_id" ref="tpstvq_purc_fr"/>
+    </record>
+
+    <!-- Saskatchewan PST -->
+
+    <record id="tpstvp_sk_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS + TVP sur les achats (SK)</field>
+        <field name="description">TPSTVP_SK_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="tpstvp_purc_sk_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (SK)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="parent_id" ref="tpstvp_sk_purc_fr"/>
+    </record>
+
+    <record id="tvp_sk_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVP sur les achats - 5% (SK)</field>
+        <field name="description">TVP</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="parent_id" ref="tpstvp_sk_purc_fr"/>
+    </record>
+
+    <!-- HST -->
+
+    <record id="tvh12_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH sur les achats - 12%</field>
+        <field name="description">TVH12_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.120000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart1183_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+    </record>
+
+    <record id="tvh13_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH sur les achats - 13%</field>
+        <field name="description">TVH13_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.130000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart1183_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+    </record>
+
+    <record id="tvh135_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH sur les achats - 13.5%</field>
+        <field name="description">TVH135_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.135000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart1183_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+    </record>
+
+    <record id="tvh15_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH sur les achats - 15%</field>
+        <field name="description">TVH15_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.150000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart1183_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+    </record>
+
+    <!-- GST -->
+
+    <record id="tps_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5%</field>
+        <field name="description">TPS_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_types_en.xml b/addons/l10n_ca/account_types_en.xml
deleted file mode 100644
index 1af3fd92205..00000000000
--- a/addons/l10n_ca/account_types_en.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-	<record model="account.account.type" id="user_type_receivable_en" >
-		<field name="name">Receivable</field>
-		<field name="code">receivable</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_payable_en" >
-		<field name="name">Payable</field>
-		<field name="code">payable</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_view_en">
-		<field name="name">View</field>
-		<field name="code">view</field>
-		<field name="close_method">none</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_income_en" >
-		<field name="name">Income</field>
-		<field name="code">income</field>
-		<field name="close_method">none</field>
-		<field name="report_type">income</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_expense_en">
-		<field name="name">Expense</field>
-		<field name="code">expense</field>
-		<field name="close_method">none</field>
-		<field name="report_type">expense</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_tax_en">
-		<field name="name">Tax</field>
-		<field name="code">tax</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_cash_en">
-		<field name="name">Cash</field>
-		<field name="code">cash</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_asset_en">
-		<field name="name">Asset</field>
-		<field name="code">asset</field>
-		<field name="close_method">balance</field>
-		<field name="report_type">asset</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_equity_en">
-		<field name="name">Equity</field>
-		<field name="code">equity</field>
-		<field name="report_type">liability</field>
-		<field name="close_method">balance</field>
-	</record>
-
-    </data>
-</openerp>
diff --git a/addons/l10n_ca/account_types_fr.xml b/addons/l10n_ca/account_types_fr.xml
deleted file mode 100644
index cff6c01e6f2..00000000000
--- a/addons/l10n_ca/account_types_fr.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-	<record id="user_type_view_fr" model="account.account.type">
-		<field name="name">Vue</field>
-		<field name="code">view</field>
-		<field name="close_method">none</field>
-	</record>
-
-	<record id="user_type_capitaux_fr" model="account.account.type">
-		<field name="name">Capital</field>
-		<field name="code">capital</field>
-		<field name="report_type">asset</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record id="user_type_immo_fr" model="account.account.type">
-		<field name="name">Immobilisation</field>
-		<field name="code">immo</field>
-		<field name="report_type">asset</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record id="user_type_stock_fr" model="account.account.type">
-		<field name="name">Stock et Encours</field>
-		<field name="code">stock</field>
-		<field name="report_type">asset</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record id="user_type_tiers_fr" model="account.account.type">
-		<field name="name">Tiers</field>
-		<field name="code">tiers</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record id="user_type_tiers_receiv_fr" model="account.account.type">
-		<field name="name">Tiers - Recevable</field>
-		<field name="code">tiers -rec</field>
-		<field name="report_type">asset</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record id="user_type_tiers_payable_fr" model="account.account.type">
-		<field name="name">Tiers - Payable</field>
-		<field name="code">tiers - pay</field>
-		<field name="report_type">liability</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record id="user_type_tax_fr" model="account.account.type">
-		<field name="name">Tax</field>
-		<field name="code">tax</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record id="user_type_financiers_fr" model="account.account.type">
-		<field name="name">Financier</field>
-		<field name="code">financier</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record id="user_type_charge_fr" model="account.account.type">
-		<field name="name">Charge</field>
-		<field name="code">charge</field>
-		<field name="report_type">expense</field>
-		<field name="close_method">none</field>
-	</record>
-
-	<record id="user_type_produit_fr" model="account.account.type">
-		<field name="name">Produit</field>
-		<field name="code">produit</field>
-		<field name="report_type">income</field>
-		<field name="close_method">none</field>
-	</record>        
-
-    </data>
-</openerp>
diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml
index d7b6a3ee7da..54f9c21b5e1 100644
--- a/addons/l10n_ca/fiscal_templates_en.xml
+++ b/addons/l10n_ca/fiscal_templates_en.xml
@@ -39,354 +39,618 @@
 		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
 	</record>
 
+        <!-- PURCHASES TAXES -->
+
 	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
 
-	<record id="fiscal_position_tax_template_21_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<record id="fiscal_position_tax_template_4_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12c_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<record id="fiscal_position_tax_template_4_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<record id="fiscal_position_tax_template_4_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<record id="fiscal_position_tax_template_4_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<record id="fiscal_position_tax_template_4_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
 	</record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is gstpst_qc)-->
+	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<record id="fiscal_position_tax_template_4_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
 	</record>
 
-	<!-- Fiscal Position Account Templates - Incomes -->
 
-	<record id="fiscal_position_account_template_21_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart412_en"/>
+        <!-- SALES TAXES -->
+
+
+	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
+
+	<record id="fiscal_position_tax_template_21_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_22_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart412_en"/>
+	<record id="fiscal_position_tax_template_22_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_23_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart412_en"/>
+	<record id="fiscal_position_tax_template_23_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_24_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart412_en"/>
+	<record id="fiscal_position_tax_template_24_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_3_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart413_en"/>
+	<record id="fiscal_position_tax_template_4_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_4_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart414_en"/>
+	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+
+	<record id="fiscal_position_tax_template_22_12c_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
 	</record>
 
-	<!-- Fiscal Position Account Templates - Expenses -->
-
-	<record id="fiscal_position_account_template_21_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5112_en"/>
+	<record id="fiscal_position_tax_template_23_12_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_22_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5112_en"/>
+	<record id="fiscal_position_tax_template_24_12_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_23_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5112_en"/>
+	<record id="fiscal_position_tax_template_3_12_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_24_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5112_en"/>
+	<record id="fiscal_position_tax_template_4_12_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_3_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5113_en"/>
+	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
+
+	<record id="fiscal_position_tax_template_21_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_4_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5114_en"/>
+	<record id="fiscal_position_tax_template_22_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+	</record>
+
+	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+
+	<record id="fiscal_position_tax_template_21_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+	</record>
+
+	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+
+	<record id="fiscal_position_tax_template_21_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+	</record>
+
+	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
+
+	<record id="fiscal_position_tax_template_21_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+	</record>
+
+	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
+
+	<record id="fiscal_position_tax_template_21_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+	</record>
+
+	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
+
+	<record id="fiscal_position_tax_template_21_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+	</record>
+
+	<!-- Fiscal Position Account Templates - Products -->
+
+	<record id="fiscal_position_product_template_21_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart412_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_22_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart412_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_23_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart412_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_24_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart412_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_3_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart413_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_4_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart414_en" />
+	</record>
+
+	<!-- Fiscal Position Account Templates - Charges -->
+
+	<record id="fiscal_position_charge_template_21_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5112_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_22_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5112_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_23_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5112_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_24_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5112_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_3_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5113_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_4_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5114_en" />
 	</record>
 
     </data>
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 2ce50e5d6e1..0acd7388a52 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -39,278 +39,542 @@
 		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
 	</record>
 
+        <!-- PURCHASES TAXES -->
+
 	<!--  Alberta Fiscal Position Tax Templates (default is tps) -->
 
-	<record id="fiscal_position_tax_template_21_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_4_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12c_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_12_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_12_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_12_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_12_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_4_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_4_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_4_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_4_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
 	</record>
 
 	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_4_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+	</record>
+
+
+        <!-- SALES TAXES -->
+
+
+	<!--  Alberta Fiscal Position Tax Templates (default is tps) -->
+
+	<record id="fiscal_position_tax_template_21_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+	</record>
+
+	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+
+	<record id="fiscal_position_tax_template_22_12c_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_12_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_12_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_12_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_12_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
+
+	<record id="fiscal_position_tax_template_21_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+	</record>
+
+	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+
+	<record id="fiscal_position_tax_template_21_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+
+	<record id="fiscal_position_tax_template_21_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
+
+	<record id="fiscal_position_tax_template_21_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+	</record>
+
+	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
+
+	<record id="fiscal_position_tax_template_21_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+	</record>
+
+	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
+
+	<record id="fiscal_position_tax_template_21_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_4_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
 	</record>
 
 	<!-- Fiscal Position Account Templates - Products -->

From 0fee0cea0079a57d362a5752cf3499a28c58bc43 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 08:45:23 +0200
Subject: [PATCH 006/312] [ADD] backbone-ification of Widgets API

bzr revid: xmo@openerp.com-20120611064523-gczdqmfes5f1g9kj
---
 addons/web/static/src/js/corelib.js | 177 ++++++++++++++++++++++------
 1 file changed, 143 insertions(+), 34 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 94c748f839c..8455a183f87 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -238,6 +238,20 @@ instance.web.ParentedMixin = {
     }
 };
 
+/**
+ * Utility function for APIs which can take either a value or a function which
+ * returns a value
+ *
+ * @param {Object} object
+ * @param {String} property
+ * @returns {Object}
+ */
+var getValue = function (object, property) {
+    if (object == null) { return null; }
+    var value = object[property];
+    return _.isFunction(value) ? value.call(object) : value;
+};
+
 /**
  * Backbone's events. Do not ever use it directly, use EventDispatcherMixin instead.
  *
@@ -490,23 +504,19 @@ instance.web.CallbackEnabledMixin = _.extend({}, instance.web.PropertiesMixin, {
      *
      * The semantics of this precisely replace closing over the method call.
      *
-     * @param {String} method_name name of the method to invoke
+     * @param {String|Function} method function or name of the method to invoke
      * @returns {Function} proxied method
      */
-    proxy: function (method_name) {
+    proxy: function (method) {
         var self = this;
         return function () {
-            return self[method_name].apply(self, arguments);
+            var fn = (method instanceof String) ? self[method] : method;
+            return fn.apply(self, arguments);
         }
     }
 });
 
 instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
-    /**
-     * Tag name when creating a default $element.
-     * @type string
-     */
-    tagName: 'div',
     /**
      * Constructs the widget and sets its parent if a parent is given.
      *
@@ -516,14 +526,9 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
      * @param {instance.web.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling destroy(), the current instance will be
      * destroyed too. Can be null.
-     * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
-     * to bind the current Widget to an already existing part of the DOM, which is not compatible
-     * with the DOM insertion methods provided by the current implementation of Widget. So
-     * for new components this argument should not be provided any more.
      */
     init: function(parent) {
         instance.web.CallbackEnabledMixin.init.call(this);
-        this.$element = $(document.createElement(this.tagName));
         this.setParent(parent);
     },
     /**
@@ -533,8 +538,8 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
         _.each(this.getChildren(), function(el) {
             el.destroy();
         });
-        if(this.$element != null) {
-            this.$element.remove();
+        if(this.$el) {
+            this.$el.remove();
         }
         instance.web.PropertiesMixin.destroy.call(this);
     },
@@ -546,7 +551,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     appendTo: function(target) {
         var self = this;
         return this.__widgetRenderAndInsert(function(t) {
-            self.$element.appendTo(t);
+            self.$el.appendTo(t);
         }, target);
     },
     /**
@@ -557,7 +562,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     prependTo: function(target) {
         var self = this;
         return this.__widgetRenderAndInsert(function(t) {
-            self.$element.prependTo(t);
+            self.$el.prependTo(t);
         }, target);
     },
     /**
@@ -568,7 +573,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     insertAfter: function(target) {
         var self = this;
         return this.__widgetRenderAndInsert(function(t) {
-            self.$element.insertAfter(t);
+            self.$el.insertAfter(t);
         }, target);
     },
     /**
@@ -579,7 +584,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     insertBefore: function(target) {
         var self = this;
         return this.__widgetRenderAndInsert(function(t) {
-            self.$element.insertBefore(t);
+            self.$el.insertBefore(t);
         }, target);
     },
     /**
@@ -589,7 +594,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
      */
     replace: function(target) {
         return this.__widgetRenderAndInsert(_.bind(function(t) {
-            this.$element.replaceAll(t);
+            this.$el.replaceAll(t);
         }, this), target);
     },
     __widgetRenderAndInsert: function(insertion, target) {
@@ -612,6 +617,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
      * @returns {jQuery.Deferred}
      */
     start: function() {
+        return $.when();
     }
 });
 
@@ -688,12 +694,9 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      * @param {instance.web.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling destroy(), the current instance will be
      * destroyed too. Can be null.
-     * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
-     * to bind the current Widget to an already existing part of the DOM, which is not compatible
-     * with the DOM insertion methods provided by the current implementation of Widget. So
-     * for new components this argument should not be provided any more.
      */
     init: function(parent) {
+        this._uid = _.uniqueId('-widget-');
         instance.web.WidgetMixin.init.call(this,parent);
         this.session = instance.connection;
     },
@@ -703,20 +706,126 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      * key that references `this`.
      */
     renderElement: function() {
-        var rendered = null;
-        if (this.template)
-            rendered = instance.web.qweb.render(this.template, {widget: this});
-        if (_.str.trim(rendered)) {
-            var elem = $(rendered);
-            this.$element.replaceWith(elem);
-            this.$element = elem;
+        var $el;
+        if (this.template) {
+            $el = $(_.str.trim(instance.web.qweb.render(
+                this.template, {widget: this})));
+        } else {
+            var attrs = _.extend({}, getValue(this, 'attributes') || {});
+            if (this.id) { attrs.id = this.id; }
+            if (this.className) { attrs['class'] = this.className; }
+            $el = $(this.make(this.tagName, attrs))
+        }
+        this.setElement($el);
+    },
+
+    /**
+     * Re-sets the widget's root element (el/$el/$element).
+     *
+     * Includes:
+     * * re-delegating events
+     * * re-binding sub-elements
+     * * if the widget already had a root element, replacing the pre-existing
+     *   element in the DOM
+     *
+     * @param {HTMLElement | jQuery} element new root element for the widget
+     * @return {*}
+     */
+    setElement: function (element) {
+        if (this.$el) {
+            this.undelegateEvents();
+            this.unbindElements();
+            this.$el.replaceWith(element);
+        }
+
+        this.$element = this.$el = (element instanceof $) ? element : $(element);
+        this.el = this.$el[0];
+
+        this.bindElements();
+        this.delegateEvents();
+
+        return this;
+    },
+
+    // Backbone-ish API
+    tagName: 'div',
+    id: null,
+    className: null,
+    attributes: {},
+    /**
+     * Utility function to build small DOM elements.
+     *
+     * @param {String} tagName name of the DOM element to create
+     * @param {Object} [attributes] map of DOM attributes to set on the element
+     * @param {String} [content] HTML content to set on the element
+     * @return {Element}
+     */
+    make: function (tagName, attributes, content) {
+        var el = document.createElement(tagName);
+        if (attributes) {
+            $(el).attrs(attributes);
+        }
+        if (content) {
+            $(el).html(content);
+        }
+        return el;
+    },
+    events: {},
+    delegateEvents: function () {
+        var events = getValue(this, 'events');
+        if (_.isEmpty(events)) { return; }
+
+        for(var key in events) {
+            if (!events.hasOwnProperty(key)) { continue; }
+
+            var method = this.proxy(events[key]);
+
+            var match = /^(\S+)(\s+(.*))?$/.exec(key);
+            var event = match[1];
+            var selector = match[3];
+
+            // add namespace for easy un-delegation
+            event += '.delegated-events' + this._uid;
+            if (!selector) {
+                this.$el.on(event, method);
+            } else {
+                this.$el.on(event, selector, method);
+            }
+        }
+    },
+    undelegateEvents: function () {
+        this.$el.off('.delegated-events' + this._uid);
+    },
+    elements: {},
+    bindElements: function () {
+        var elements = getValue(this, 'elements');
+        if (_.isEmpty(elements)) { return; }
+
+        for (var selector in elements) {
+            if (!elements.hasOwnProperty(selector)) { continue; }
+
+            // TODO: ensure at least one element matched?
+            this[elements[selector]] = this.$(selector);
+        }
+    },
+    unbindElements: function () {
+        var elements = getValue(this, 'elements');
+        if (_.isEmpty(elements)) { return; }
+
+        for (var selector in elements) {
+            if (!elements.hasOwnProperty(selector)) { continue; }
+
+            delete this[elements[selector]];
         }
     },
     /**
-     * Shortcut for $element.find() like backbone
+     * Shortcut for ``this.$el.find(selector)``
+     *
+     * @param {String} selector CSS selector, rooted in $el
+     * @returns {jQuery} selector match
      */
-    "$": function() {
-        return this.$element.find.apply(this.$element,arguments);
+    $: function(selector) {
+        return this.$el.find(selector);
     },
     /**
      * Informs the action manager to do an action. This supposes that

From 459eb54d77f8fce5cce460d56c74121fe8125275 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 10:50:19 +0200
Subject: [PATCH 007/312] [FIX] broken unit tests

bzr revid: xmo@openerp.com-20120611085019-z16aggfnuovgh1p4
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3764395dc13..7bbc1884beb 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1409,10 +1409,10 @@
         </t>
     </t>
 </t>
-<div t-name="SearchView.Filters" class="oe_searchview_section">
+<div t-name="SearchView.Filters" class="oe_searchview_filters oe_searchview_section">
 
 </div>
-<div t-name="SearchView.CustomFilters" class="oe_searchview_section">
+<div t-name="SearchView.CustomFilters" class="oe_searchview_custom oe_searchview_section">
     <div>
         <h3><span class="oe_i">M</span> Custom Filters</h3>
         <ul class="oe_searchview_custom_list"/>

From 26ec50e0603561128a5470f871d9ea487ed95560 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 11:18:03 +0200
Subject: [PATCH 008/312] [FIX] bug in new 'proxy' implementation revealed by
 searchview tests

bzr revid: xmo@openerp.com-20120611091803-kzo5j5t8p82gwr6i
---
 addons/web/static/src/js/corelib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 8455a183f87..61464a58930 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -510,7 +510,7 @@ instance.web.CallbackEnabledMixin = _.extend({}, instance.web.PropertiesMixin, {
     proxy: function (method) {
         var self = this;
         return function () {
-            var fn = (method instanceof String) ? self[method] : method;
+            var fn = (typeof method === 'string') ? self[method] : method;
             return fn.apply(self, arguments);
         }
     }

From 5c701e2b1d8070e49f0dc247f1b649f19ebc7751 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 11:18:20 +0200
Subject: [PATCH 009/312] [FIX] behavior of OldWidget for new Widget
 implementation

bzr revid: xmo@openerp.com-20120611091820-m5gm67psqeh1xxx8
---
 addons/web/static/src/js/coresetup.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 4defde54a3c..d419c7ac3c1 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -19,15 +19,15 @@ instance.web.OldWidget = instance.web.Widget.extend({
         this._super(parent);
         this.element_id = element_id;
         this.element_id = this.element_id || _.uniqueId('widget-');
+
         var tmp = document.getElementById(this.element_id);
-        this.$element = tmp ? $(tmp) : $(document.createElement(this.tagName));
+        this.setElement(tmp || this.make(this.tagName));
     },
     renderElement: function() {
         var rendered = this.render();
         if (rendered) {
-            var elem = $(rendered);
-            this.$element.replaceWith(elem);
-            this.$element = elem;
+            var $el = $(rendered);
+            this.setElement($el);
         }
         return this;
     },

From 3f1757869c51cadb87d57abbb0392c78cb888bda Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 11:18:57 +0200
Subject: [PATCH 010/312] [IMP] make searchview base widget not inherit from
 OldWidget anymore

bzr revid: xmo@openerp.com-20120611091857-wcpc2oqywoc0gg51
---
 addons/web/static/src/js/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 85521a14651..22649197317 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -886,13 +886,13 @@ instance.web.search.Invalid = instance.web.Class.extend( /** @lends instance.web
         );
     }
 });
-instance.web.search.Widget = instance.web.OldWidget.extend( /** @lends instance.web.search.Widget# */{
+instance.web.search.Widget = instance.web.Widget.extend( /** @lends instance.web.search.Widget# */{
     template: null,
     /**
      * Root class of all search widgets
      *
      * @constructs instance.web.search.Widget
-     * @extends instance.web.OldWidget
+     * @extends instance.web.Widget
      *
      * @param view the ancestor view of this widget
      */

From 772bed66f33f16886ac0211cda6bd34ba05e4e3d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 11:48:40 +0200
Subject: [PATCH 011/312] [TEST] Widget#proxy, with both String and Function
 arguments

bzr revid: xmo@openerp.com-20120611094840-mtilgirzwlhkl2qc
---
 addons/web/static/test/Widget.js | 67 ++++++++++++++++++++++++++++++++
 addons/web/static/test/test.html |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 addons/web/static/test/Widget.js

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
new file mode 100644
index 00000000000..dc86e99b38a
--- /dev/null
+++ b/addons/web/static/test/Widget.js
@@ -0,0 +1,67 @@
+$(document).ready(function () {
+    var $fix = $('#qunit-fixture');
+    var mod = {
+        setup: function () {
+            instance = window.openerp.init([]);
+            window.openerp.web.corelib(instance);
+        }
+    };
+    var instance;
+
+    module('Widget.proxy', mod);
+    test('(String)', function () {
+        var W = instance.web.Widget.extend({
+            exec: function () {
+                this.executed = true;
+            }
+        });
+        var w = new W;
+        var fn = w.proxy('exec');
+        fn();
+        ok(w.executed, 'should execute the named method in the right context');
+    });
+    test('(String)(*args)', function () {
+        var W = instance.web.Widget.extend({
+            exec: function (arg) {
+                this.executed = arg;
+            }
+        });
+        var w = new W;
+        var fn = w.proxy('exec');
+        fn(42);
+        ok(w.executed, "should execute the named method in the right context");
+        equal(w.executed, 42, "should be passed the proxy's arguments");
+    });
+    test('(String), include', function () {
+        // the proxy function should handle methods being changed on the class
+        // and should always proxy "by name", to the most recent one
+        var W = instance.web.Widget.extend({
+            exec: function () {
+                this.executed = 1;
+            }
+        });
+        var w = new W;
+        var fn = w.proxy('exec');
+        W.include({
+            exec: function () { this.executed = 2; }
+        });
+
+        fn();
+        equal(w.executed, 2, "should be lazily resolved");
+    });
+
+    test('(Function)', function () {
+        var w = new (instance.web.Widget.extend({ }));
+
+        var fn = w.proxy(function () { this.executed = true; });
+        fn();
+        ok(w.executed, "should set the function's context (like Function#bind)");
+    });
+    test('(Function)(*args)', function () {
+        var w = new (instance.web.Widget.extend({ }));
+
+        var fn = w.proxy(function (arg) { this.executed = arg; });
+        fn(42);
+        equal(w.executed, 42, "should be passed the proxy's arguments");
+    });
+});
diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html
index e352f63c17c..dd0d08a4986 100644
--- a/addons/web/static/test/test.html
+++ b/addons/web/static/test/test.html
@@ -55,4 +55,5 @@
     <script type="text/javascript" src="/web/static/test/rpc.js"></script>
     <script type="text/javascript" src="/web/static/test/evals.js"></script>
     <script type="text/javascript" src="/web/static/test/search.js"></script>
+    <script type="text/javascript" src="/web/static/test/Widget.js"></script>
 </html>

From a0c5057dbacef8e8f1841245c58ad4f52da57ef9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 13:32:38 +0200
Subject: [PATCH 012/312] [TEST] Widget#renderElement with no template
 specified, fix Widget#make's handling of attributes

bzr revid: xmo@openerp.com-20120611113238-wz516g9tl0xp1igd
---
 addons/web/static/src/js/corelib.js |  4 +-
 addons/web/static/test/Widget.js    | 68 +++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 61464a58930..83586ec57d4 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -762,8 +762,8 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      */
     make: function (tagName, attributes, content) {
         var el = document.createElement(tagName);
-        if (attributes) {
-            $(el).attrs(attributes);
+        if (!_.isEmpty(attributes)) {
+            $(el).attr(attributes);
         }
         if (content) {
             $(el).html(content);
diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index dc86e99b38a..51a5182845d 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -64,4 +64,72 @@ $(document).ready(function () {
         fn(42);
         equal(w.executed, 42, "should be passed the proxy's arguments");
     });
+
+    module('Widget.renderElement', mod);
+    test('no template, default', function () {
+        var w = new (instance.web.Widget.extend({ }));
+
+        ok(!w.$el, "should not initially have a root element");
+        w.renderElement();
+        ok(w.$el, "should have generated a root element");
+        strictEqual(w.$element, w.$el, "should provide $element alias");
+        ok(w.$el.is(w.el), "should provide raw DOM alias");
+
+        equal(w.el.nodeName, 'DIV', "should have generated the default element");
+        equal(w.el.attributes.length, 0, "should not have generated any attribute");
+        ok(_.isEmpty(w.$el.html(), "should not have generated any content"));
+    });
+    test('no template, custom tag', function () {
+        var w = new (instance.web.Widget.extend({
+            tagName: 'ul'
+        }));
+        w.renderElement();
+
+        equal(w.el.nodeName, 'UL', "should have generated the custom element tag");
+    });
+    test('no template, @id', function () {
+        var w = new (instance.web.Widget.extend({
+            id: 'foo'
+        }));
+        w.renderElement();
+
+        equal(w.el.attributes.length, 1, "should have one attribute");
+        equal(w.$el.attr('id'), 'foo', "should have generated the id attribute");
+        equal(w.el.id, 'foo', "should also be available via property");
+    });
+    test('no template, @className', function () {
+        var w = new (instance.web.Widget.extend({
+            className: 'oe_some_class'
+        }));
+        w.renderElement();
+
+        equal(w.el.className, 'oe_some_class', "should have the right property");
+        equal(w.$el.attr('class'), 'oe_some_class', "should have the right attribute");
+    });
+    test('no template, bunch of attributes', function () {
+        var w = new (instance.web.Widget.extend({
+            attributes: {
+                'id': 'some_id',
+                'class': 'some_class',
+                'data-foo': 'data attribute',
+                'clark': 'gable',
+                'spoiler': 'snape kills dumbledore'
+            }
+        }));
+        w.renderElement();
+
+        equal(w.el.attributes.length, 5, "should have all the specified attributes");
+
+        equal(w.el.id, 'some_id');
+        equal(w.$el.attr('id'), 'some_id');
+
+        equal(w.el.className, 'some_class');
+        equal(w.$el.attr('class'), 'some_class');
+
+        equal(w.$el.attr('data-foo'), 'data attribute');
+        equal(w.$el.data('foo'), 'data attribute');
+
+        equal(w.$el.attr('clark'), 'gable');
+        equal(w.$el.attr('spoiler'), 'snape kills dumbledore');
+    });
 });

From c531cb96ca2b0dc74ec6f9569eec8ea24c6506a1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 13:48:49 +0200
Subject: [PATCH 013/312] [TEST] Wisget#renderElement with template

bzr revid: xmo@openerp.com-20120611114849-dwk4erae5f1tyc6o
---
 addons/web/static/test/Widget.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index 51a5182845d..3a2301e53f8 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -132,4 +132,24 @@ $(document).ready(function () {
         equal(w.$el.attr('clark'), 'gable');
         equal(w.$el.attr('spoiler'), 'snape kills dumbledore');
     });
+
+    test('template', function () {
+        instance.web.qweb = new QWeb2.Engine();
+        instance.web.qweb.add_template('<no><t t-name="test.widget.template">' +
+            '<ol>' +
+                '<li t-foreach="5" t-as="counter">' +
+                    '<t t-esc="counter"/>' +
+                '</li>' +
+            '</ol>' +
+        '</t></no>');
+
+        var w = new (instance.web.Widget.extend({
+            template: 'test.widget.template'
+        }));
+        w.renderElement();
+
+        equal(w.el.nodeName, 'OL');
+        equal(w.$el.children().length, 5);
+        equal(w.el.textContent, '01234');
+    });
 });

From 2a9bd73a83c27e3dfab7e7b6438ad9988930ae39 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 14:08:18 +0200
Subject: [PATCH 014/312] [TEST] Widget#$ shortcut

bzr revid: xmo@openerp.com-20120611120818-apsawz6kypnpc5m3
---
 addons/web/static/test/Widget.js | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index 3a2301e53f8..f588d9a258c 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -4,6 +4,15 @@ $(document).ready(function () {
         setup: function () {
             instance = window.openerp.init([]);
             window.openerp.web.corelib(instance);
+
+            instance.web.qweb = new QWeb2.Engine();
+            instance.web.qweb.add_template('<no><t t-name="test.widget.template">' +
+                '<ol>' +
+                    '<li t-foreach="5" t-as="counter">' +
+                        '<t t-esc="counter"/>' +
+                    '</li>' +
+                '</ol>' +
+            '</t></no>');
         }
     };
     var instance;
@@ -134,15 +143,6 @@ $(document).ready(function () {
     });
 
     test('template', function () {
-        instance.web.qweb = new QWeb2.Engine();
-        instance.web.qweb.add_template('<no><t t-name="test.widget.template">' +
-            '<ol>' +
-                '<li t-foreach="5" t-as="counter">' +
-                    '<t t-esc="counter"/>' +
-                '</li>' +
-            '</ol>' +
-        '</t></no>');
-
         var w = new (instance.web.Widget.extend({
             template: 'test.widget.template'
         }));
@@ -152,4 +152,15 @@ $(document).ready(function () {
         equal(w.$el.children().length, 5);
         equal(w.el.textContent, '01234');
     });
+
+    module('Widget.$', mod);
+    test('basic-alias', function () {
+        var w = new (instance.web.Widget.extend({
+            template: 'test.widget.template'
+        }));
+        w.renderElement();
+
+        ok(w.$('li:eq(3)').is(w.$el.find('li:eq(3)')),
+           "should do the same thing as calling find on the widget root");
+    });
 });

From c64d8859a01933a89cd5c06df4324d7e11081a4f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 14:48:24 +0200
Subject: [PATCH 015/312] [TEST] declarative events delegation

bzr revid: xmo@openerp.com-20120611124824-w83h6betknrajyte
---
 addons/web/static/test/Widget.js | 49 +++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index f588d9a258c..d797120a341 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -8,7 +8,9 @@ $(document).ready(function () {
             instance.web.qweb = new QWeb2.Engine();
             instance.web.qweb.add_template('<no><t t-name="test.widget.template">' +
                 '<ol>' +
-                    '<li t-foreach="5" t-as="counter">' +
+                    '<li t-foreach="5" t-as="counter" ' +
+                        't-attf-class="class-#{counter}">' +
+                        '<input/>' +
                         '<t t-esc="counter"/>' +
                     '</li>' +
                 '</ol>' +
@@ -163,4 +165,49 @@ $(document).ready(function () {
         ok(w.$('li:eq(3)').is(w.$el.find('li:eq(3)')),
            "should do the same thing as calling find on the widget root");
     });
+
+    module('Widget.events', mod);
+    test('delegate', function () {
+        var a = [];
+        var w = new (instance.web.Widget.extend({
+            template: 'test.widget.template',
+            events: {
+                'click': function () {
+                    a[0] = true;
+                    strictEqual(this, w, "should trigger events in widget")
+                },
+                'click li.class-3': 'class3',
+                'change input': function () { a[2] = true; }
+            },
+            class3: function () { a[1] = true; }
+        }));
+        w.renderElement();
+
+        w.$el.click();
+        w.$('li:eq(3)').click();
+        w.$('input:last').val('foo').change();
+
+        for(var i=0; i<3; ++i) {
+            ok(a[i], "should pass test " + i);
+        }
+    });
+    test('undelegate', function () {
+        var clicked = false, newclicked = false;
+        var w = new (instance.web.Widget.extend({
+            template: 'test.widget.template',
+            events: { 'click li': function () { clicked = true; } }
+        }));
+        w.renderElement();
+        w.$el.on('click', 'li', function () { newclicked = true });
+
+        w.$('li').click();
+        ok(clicked, "should trigger bound events");
+        ok(newclicked, "should trigger bound events");
+        clicked = newclicked = false;
+
+        w.undelegateEvents();
+        w.$('li').click();
+        ok(!clicked, "undelegate should unbind events delegated");
+        ok(newclicked, "undelegate should only unbind events it created");
+    });
 });

From b19354ae2005e83980a938c8e534fe55b5d1c14e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 14:54:54 +0200
Subject: [PATCH 016/312] [TEST] getValue/events as a callable

bzr revid: xmo@openerp.com-20120611125454-nli5gkds9ffksmdm
---
 addons/web/static/test/Widget.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index d797120a341..36d6795ff7c 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -191,6 +191,17 @@ $(document).ready(function () {
             ok(a[i], "should pass test " + i);
         }
     });
+    test('delegate(Function)', function () {
+        var clicked = false, fn = function () {
+            return { 'click li': function () { clicked = true; } }; };
+        var w = new (instance.web.Widget.extend({
+            template: 'test.widget.template',
+            events: fn
+        }));
+        w.renderElement();
+        w.$('li:first').click();
+        ok(clicked, "should accept #events to be a function");
+    });
     test('undelegate', function () {
         var clicked = false, newclicked = false;
         var w = new (instance.web.Widget.extend({

From d6f376464516709c7b4ad7631ac1e49e4e39fe5e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 16:41:08 +0200
Subject: [PATCH 017/312] [REM] declarative elements binding, not sure there's
 much point and can add later

bzr revid: xmo@openerp.com-20120611144108-pw8pz5p06prsikxe
---
 addons/web/static/src/js/corelib.js | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 83586ec57d4..e9fd4e1fedf 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -734,14 +734,12 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     setElement: function (element) {
         if (this.$el) {
             this.undelegateEvents();
-            this.unbindElements();
             this.$el.replaceWith(element);
         }
 
         this.$element = this.$el = (element instanceof $) ? element : $(element);
         this.el = this.$el[0];
 
-        this.bindElements();
         this.delegateEvents();
 
         return this;
@@ -796,28 +794,6 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     undelegateEvents: function () {
         this.$el.off('.delegated-events' + this._uid);
     },
-    elements: {},
-    bindElements: function () {
-        var elements = getValue(this, 'elements');
-        if (_.isEmpty(elements)) { return; }
-
-        for (var selector in elements) {
-            if (!elements.hasOwnProperty(selector)) { continue; }
-
-            // TODO: ensure at least one element matched?
-            this[elements[selector]] = this.$(selector);
-        }
-    },
-    unbindElements: function () {
-        var elements = getValue(this, 'elements');
-        if (_.isEmpty(elements)) { return; }
-
-        for (var selector in elements) {
-            if (!elements.hasOwnProperty(selector)) { continue; }
-
-            delete this[elements[selector]];
-        }
-    },
     /**
      * Shortcut for ``this.$el.find(selector)``
      *

From d2f7ddb43eeb53973e7957fa9bccf3153d7f7bc5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Jun 2012 17:07:02 +0200
Subject: [PATCH 018/312] [ADD] doc for backbone-ish APIs

bzr revid: xmo@openerp.com-20120611150702-r4c9kyxmu8m7g4c0
---
 doc/addons.rst | 109 --------------------
 doc/index.rst  |   1 +
 doc/widget.rst | 270 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 271 insertions(+), 109 deletions(-)
 create mode 100644 doc/widget.rst

diff --git a/doc/addons.rst b/doc/addons.rst
index da1f1f28769..35878b04430 100644
--- a/doc/addons.rst
+++ b/doc/addons.rst
@@ -113,103 +113,6 @@ initializing the addon.
 Creating new standard roles
 ---------------------------
 
-Widget
-++++++
-
-This is the base class for all visual components. It provides a number of
-services for the management of a DOM subtree:
-
-* Rendering with QWeb
-
-* Parenting-child relations
-
-* Life-cycle management (including facilitating children destruction when a
-  parent object is removed)
-
-* DOM insertion, via jQuery-powered insertion methods. Insertion targets can
-  be anything the corresponding jQuery method accepts (generally selectors,
-  DOM nodes and jQuery objects):
-
-  :js:func:`~openerp.base.Widget.appendTo`
-    Renders the widget and inserts it as the last child of the target, uses
-    `.appendTo()`_
-
-  :js:func:`~openerp.base.Widget.prependTo`
-    Renders the widget and inserts it as the first child of the target, uses
-    `.prependTo()`_
-
-  :js:func:`~openerp.base.Widget.insertAfter`
-    Renders the widget and inserts it as the preceding sibling of the target,
-    uses `.insertAfter()`_
-
-  :js:func:`~openerp.base.Widget.insertBefore`
-    Renders the widget and inserts it as the following sibling of the target,
-    uses `.insertBefore()`_
-
-:js:class:`~openerp.base.Widget` inherits from
-:js:class:`~openerp.base.SessionAware`, so subclasses can easily access the
-RPC layers.
-
-Subclassing Widget
-~~~~~~~~~~~~~~~~~~
-
-:js:class:`~openerp.base.Widget` is subclassed in the standard manner (via the
-:js:func:`~openerp.base.Class.extend` method), and provides a number of
-abstract properties and concrete methods (which you may or may not want to
-override). Creating a subclass looks like this:
-
-.. code-block:: javascript
-
-    var MyWidget = openerp.base.Widget.extend({
-        // QWeb template to use when rendering the object
-        template: "MyQWebTemplate",
-
-        init: function(parent) {
-            this._super(parent);
-            // insert code to execute before rendering, for object
-            // initialization
-        },
-        start: function() {
-            this._super();
-            // post-rendering initialization code, at this point
-            // ``this.$element`` has been initialized
-            this.$element.find(".my_button").click(/* an example of event binding * /);
-
-            // if ``start`` is asynchronous, return a promise object so callers
-            // know when the object is done initializing
-            return this.rpc(/* … */)
-        }
-    });
-
-The new class can then be used in the following manner:
-
-.. code-block:: javascript
-
-    // Create the instance
-    var my_widget = new MyWidget(this);
-    // Render and insert into DOM
-    my_widget.appendTo(".some-div");
-
-After these two lines have executed (and any promise returned by ``appendTo``
-has been resolved if needed), the widget is ready to be used.
-
-.. note:: the insertion methods will start the widget themselves, and will
-          return the result of :js:func:`~openerp.base.Widget.start()`.
-
-          If for some reason you do not want to call these methods, you will
-          have to first call :js:func:`~openerp.base.Widget.render()` on the
-          widget, then insert it into your DOM and start it.
-
-If the widget is not needed anymore (because it's transient), simply terminate
-it:
-
-.. code-block:: javascript
-
-    my_widget.stop();
-
-will unbind all DOM events, remove the widget's content from the DOM and
-destroy all widget data.
-
 Views
 +++++
 
@@ -541,18 +444,6 @@ Python
 .. _promise object:
     http://api.jquery.com/deferred.promise/
 
-.. _.appendTo():
-    http://api.jquery.com/appendTo/
-
-.. _.prependTo():
-    http://api.jquery.com/prependTo/
-
-.. _.insertAfter():
-    http://api.jquery.com/insertAfter/
-
-.. _.insertBefore():
-    http://api.jquery.com/insertBefore/
-
 .. _Rosetta:
 .. _Launchpad's own translation tool:
     https://help.launchpad.net/Translations
diff --git a/doc/index.rst b/doc/index.rst
index 9f54b879acc..1f660426a88 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -16,6 +16,7 @@ Contents:
     async
     rpc
 
+    widget
     search-view
 
 Older stuff
diff --git a/doc/widget.rst b/doc/widget.rst
new file mode 100644
index 00000000000..9868e4030e0
--- /dev/null
+++ b/doc/widget.rst
@@ -0,0 +1,270 @@
+User Interaction: Widget
+========================
+
+This is the base class for all visual components. It corresponds to an MVC
+view. It provides a number of services to handle a section of a page:
+
+* Rendering with QWeb
+
+* Parenting-child relations
+
+* Life-cycle management (including facilitating children destruction when a
+  parent object is removed)
+
+* DOM insertion, via jQuery-powered insertion methods. Insertion targets can
+  be anything the corresponding jQuery method accepts (generally selectors,
+  DOM nodes and jQuery objects):
+
+  :js:func:`~openerp.base.Widget.appendTo`
+    Renders the widget and inserts it as the last child of the target, uses
+    `.appendTo()`_
+
+  :js:func:`~openerp.base.Widget.prependTo`
+    Renders the widget and inserts it as the first child of the target, uses
+    `.prependTo()`_
+
+  :js:func:`~openerp.base.Widget.insertAfter`
+    Renders the widget and inserts it as the preceding sibling of the target,
+    uses `.insertAfter()`_
+
+  :js:func:`~openerp.base.Widget.insertBefore`
+    Renders the widget and inserts it as the following sibling of the target,
+    uses `.insertBefore()`_
+
+* Backbone-compatible shortcuts
+
+DOM Root
+--------
+
+A :js:class:`~openerp.web.Widget` is responsible for a section of the
+page materialized by the DOM root of the widget. The DOM root is
+available via the :js:attr:`~openerp.web.Widget.el` and
+:js:attr:`~openerp.web.Widget.$el` attributes, which are respectively
+the raw DOM Element and the jQuery wrapper around the DOM element.
+
+.. note::
+
+    both attributes are compatible with Backbone's equivalent, there
+    is also the :js:attr:`~openerp.web.Widget.$element` attribute
+    which aliases to :js:attr:`~openerp.web.Widget.$el` and remains
+    for backwards compatiblity reasons.
+
+There are two main ways to define and generate this DOM root:
+
+.. js:attribute:: openerp.web.Widget.template
+
+    Should be set to the name of a QWeb template (a
+    :js:class:`String`). If set, the template will be rendered after
+    the widget has been initialized but before it has been
+    started. The root element generated by the template will be set as
+    the DOM root of the widget.
+
+.. js:attribute:: openerp.web.Widget.tagName
+
+    Used if the widget has no template defined. Defaults to ``div``,
+    will be used as the tag name to create the DOM element to set as
+    the widget's DOM root. It is possible to further customize this
+    generated DOM root with the following attributes:
+
+    .. js:attribute:: openerp.web.Widget.id
+
+        Used to generate an ``id`` attribute on the generated DOM
+        root.
+
+    .. js:attribute:: openerp.web.Widget.className
+
+        Used to generate a ``class`` attribute on the generated DOM root.
+
+    .. js:attribute:: openerp.web.Widget.attributes
+
+        Mapping (object literal) of attribute names to attribute
+        values. Each of these k:v pairs will be set as a DOM attribute
+        on the generated DOM root.
+
+    None of these is used in case a template is specified on the widget.
+
+The DOM root can also be defined programmatically by overridding
+
+.. js:function:: openerp.web.Widget.renderElement
+
+    Renders the widget's DOM root and sets it. The default
+    implementation will render a set template or generate an element
+    as described above, and will call
+    :js:func:`~openerp.web.Widget.setElement` on the result.
+
+    Any override to :js:func:`~openerp.web.Widget.renderElement` which
+    does not call its ``_super`` **must** call
+    :js:func:`~openerp.web.Widget.setElement` with whatever it
+    generated or the widget's behavior is undefined.
+
+Accessing DOM content
+~~~~~~~~~~~~~~~~~~~~~
+
+Because a widget is only responsible for the content below its DOM
+root, there is a shortcut for selecting sub-sections of a widget's
+DOM:
+
+.. js:function:: openerp.web.Widget.$(selector)
+
+    Applies the CSS selector specified as parameter to the widget's
+    DOM root.
+
+    .. code-block:: javascript
+
+        this.$(selector);
+
+    is functionally identical to:
+
+    .. code-block:: javascript
+
+        this.$element.find(selector);
+
+    :param String selector: CSS selector
+    :returns: jQuery object
+
+    .. note:: this helper method is compatible with
+              ``Backbone.View.$``
+
+Resetting the DOM root
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. js:function:: openerp.web.Widget.setElement(element)
+
+    Re-sets the widget's DOM root to the provided element, also
+    handles re-setting the various aliases of the DOM root as well as
+    unsetting and re-setting delegated events.
+
+    :param Element element: a DOM element or jQuery object to set as
+                            the widget's DOM root
+
+    .. note:: should be mostly compatible with `Backbone's
+              setElement`_
+
+DOM events handling
+-------------------
+
+A widget will generally need to respond to user action within its
+section of the page. This entails binding events to DOM elements.
+
+To this end, :js:class:`~openerp.web.Widget` provides an shortcut:
+
+.. js:attribute:: openerp.web.Widget.events
+
+    Events are a mapping of ``event selector`` (an event name and a
+    CSS selector separated by a space) to a callback. The callback can
+    be either a method name in the widget or a function. In either
+    case, the ``this`` will be set to the widget.
+
+    The selector is used for jQuery's `event delegation`_, the
+    callback will only be triggered for descendants of the DOM root
+    matching the selector [0]_. If the selector is left out (only an
+    event name is specified), the event will be set directly on the
+    widget's DOM root.
+
+.. js:function:: openerp.web.Widget.delegateEvents
+
+    This method is in charge of binding
+    :js:attr:`~openerp.web.Widget.events` to the DOM. It is
+    automatically called after setting the widget's DOM root.
+
+    It can be overridden to set up more complex events than the
+    :js:attr:`~openerp.web.Widget.events` map allows, but the parent
+    should always be called (or :js:attr:`~openerp.web.Widget.events`
+    won't be handled correctly).
+
+.. js:function:: openerp.web.Widget.undelegateEvents
+
+    This method is in charge of unbinding
+    :js:attr:`~openerp.web.Widget.events` from the DOM root when the
+    widget is destroyed or the DOM root is reset, in order to avoid
+    leaving "phantom" events.
+
+    It should be overridden to un-set any event set in an override of
+    :js:func:`~openerp.web.Widget.delegateEvents`.
+
+.. note:: this behavior should be compatible with `Backbone's
+          delegateEvents`_, apart from not accepting any argument.
+
+Subclassing Widget
+------------------
+
+:js:class:`~openerp.base.Widget` is subclassed in the standard manner (via the
+:js:func:`~openerp.base.Class.extend` method), and provides a number of
+abstract properties and concrete methods (which you may or may not want to
+override). Creating a subclass looks like this:
+
+.. code-block:: javascript
+
+    var MyWidget = openerp.base.Widget.extend({
+        // QWeb template to use when rendering the object
+        template: "MyQWebTemplate",
+
+        init: function(parent) {
+            this._super(parent);
+            // insert code to execute before rendering, for object
+            // initialization
+        },
+        start: function() {
+            this._super();
+            // post-rendering initialization code, at this point
+            // ``this.$element`` has been initialized
+            this.$element.find(".my_button").click(/* an example of event binding * /);
+
+            // if ``start`` is asynchronous, return a promise object so callers
+            // know when the object is done initializing
+            return this.rpc(/* … */)
+        }
+    });
+
+The new class can then be used in the following manner:
+
+.. code-block:: javascript
+
+    // Create the instance
+    var my_widget = new MyWidget(this);
+    // Render and insert into DOM
+    my_widget.appendTo(".some-div");
+
+After these two lines have executed (and any promise returned by ``appendTo``
+has been resolved if needed), the widget is ready to be used.
+
+.. note:: the insertion methods will start the widget themselves, and will
+          return the result of :js:func:`~openerp.base.Widget.start()`.
+
+          If for some reason you do not want to call these methods, you will
+          have to first call :js:func:`~openerp.base.Widget.render()` on the
+          widget, then insert it into your DOM and start it.
+
+If the widget is not needed anymore (because it's transient), simply terminate
+it:
+
+.. code-block:: javascript
+
+    my_widget.destroy();
+
+will unbind all DOM events, remove the widget's content from the DOM and
+destroy all widget data.
+
+.. [0] not all DOM events are compatible with events delegation
+
+.. _.appendTo():
+    http://api.jquery.com/appendTo/
+
+.. _.prependTo():
+    http://api.jquery.com/prependTo/
+
+.. _.insertAfter():
+    http://api.jquery.com/insertAfter/
+
+.. _.insertBefore():
+    http://api.jquery.com/insertBefore/
+
+.. _event delegation:
+    http://api.jquery.com/delegate/
+
+.. _Backbone's setElement:
+    http://backbonejs.org/#View-setElement
+
+.. _Backbone's delegateEvents:
+    http://backbonejs.org/#View-delegateEvents
+

From f0ad5fedacc2e994ef8ba45b05113278ac72db95 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Jun 2012 15:21:20 +0200
Subject: [PATCH 019/312] [IMP] move .replaceWith() back into renderElement

* Better formalizes repeated calls to renderElement
* Makes setElement cleaner and less surprising to call

bzr revid: xmo@openerp.com-20120612132120-egsg4kr5n2riv4zk
---
 addons/web/static/src/js/corelib.js |  5 +++-
 addons/web/static/test/Widget.js    | 42 ++++++++++++++++++++++-------
 doc/widget.rst                      | 12 ++++++++-
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index e9fd4e1fedf..73fa6839607 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -716,7 +716,11 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
             if (this.className) { attrs['class'] = this.className; }
             $el = $(this.make(this.tagName, attrs))
         }
+        var $oldel = this.$el;
         this.setElement($el);
+        if ($oldel && !$oldel.is(this.$el)) {
+            $oldel.replaceWith(this.$el);
+        }
     },
 
     /**
@@ -734,7 +738,6 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     setElement: function (element) {
         if (this.$el) {
             this.undelegateEvents();
-            this.$el.replaceWith(element);
         }
 
         this.$element = this.$el = (element instanceof $) ? element : $(element);
diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index 36d6795ff7c..b50dd233a13 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -6,15 +6,21 @@ $(document).ready(function () {
             window.openerp.web.corelib(instance);
 
             instance.web.qweb = new QWeb2.Engine();
-            instance.web.qweb.add_template('<no><t t-name="test.widget.template">' +
-                '<ol>' +
-                    '<li t-foreach="5" t-as="counter" ' +
-                        't-attf-class="class-#{counter}">' +
-                        '<input/>' +
-                        '<t t-esc="counter"/>' +
-                    '</li>' +
-                '</ol>' +
-            '</t></no>');
+            instance.web.qweb.add_template(
+            '<no>' +
+                '<t t-name="test.widget.template">' +
+                    '<ol>' +
+                        '<li t-foreach="5" t-as="counter" ' +
+                            't-attf-class="class-#{counter}">' +
+                            '<input/>' +
+                            '<t t-esc="counter"/>' +
+                        '</li>' +
+                    '</ol>' +
+                '</t>' +
+                '<t t-name="test.widget.template-value">' +
+                    '<p><t t-esc="widget.value"/></p>' +
+                '</t>' +
+            '</no>');
         }
     };
     var instance;
@@ -221,4 +227,22 @@ $(document).ready(function () {
         ok(!clicked, "undelegate should unbind events delegated");
         ok(newclicked, "undelegate should only unbind events it created");
     });
+
+    module('Widget.renderElement', mod);
+    test('repeated', function () {
+        var w = new (instance.web.Widget.extend({
+            template: 'test.widget.template-value'
+        }));
+        w.value = 42;
+        w.appendTo($fix)
+            .always(start)
+            .done(function () {
+                equal($fix.find('p').text(), '42', "DOM fixture should contain initial value");
+                equal(w.$el.text(), '42', "should set initial value");
+                w.value = 36;
+                w.renderElement();
+                equal($fix.find('p').text(), '36', "DOM fixture should use new value");
+                equal(w.$el.text(), '36', "should set new value");
+            });
+    });
 });
diff --git a/doc/widget.rst b/doc/widget.rst
index 9868e4030e0..b29260c5882 100644
--- a/doc/widget.rst
+++ b/doc/widget.rst
@@ -95,7 +95,17 @@ The DOM root can also be defined programmatically by overridding
     Any override to :js:func:`~openerp.web.Widget.renderElement` which
     does not call its ``_super`` **must** call
     :js:func:`~openerp.web.Widget.setElement` with whatever it
-    generated or the widget's behavior is undefined.
+    generated or the widget's behavior is undefined.r
+
+    .. note::
+
+        The default :js:func:`~openerp.web.Widget.renderElement` can
+        be called repeatedly, it will *replace* the previous DOM root
+        (using ``replaceWith``). However, this requires that the
+        widget correctly sets and unsets its events (and children
+        widgets). Generally,
+        :js:func:`~openerp.web.Widget.renderElement` should not be
+        called repeatedly unless the widget advertizes this feature.
 
 Accessing DOM content
 ~~~~~~~~~~~~~~~~~~~~~

From 2c115e6856f5c6eb7f3d730b0ccfa028b386b009 Mon Sep 17 00:00:00 2001
From: Ronald Portier <ronald@therp.nl>
Date: Fri, 22 Jun 2012 16:19:32 +0200
Subject: [PATCH 020/312] [FIX] Problem with runaway cpu and/or postgres crash
 on analytic account analysis.

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

bzr revid: ronald@therp.nl-20120622141932-f6rywvd1nawn186w
---
 .../account_analytic_analysis.py              | 54 +++++++------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 20c170cb5c0..cedcc9fa533 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -418,41 +418,25 @@ class account_analytic_account_summary_user(osv.osv):
     }
 
     def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
-        cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \
-                'SELECT ' \
-                    '(u.account_id * u.max_user) + u."user" AS id, ' \
-                    'u.account_id AS account_id, ' \
-                    'u."user" AS "user", ' \
-                    'COALESCE(SUM(l.unit_amount), 0.0) AS unit_amount ' \
-                'FROM ' \
-                    '(SELECT ' \
-                        'a.id AS account_id, ' \
-                        'u1.id AS "user", ' \
-                        'MAX(u2.id) AS max_user ' \
-                    'FROM ' \
-                        'res_users AS u1, ' \
-                        'res_users AS u2, ' \
-                        'account_analytic_account AS a ' \
-                    'GROUP BY u1.id, a.id ' \
-                    ') AS u ' \
-                'LEFT JOIN ' \
-                    '(SELECT ' \
-                        'l.account_id AS account_id, ' \
-                        'l.user_id AS "user", ' \
-                        'SUM(l.unit_amount) AS unit_amount ' \
-                    'FROM account_analytic_line AS l, ' \
-                        'account_analytic_journal AS j ' \
-                    'WHERE (j.type = \'general\') and (j.id=l.journal_id) ' \
-                    'GROUP BY l.account_id, l.user_id ' \
-                    ') AS l '
-                    'ON (' \
-                        'u.account_id = l.account_id ' \
-                        'AND u."user" = l."user"' \
-                    ') ' \
-                'GROUP BY u."user", u.account_id, u.max_user' \
-                ')')
-
+        cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (
+            with mu as
+                (select max(id) as max_user from res_users)
+            , lu AS
+                (SELECT   
+                 l.account_id AS account_id,   
+                 coalesce(l.user_id, 0) AS user_id,   
+                 SUM(l.unit_amount) AS unit_amount   
+             FROM account_analytic_line AS l,   
+                 account_analytic_journal AS j   
+             WHERE (j.type = 'general' ) and (j.id=l.journal_id)   
+             GROUP BY l.account_id, l.user_id   
+            )
+            select (lu.account_id * mu.max_user) + lu.user_id as id,
+                    lu.account_id as account_id,
+                    lu.user_id as "user",
+                    unit_amount
+            from lu, mu)''')
+                   
 account_analytic_account_summary_user()
 
 class account_analytic_account_summary_month(osv.osv):

From e0e7597aa037206d34912420cf77c3a1681ab130 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 29 Jun 2012 14:52:09 +0200
Subject: [PATCH 021/312] [IMP] start the portal's contact page new layout

bzr revid: abo@openerp.com-20120629125209-03wbu806i8mi2ab7
---
 addons/portal_crm/wizard/contact.py       | 17 +++++++
 addons/portal_crm/wizard/contact_view.xml | 56 +++++++++++++++++++----
 2 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index be21decafa9..7ea4d094ac3 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -5,6 +5,23 @@ class crm_contact_us(osv.TransientModel):
     _name = 'portal_crm.crm_contact_us'
     _description = 'Contact form for the portal'
     _inherit = 'crm.lead'
+    _columns = {
+        'company_ids' : fields.many2many('res.company', string='Companies', readonly=True),
+        'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True),
+    }
+
+    def _get_employee(self, cr, uid, context=None):
+        r = self.pool.get('hr.employee').search(cr, uid, [], context=context)
+        return r
+
+    def _get_companies(self, cr, uid, context=None):
+        r = self.pool.get('res.company').search(cr, uid, [], context=context)
+        return r
+
+    _defaults = {
+        'employee_ids' : _get_employee,
+        'company_ids' : _get_companies
+    }
 
     def create(self, cr, uid, values, context=None):
         """ 
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 904326ea409..3e4afa067f6 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -8,16 +8,52 @@
             <field name="model">portal_crm.crm_contact_us</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Contact Us wizard view">
-                    <group col="2">
-                        <field name="contact_name" string="Name"/>
-                        <field name="name" string="Company"/>
-                        <field name="email_from"/>
-                        <field name="phone"/>
-                        <field name="description" string="Your question"/>
-                        <label string=""/>
-                        <button string="Submit" name="submit" type="object"/>
-                    </group>
+                <form string="Contact Us wizard view" version="7.0">
+                    <div style="width: 960px; margin: 0 auto;">
+                        <table>
+                            <tr>
+                                <td width="80%%">
+                                    <group>
+                                        <field name="contact_name" string="Name"/>
+                                        <field name="name" string="Company"/>
+                                        <field name="email_from"/>
+                                        <field name="phone"/>
+                                        <field name="description" string="Your question"/>
+                                        <label string=""/>
+                                        <button string="Submit" name="submit" type="object"/>
+                                    </group>
+                                    <field name="employee_ids"/>
+                                </td>
+                                <td>
+                                    <field name="company_ids" widget="many2many_kanban">
+                                        <kanban>
+                                            <field name="name"/>
+                                            <field name="email"/>
+                                            <field name="phone"/>
+                                            <field name="street"/>
+                                            <field name="street2"/>
+                                            <field name="zip"/>
+                                            <field name="city"/>
+                                            <field name="country_id"/>
+                                            <field name="state_id"/>
+                                            <templates>
+                                                <t t-name="kanban-box">
+                                                    <div style="position: relative">
+
+                                                        <!-- <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/> -->
+                                                        <h4><field name="name"/></h4>
+                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
+                                                            <field name="email"/>
+                                                        </a>
+                                                    </div>
+                                                </t>
+                                            </templates>
+                                        </kanban>
+                                    </field>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
                 </form>
             </field>
         </record>

From 7979f0c5eec9f431e9014c624975a06188e672a4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 29 Jun 2012 15:33:29 +0200
Subject: [PATCH 022/312] [FIX] *AGAIN* the All Feeds view

bzr revid: abo@openerp.com-20120629133329-309cezu46st0j50z
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 34445c48f8d..32523d897aa 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_global">
+    <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
         <table class="oe_view_manager_header">
           <colgroup>
             <col width="33%"/>
@@ -9,7 +9,7 @@
             <col width="34%"/>
           </colgroup>
           <tbody>
-            <tr class="oe_header_row">
+            <tr class="oe_header_row oe_header_row_top">
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">All Feeds</span>

From 05371d278a7b537df62b1196c9683cfb27fcc94d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 29 Jun 2012 19:20:11 +0200
Subject: [PATCH 023/312] [IMP] introduce kanban view for the employees section
 and a dedicated css

bzr revid: abo@openerp.com-20120629172011-7p5u6nyni8lffobh
---
 addons/portal_crm/__openerp__.py              |   5 +-
 .../portal_crm/static/src/css/portal_crm.css  |  12 ++
 addons/portal_crm/wizard/contact_view.xml     | 103 +++++++++++++-----
 3 files changed, 89 insertions(+), 31 deletions(-)
 create mode 100644 addons/portal_crm/static/src/css/portal_crm.css

diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py
index 044f3280ce3..55320cb0a40 100644
--- a/addons/portal_crm/__openerp__.py
+++ b/addons/portal_crm/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Tools',
     'complexity': "easy",
     'description': """
-This module adds crm menu and features (contact form) to your portal if crm and 
+This module adds crm menu and features (contact form) to your portal if crm and
 portal are installed.
     """,
     'author': 'OpenERP SA',
@@ -38,6 +38,9 @@ portal are installed.
     'installable': True,
     'auto_install':True,
     'category':'Hidden',
+    'css': [
+        'static/src/css/portal_crm.css',
+    ],
 
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
new file mode 100644
index 00000000000..b4098bfdfc9
--- /dev/null
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -0,0 +1,12 @@
+/* Main container */
+.openerp .oe_portal_crm_contact {
+	width: 960px;
+	margin: 0 auto;
+}
+
+/*  */
+.openerp .oe_portal_crm_contact .oe_portal_crm_office .oe_fold_column.oe_kanban_record {
+	float: none;
+	display: block;
+	width: 100%;
+}
\ No newline at end of file
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 3e4afa067f6..33cfb4bca7d 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -8,23 +8,61 @@
             <field name="model">portal_crm.crm_contact_us</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Contact Us wizard view" version="7.0">
-                    <div style="width: 960px; margin: 0 auto;">
+                <form string="Contact wizard view" version="7.0">
+                    <div class="oe_portal_crm_contact">
                         <table>
-                            <tr>
-                                <td width="80%%">
-                                    <group>
-                                        <field name="contact_name" string="Name"/>
-                                        <field name="name" string="Company"/>
-                                        <field name="email_from"/>
-                                        <field name="phone"/>
-                                        <field name="description" string="Your question"/>
-                                        <label string=""/>
-                                        <button string="Submit" name="submit" type="object"/>
-                                    </group>
-                                    <field name="employee_ids"/>
-                                </td>
-                                <td>
+                          <tr>
+                            <td width="70%%">
+                                <h1>Get in touch</h1>
+                                <group>
+                                    <field name="contact_name" string="Name"/>
+                                    <field name="name" string="Company"/>
+                                    <field name="email_from"/>
+                                    <field name="phone"/>
+                                    <field name="description" string="Your question"/>
+                                    <label string=""/>
+                                    <button string="Submit" name="submit" type="object"/>
+                                </group>
+
+                                <div class="oe_portal_crm_team">
+                                    <h1>Meet the team</h1>
+                                    <field name="employee_ids" widget="many2many_kanban">
+                                        <kanban>
+                                            <field name="last_login"/>
+                                            <templates>
+                                                <t t-name="kanban-box">
+                                                    <div class="oe_employee_vignette">
+                                                        <div class="oe_employee_image">
+                                                            <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
+                                                        </div>
+                                                        <div class="oe_employee_details">
+                                                            <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
+                                                            <ul>
+                                                                <li id="last_login">
+                                                                    <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+                                                                          <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
+                                                                    </span>
+                                                                </li>
+                                                                <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
+                                                                <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
+                                                                <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
+                                                                <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
+                                                                <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
+                                                            </ul>
+                                                        </div>
+                                                    </div>
+                                                    <script>
+                                                        $('.oe_employee_picture').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_employee_picture_wide') } });
+                                                    </script>
+                                                </t>
+                                            </templates>
+                                        </kanban>
+                                    </field>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="oe_portal_crm_office">
+                                    <h1>Our office</h1>
                                     <field name="company_ids" widget="many2many_kanban">
                                         <kanban>
                                             <field name="name"/>
@@ -38,20 +76,24 @@
                                             <field name="state_id"/>
                                             <templates>
                                                 <t t-name="kanban-box">
-                                                    <div style="position: relative">
-
-                                                        <!-- <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/> -->
-                                                        <h4><field name="name"/></h4>
-                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
-                                                            <field name="email"/>
-                                                        </a>
-                                                    </div>
+                                                    <!-- <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/> -->
+                                                    <h4><field name="name"/></h4>
+                                                    <field name="street"/><br/>
+                                                    <field name="street2"/><br/>
+                                                    <field name="zip"/>
+                                                    <field name="city"/><br/>
+                                                    <field name="country_id"/><br/>
+                                                    <br/>
+                                                    <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value">
+                                                        <field name="email"/>
+                                                    </a>
                                                 </t>
                                             </templates>
                                         </kanban>
                                     </field>
-                                </td>
-                            </tr>
+                                </div>
+                            </td>
+                          </tr>
                         </table>
                     </div>
                 </form>
@@ -67,9 +109,9 @@
             <field name="priority">99</field>
             <field name="arch" type="xml">
                 <form string="Thank you">
-                    <!-- 
-                        make sure there is at least one field in the view, 
-                        otherwise the orm will try to select all the model's 
+                    <!--
+                        make sure there is at least one field in the view,
+                        otherwise the orm will try to select all the model's
                         records and this will result in a permission denied error
                     -->
                     <field name="name" invisible="1"/>
@@ -80,9 +122,10 @@
 
         <!-- wizard action -->
         <record id="action_wizard_contact_us" model="ir.actions.act_window">
-            <field name="name">Contact Us</field>
+            <field name="name">Contact</field>
             <field name="res_model">portal_crm.crm_contact_us</field>
             <field name="view_mode">form</field>
+            <field name="target">inline</field>
         </record>
 
         <!-- attach it to the portal menu -->

From 7df84c1d17c22f82e18b7d81680499d3a1b94050 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 29 Jun 2012 19:37:07 +0200
Subject: [PATCH 024/312] [IMP] introduce a clearer separation between the
 three main parts of the view: 1) contact form, 2) offices list, 3) employees
 list

bzr revid: abo@openerp.com-20120629173707-zqlyi7mwellxavei
---
 addons/portal_crm/static/src/css/portal_crm.css | 12 +++++++++++-
 addons/portal_crm/wizard/contact_view.xml       | 15 +++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index b4098bfdfc9..23fc5d4eae6 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -4,9 +4,19 @@
 	margin: 0 auto;
 }
 
-/*  */
+/* Contact form */
+.openerp .oe_portal_crm_contact .oe_portal_crm_contact_form input[type="text"] {
+	width: 40%;
+}
+
+/* Offices list */
 .openerp .oe_portal_crm_contact .oe_portal_crm_office .oe_fold_column.oe_kanban_record {
 	float: none;
 	display: block;
 	width: 100%;
+}
+
+/* Employees list */
+.openerp .oe_portal_crm_contact .oe_portal_crm_contact {
+
 }
\ No newline at end of file
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 33cfb4bca7d..54bdea21175 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -14,15 +14,14 @@
                           <tr>
                             <td width="70%%">
                                 <h1>Get in touch</h1>
-                                <group>
-                                    <field name="contact_name" string="Name"/>
-                                    <field name="name" string="Company"/>
-                                    <field name="email_from"/>
-                                    <field name="phone"/>
-                                    <field name="description" string="Your question"/>
-                                    <label string=""/>
+                                <div class="oe_portal_crm_contact_form">
+                                    <field name="contact_name" placeholder="Name"/>
+                                    <field name="name" placeholder="Company"/>
+                                    <field name="email_from" placeholder="Email"/>
+                                    <field name="phone" placeholder="Phone"/>
+                                    <field name="description" placeholder="Your question"/>
                                     <button string="Submit" name="submit" type="object"/>
-                                </group>
+                                </div>
 
                                 <div class="oe_portal_crm_team">
                                     <h1>Meet the team</h1>

From 42ca6577739b94d95401c7d71a8896a06c98777f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 2 Jul 2012 16:37:19 +0200
Subject: [PATCH 025/312] [IMP] try a layout with titles and a colorful image
 header

bzr revid: abo@openerp.com-20120702143719-2jq6qofqgdhuqx3h
---
 .../portal_crm/security/ir.model.access.csv   |  6 +-
 .../portal_crm/static/src/css/portal_crm.css  | 90 ++++++++++++++++---
 addons/portal_crm/wizard/contact_view.xml     | 80 +++++++++--------
 3 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/addons/portal_crm/security/ir.model.access.csv b/addons/portal_crm/security/ir.model.access.csv
index 08145a00f54..6131f49d749 100644
--- a/addons/portal_crm/security/ir.model.access.csv
+++ b/addons/portal_crm/security/ir.model.access.csv
@@ -1,2 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-
+access_hr_employee_user,hr.employee user,hr.model_hr_employee,portal.group_portal_member,1,0,0,0
+access_res_partner,res.partner,base.model_res_partner,portal.group_portal_member,1,0,0,0
+access_res_partner_address,res.partner_address,base.model_res_partner_address,portal.group_portal_member,1,0,0,0
+access_res_partner_category,res.partner_category,base.model_res_partner_category,portal.group_portal_member,1,0,0,0
+access_res_partner_title,res.partner_title,base.model_res_partner_title,portal.group_portal_member,1,0,0,0
diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index 23fc5d4eae6..2af2e7fab79 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -1,22 +1,86 @@
-/* Main container */
+/*
+ * General layout
+ */
+
+ /* Root container */
 .openerp .oe_portal_crm_contact {
-	width: 960px;
-	margin: 0 auto;
+    width: 800px;
+    margin: 0 auto;
+    padding: 20px 0 0 0;
 }
 
-/* Contact form */
+/* Sections containers */
+.oe_portal_crm_callout,
+.oe_portal_crm_contact_form,
+.oe_portal_crm_office,
+.oe_portal_crm_team {
+    padding: 0 5px;
+}
+
+/* Sections titles */
+.openerp .oe_portal_crm_contact .oe_portal_crm_callout h1,
+.openerp .oe_portal_crm_contact .oe_portal_crm_contact_form h1,
+.openerp .oe_portal_crm_contact .oe_portal_crm_office h1 {
+    display: inline-block;
+    border-color: #4C4C4C;
+    border-style: solid;
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_callout h1 {
+    border-width: 0 0 5px 0;
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_contact_form h1,
+.openerp .oe_portal_crm_contact .oe_portal_crm_office h1 {
+    border-width: 5px 0 0 0;
+    margin-top: 0;
+    padding-top: 0;
+}
+
+
+
+/*
+ * Sections layout
+ */
+
+/* Callout section */
+.openerp .oe_portal_crm_contact .oe_portal_crm_callout
+ {
+    padding: 0 5px;
+    /* background is defined directly in the view itself */
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_callout .oe_portal_crm_background_wrapper {
+    height: 180px;
+    border-bottom: 1px solid #4C4C4C;
+    border-top: 1px solid #4C4C4C;
+    padding: 5px 0;
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_callout .oe_portal_crm_background {
+    width: 100%;
+    height: 100%;
+}
+
+/* Contact form section */
 .openerp .oe_portal_crm_contact .oe_portal_crm_contact_form input[type="text"] {
-	width: 40%;
+    width: 40%;
 }
 
-/* Offices list */
+/* Offices list section */
 .openerp .oe_portal_crm_contact .oe_portal_crm_office .oe_fold_column.oe_kanban_record {
-	float: none;
-	display: block;
-	width: 100%;
+    float: none;
+    display: block;
+    width: 100%;
+    border: 1px solid #D8D8D8;
+    border-bottom-color: #B9B9B9;
+    margin-bottom: 5px;
+    padding: 5px;
 }
 
-/* Employees list */
-.openerp .oe_portal_crm_contact .oe_portal_crm_contact {
-
-}
\ No newline at end of file
+/* Employees list section */
+.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_fold_column.oe_kanban_record {
+    width: 250px;
+    border: 1px solid #D8D8D8;
+    border-bottom-color: #B9B9B9;
+    margin: 0 5px 5px 0;
+    padding: 5px;
+}
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 54bdea21175..8f44519d7ed 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -10,11 +10,17 @@
             <field name="arch" type="xml">
                 <form string="Contact wizard view" version="7.0">
                     <div class="oe_portal_crm_contact">
+                        <div class="oe_portal_crm_callout">
+                            <h1>Contact OpenERP</h1>
+                            <div class="oe_portal_crm_background_wrapper">
+                                <div class="oe_portal_crm_background" style="background:url(https://lh5.googleusercontent.com/-FFcbJe8Ee1U/T6Aep2ug7hI/AAAAAAAAAD8/0lDMTMwUZTU/s1136/IMG_1170.JPG) center center"/>
+                            </div>
+                        </div>
                         <table>
                           <tr>
                             <td width="70%%">
-                                <h1>Get in touch</h1>
                                 <div class="oe_portal_crm_contact_form">
+                                    <h1>Get in touch</h1>
                                     <field name="contact_name" placeholder="Name"/>
                                     <field name="name" placeholder="Company"/>
                                     <field name="email_from" placeholder="Email"/>
@@ -22,42 +28,6 @@
                                     <field name="description" placeholder="Your question"/>
                                     <button string="Submit" name="submit" type="object"/>
                                 </div>
-
-                                <div class="oe_portal_crm_team">
-                                    <h1>Meet the team</h1>
-                                    <field name="employee_ids" widget="many2many_kanban">
-                                        <kanban>
-                                            <field name="last_login"/>
-                                            <templates>
-                                                <t t-name="kanban-box">
-                                                    <div class="oe_employee_vignette">
-                                                        <div class="oe_employee_image">
-                                                            <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
-                                                        </div>
-                                                        <div class="oe_employee_details">
-                                                            <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
-                                                            <ul>
-                                                                <li id="last_login">
-                                                                    <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
-                                                                          <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
-                                                                    </span>
-                                                                </li>
-                                                                <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
-                                                                <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
-                                                                <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
-                                                                <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
-                                                                <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
-                                                            </ul>
-                                                        </div>
-                                                    </div>
-                                                    <script>
-                                                        $('.oe_employee_picture').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_employee_picture_wide') } });
-                                                    </script>
-                                                </t>
-                                            </templates>
-                                        </kanban>
-                                    </field>
-                                </div>
                             </td>
                             <td>
                                 <div class="oe_portal_crm_office">
@@ -93,6 +63,42 @@
                                 </div>
                             </td>
                           </tr>
+                          <tr>
+                            <td colspan="2">
+                                <div class="oe_portal_crm_team">
+                                    <h1>Meet the team</h1>
+                                    <field name="employee_ids" widget="many2many_kanban">
+                                        <kanban>
+                                            <field name="last_login"/>
+                                            <templates>
+                                                <t t-name="kanban-box">
+                                                    <div class="oe_employee_vignette">
+                                                        <div class="oe_employee_image">
+                                                            <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
+                                                        </div>
+                                                        <div class="oe_employee_details">
+                                                            <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
+                                                            <ul>
+                                                                <li id="last_login">
+                                                                    <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+                                                                          <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
+                                                                    </span>
+                                                                </li>
+                                                                <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
+                                                                <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
+                                                                <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
+                                                                <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
+                                                                <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
+                                                            </ul>
+                                                        </div>
+                                                    </div>
+                                                </t>
+                                            </templates>
+                                        </kanban>
+                                    </field>
+                                </div>
+                            </td>
+                          </tr>
                         </table>
                     </div>
                 </form>

From 4c2daa9eaaef2e88ab4234365212f0d2a85f0806 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 2 Jul 2012 17:32:35 +0200
Subject: [PATCH 026/312] [IMP] attach the 'Our company' menu items to the
 portal's root menu

bzr revid: abo@openerp.com-20120702153235-b5qd9ei9os51i8q8
---
 addons/portal/portal_view.xml                 | 24 +++++++++----------
 addons/portal_crm/wizard/contact_view.xml     |  2 +-
 addons/portal_event/portal_event_view.xml     |  2 +-
 .../portal_jobs_view.xml                      |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 21641f45bc7..4d67df8e81f 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -87,20 +87,18 @@ the portal's users.
 
             <!-- root menu for portal members (chrooted in this menu) -->
             <menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
+                <menuitem name="News" id="portal_company_news"
+                    parent="portal_members_root_menu" sequence="10" action="action_news"/>
+
                 <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
-                <menuitem name="Our company" id="portal_company" 
-                    parent="menu_portal" sequence="10"/>
-                    <menuitem name="News" id="portal_company_news" 
-                        parent="portal_company" sequence="10" action="action_news"/>
-                
-                <menuitem name="Orders" id="portal_orders" 
-                    parent="menu_portal" sequence="20"/>
-                <menuitem name="Invoices and Payments" id="portal_invoices_payements" 
-                    parent="menu_portal" sequence="30"/>
-                <menuitem name="Projects" id="portal_projects"
-                    parent="menu_portal" sequence="40"/>
-                <menuitem name="After Sale Services" id="portal_after_sales" 
-                    parent="menu_portal" sequence="50"/>
+                    <menuitem name="Orders" id="portal_orders"
+                        parent="menu_portal" sequence="20"/>
+                    <menuitem name="Invoices and Payments" id="portal_invoices_payements"
+                        parent="menu_portal" sequence="30"/>
+                    <menuitem name="Projects" id="portal_projects"
+                        parent="menu_portal" sequence="40"/>
+                    <menuitem name="After Sale Services" id="portal_after_sales"
+                        parent="menu_portal" sequence="50"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 8f44519d7ed..8eee222a12c 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -135,7 +135,7 @@
 
         <!-- attach it to the portal menu -->
         <menuitem name="Contact" id="portal_company_contact"
-            parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
+            parent="portal.portal_members_root_menu" action="action_wizard_contact_us" sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
index 70bb408b32d..6161056444e 100644
--- a/addons/portal_event/portal_event_view.xml
+++ b/addons/portal_event/portal_event_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Events" id="portal_company_events" parent="portal.portal_company" 
+        <menuitem name="Events" id="portal_company_events" parent="portal.portal_members_root_menu"
             action="event.action_event_view" sequence="40"/>
 
     </data>
diff --git a/addons/portal_hr_recruitment/portal_jobs_view.xml b/addons/portal_hr_recruitment/portal_jobs_view.xml
index 30976fc1954..57aefa624fd 100644
--- a/addons/portal_hr_recruitment/portal_jobs_view.xml
+++ b/addons/portal_hr_recruitment/portal_jobs_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Jobs" id="portal_company_jobs" 
-            parent="portal.portal_company" action="hr.action_hr_job" 
+        <menuitem name="Jobs" id="portal_company_jobs"
+            parent="portal.portal_members_root_menu" action="hr.action_hr_job"
             sequence="20"/>
 
     </data>

From 504c544d1cb137ceb4815e396ee7e357316935b9 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 2 Jul 2012 18:39:39 +0200
Subject: [PATCH 027/312] [IMP] restore the menu just like before

bzr revid: abo@openerp.com-20120702163939-up7j97bnw0n16wn5
---
 addons/portal/portal_view.xml                     | 7 +++++--
 addons/portal_crm/wizard/contact_view.xml         | 4 ++--
 addons/portal_event/portal_event_view.xml         | 2 +-
 addons/portal_hr_recruitment/portal_jobs_view.xml | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 4d67df8e81f..e56dfda67f2 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -87,10 +87,13 @@ the portal's users.
 
             <!-- root menu for portal members (chrooted in this menu) -->
             <menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
-                <menuitem name="News" id="portal_company_news"
-                    parent="portal_members_root_menu" sequence="10" action="action_news"/>
 
                 <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
+                    <menuitem name="Our company" id="portal_company"
+                        parent="menu_portal" sequence="10"/>
+                        <menuitem name="News" id="portal_company_news"
+                            parent="portal_company" sequence="10" action="action_news"/>
+
                     <menuitem name="Orders" id="portal_orders"
                         parent="menu_portal" sequence="20"/>
                     <menuitem name="Invoices and Payments" id="portal_invoices_payements"
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 8eee222a12c..08b62d06a98 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -22,7 +22,7 @@
                                 <div class="oe_portal_crm_contact_form">
                                     <h1>Get in touch</h1>
                                     <field name="contact_name" placeholder="Name"/>
-                                    <field name="name" placeholder="Company"/>
+                                    <field name="partner_name" placeholder="Company"/>
                                     <field name="email_from" placeholder="Email"/>
                                     <field name="phone" placeholder="Phone"/>
                                     <field name="description" placeholder="Your question"/>
@@ -135,7 +135,7 @@
 
         <!-- attach it to the portal menu -->
         <menuitem name="Contact" id="portal_company_contact"
-            parent="portal.portal_members_root_menu" action="action_wizard_contact_us" sequence="30"/>
+            parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
index 6161056444e..8b1f21bbef0 100644
--- a/addons/portal_event/portal_event_view.xml
+++ b/addons/portal_event/portal_event_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Events" id="portal_company_events" parent="portal.portal_members_root_menu"
+        <menuitem name="Events" id="portal_company_events" parent="portal.portal_company"
             action="event.action_event_view" sequence="40"/>
 
     </data>
diff --git a/addons/portal_hr_recruitment/portal_jobs_view.xml b/addons/portal_hr_recruitment/portal_jobs_view.xml
index 57aefa624fd..e3e9cffb063 100644
--- a/addons/portal_hr_recruitment/portal_jobs_view.xml
+++ b/addons/portal_hr_recruitment/portal_jobs_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem name="Jobs" id="portal_company_jobs"
-            parent="portal.portal_members_root_menu" action="hr.action_hr_job"
+            parent="portal.portal_company" action="hr.action_hr_job"
             sequence="20"/>
 
     </data>

From 376af6f33f42cbdeb1f29a2e81f07983185b6d7d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 2 Jul 2012 19:27:48 +0200
Subject: [PATCH 028/312] [IMP] give a try to the sheet layout also fix a
 problem in the contact form by assigning a proper value to the field 'name'

bzr revid: abo@openerp.com-20120702172748-j6bqm501gnlmrobj
---
 .../portal_crm/static/src/css/portal_crm.css  | 14 +++-----
 addons/portal_crm/wizard/contact.py           | 33 +++++++++++--------
 addons/portal_crm/wizard/contact_view.xml     |  2 ++
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index 2af2e7fab79..6cad34bc963 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -4,9 +4,7 @@
 
  /* Root container */
 .openerp .oe_portal_crm_contact {
-    width: 800px;
-    margin: 0 auto;
-    padding: 20px 0 0 0;
+    width: 100%;
 }
 
 /* Sections containers */
@@ -50,7 +48,7 @@
     /* background is defined directly in the view itself */
 }
 .openerp .oe_portal_crm_contact .oe_portal_crm_callout .oe_portal_crm_background_wrapper {
-    height: 180px;
+    height: 120px;
     border-bottom: 1px solid #4C4C4C;
     border-top: 1px solid #4C4C4C;
     padding: 5px 0;
@@ -78,9 +76,5 @@
 
 /* Employees list section */
 .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_fold_column.oe_kanban_record {
-    width: 250px;
-    border: 1px solid #D8D8D8;
-    border-bottom-color: #B9B9B9;
-    margin: 0 5px 5px 0;
-    padding: 5px;
-}
+
+}
\ No newline at end of file
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 7ea4d094ac3..2a8378c6bc8 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -24,27 +24,32 @@ class crm_contact_us(osv.TransientModel):
     }
 
     def create(self, cr, uid, values, context=None):
-        """ 
-        Since they potentially sensitive, we don't want any user to be able to 
-        read datas generated through this module.  That's why we'll write those 
-        information in the crm.lead table and leave blank entries in the 
-        portal_crm.crm_contact_us table.  This is why the create() method is 
+        """
+        Since they potentially sensitive, we don't want any user to be able to
+        read datas generated through this module.  That's why we'll write those
+        information in the crm.lead table and leave blank entries in the
+        portal_crm.crm_contact_us table.  This is why the create() method is
         overridden.
         """
         crm_lead = self.pool.get('crm.lead')
-        
-        """ 
-        Because of the complex inheritance of the crm.lead model and the other 
-        models implied (like mail.thread, among others, that performs a read 
-        when its create() method is called (in method message_get_subscribers()), 
-        it is quite complicated to set proper rights for this object.  
-        Therefore, user #1 will perform the creation until a better workaround 
+
+        """
+        Because of the complex inheritance of the crm.lead model and the other
+        models implied (like mail.thread, among others, that performs a read
+        when its create() method is called (in method message_get_subscribers()),
+        it is quite complicated to set proper rights for this object.
+        Therefore, user #1 will perform the creation until a better workaround
         is figured out.
         """
+        values['name'] = values['contact_name']
+        print values
         crm_lead.create(cr, 1, dict(values,user_id=False), context)
 
-        """ Create an empty record in the portal_crm.crm_contact_us table """
-        return super(crm_contact_us, self).create(cr, uid, {})
+        """
+        Create an empty record in the portal_crm.crm_contact_us table.
+        Since the 'name' field is mandatory, give an empty string to avoid an integrity error.
+        """
+        return super(crm_contact_us, self).create(cr, uid, {'name': ' '})
 
     def submit(self, cr, uid, ids, context=None):
         """ When the form is submitted, redirect the user to a "Thanks" message """
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 08b62d06a98..0a64e7a79f2 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -9,6 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contact wizard view" version="7.0">
+                  <sheet>
                     <div class="oe_portal_crm_contact">
                         <div class="oe_portal_crm_callout">
                             <h1>Contact OpenERP</h1>
@@ -101,6 +102,7 @@
                           </tr>
                         </table>
                     </div>
+                  </sheet>
                 </form>
             </field>
         </record>

From 7f629acd95e7e308a2b772ec9550fa0da45d6372 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 2 Jul 2012 23:56:04 +0200
Subject: [PATCH 029/312] [IMP] contact form

bzr revid: al@openerp.com-20120702215604-3v06uypbdyvurbh5
---
 addons/mail/mail_thread_view.xml              |  7 +-
 addons/portal/portal_data.xml                 | 23 ++++++-
 addons/portal/portal_view.xml                 | 65 +++++--------------
 .../portal_crm/static/src/css/portal_crm.css  | 63 ++----------------
 addons/portal_crm/wizard/contact.py           |  3 +-
 addons/portal_crm/wizard/contact_view.xml     | 24 +++----
 6 files changed, 58 insertions(+), 127 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index a32045efafc..ba2797a6051 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,13 +3,14 @@
     <data>
 
         <!-- toplevel menu -->
+        <!-- TODO Rename to name of the default company -->
         <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
             web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png" 
-            groups="base.group_user"/>
+            web_icon_hover="static/src/img/feeds-hover.png"/>
 
         <!-- left-side menu: Feeds !-->
-        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
+        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
+
         <record id="mail_wallfeeds" model="ir.ui.menu">
           <field name="name">News Feed</field>
           <field name="sequence" eval="10"/>
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 2cba3a1945a..3f7e6804d9b 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,11 +2,30 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="company_news_feed" model="mail.group">
+            <field name="name">Company's news feed</field>
+        </record>
+
+        <record id="action_news" model="ir.actions.act_window">
+            <field name="name">News</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="view_mode">form</field>
+        </record>
+
+        <!-- default portal menu structure -->
+        <menuitem name="Our company" id="portal_company" parent="mail.mail_feeds_main" sequence="20"/>
+            <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+
+        <menuitem name="Orders" id="portal_orders" parent="mail.mail_feeds_main" sequence="30"/>
+        <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="mail.mail_feeds_main" sequence="40"/>
+        <menuitem name="Projects" id="portal_projects" parent="mail.mail_feeds_main" sequence="50"/>
+        <menuitem name="After Sale Services" id="portal_after_sales" parent="mail.mail_feeds_main" sequence="60"/>
+
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
             <field name="group_id" ref="group_portal_member"/>
-            <field name="override_menu" eval="True"/>
-            <field name="parent_menu_id" ref="portal_members_root_menu"/>
+            <field name="override_menu" eval="False"/>
         </record>
 
     </data>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index e56dfda67f2..818753dede6 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -2,20 +2,6 @@
 <openerp>
     <data>
 
-        <!-- menu Administration/Portals/Portals -->
-        <record id="portal_list_action" model="ir.actions.act_window">
-            <field name="name">Portals</field>
-            <field name="res_model">res.portal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <!-- a context is necessary to get the right portal form view -->
-            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
-            <field name="help">
-A portal helps defining specific views and rules for a group of users (the
-portal group).  A portal menu, widgets and specific groups may be assigned to
-the portal's users.
-            </field>
-        </record>
 
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
@@ -28,7 +14,6 @@ the portal's users.
                 </tree>
             </field>
         </record>
-
         <!-- portal form view -->
         <record id="portal_form_view" model="ir.ui.view">
             <field name="name">Portal Form</field>
@@ -65,43 +50,23 @@ the portal's users.
                 </page>
             </field>
         </record>
-
-        <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news feed</field>
+        <!-- action Administration/Portals/Portals -->
+        <record id="portal_list_action" model="ir.actions.act_window">
+            <field name="name">Portals</field>
+            <field name="res_model">res.portal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <!-- a context is necessary to get the right portal form view -->
+            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
+            <field name="help">
+A portal helps defining specific views and rules for a group of users (the
+portal group).  A portal menu, widgets and specific groups may be assigned to
+the portal's users.
+            </field>
         </record>
-
-        <record id="action_news" model="ir.actions.act_window">
-            <field name="name">News</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="company_news_feed"/>
-            <field name="view_mode">form</field>
-        </record>
-
-
-        <!-- module's menu -->
-        <!-- menu Administration/Portals -->
-        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration"
-            groups="group_portal_manager"/>
-
+        <!-- menu Administration/Portals/Portals -->
+        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration" groups="group_portal_manager"/>
             <menuitem name="Portals" id="portal_list_menu" parent="portal_menu_settings" action="portal_list_action"/>
 
-            <!-- root menu for portal members (chrooted in this menu) -->
-            <menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
-
-                <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
-                    <menuitem name="Our company" id="portal_company"
-                        parent="menu_portal" sequence="10"/>
-                        <menuitem name="News" id="portal_company_news"
-                            parent="portal_company" sequence="10" action="action_news"/>
-
-                    <menuitem name="Orders" id="portal_orders"
-                        parent="menu_portal" sequence="20"/>
-                    <menuitem name="Invoices and Payments" id="portal_invoices_payements"
-                        parent="menu_portal" sequence="30"/>
-                    <menuitem name="Projects" id="portal_projects"
-                        parent="menu_portal" sequence="40"/>
-                    <menuitem name="After Sale Services" id="portal_after_sales"
-                        parent="menu_portal" sequence="50"/>
-
     </data>
 </openerp>
diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index 6cad34bc963..e2bd342aada 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -4,58 +4,9 @@
 
  /* Root container */
 .openerp .oe_portal_crm_contact {
-    width: 100%;
-}
-
-/* Sections containers */
-.oe_portal_crm_callout,
-.oe_portal_crm_contact_form,
-.oe_portal_crm_office,
-.oe_portal_crm_team {
-    padding: 0 5px;
-}
-
-/* Sections titles */
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout h1,
-.openerp .oe_portal_crm_contact .oe_portal_crm_contact_form h1,
-.openerp .oe_portal_crm_contact .oe_portal_crm_office h1 {
-    display: inline-block;
-    border-color: #4C4C4C;
-    border-style: solid;
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout h1 {
-    border-width: 0 0 5px 0;
-    margin-bottom: 0;
-    padding-bottom: 0;
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_contact_form h1,
-.openerp .oe_portal_crm_contact .oe_portal_crm_office h1 {
-    border-width: 5px 0 0 0;
-    margin-top: 0;
-    padding-top: 0;
-}
-
-
-
-/*
- * Sections layout
- */
-
-/* Callout section */
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout
- {
-    padding: 0 5px;
-    /* background is defined directly in the view itself */
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout .oe_portal_crm_background_wrapper {
-    height: 120px;
-    border-bottom: 1px solid #4C4C4C;
-    border-top: 1px solid #4C4C4C;
-    padding: 5px 0;
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout .oe_portal_crm_background {
-    width: 100%;
-    height: 100%;
+    width: 800px;
+    margin: auto;
+    padding: 8px 0 0 0;
 }
 
 /* Contact form section */
@@ -68,13 +19,11 @@
     float: none;
     display: block;
     width: 100%;
-    border: 1px solid #D8D8D8;
-    border-bottom-color: #B9B9B9;
     margin-bottom: 5px;
     padding: 5px;
 }
 
 /* Employees list section */
-.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_fold_column.oe_kanban_record {
-
-}
\ No newline at end of file
+.openerp .oe_portal_crm_contact .oe_portal_crm_team {
+    padding: 8px 0 0 0;
+}
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 2a8378c6bc8..7c21b71a58b 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -58,5 +58,6 @@ class crm_contact_us(osv.TransientModel):
                 'view_type': 'form',
                 'res_model': self._name,
                 'res_id': ids[0],
-                'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1]
+                'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1],
+                'target': 'inline'
                }
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 0a64e7a79f2..d8322685ee0 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -9,30 +9,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contact wizard view" version="7.0">
-                  <sheet>
                     <div class="oe_portal_crm_contact">
-                        <div class="oe_portal_crm_callout">
-                            <h1>Contact OpenERP</h1>
-                            <div class="oe_portal_crm_background_wrapper">
-                                <div class="oe_portal_crm_background" style="background:url(https://lh5.googleusercontent.com/-FFcbJe8Ee1U/T6Aep2ug7hI/AAAAAAAAAD8/0lDMTMwUZTU/s1136/IMG_1170.JPG) center center"/>
-                            </div>
-                        </div>
                         <table>
                           <tr>
                             <td width="70%%">
                                 <div class="oe_portal_crm_contact_form">
-                                    <h1>Get in touch</h1>
-                                    <field name="contact_name" placeholder="Name"/>
-                                    <field name="partner_name" placeholder="Company"/>
-                                    <field name="email_from" placeholder="Email"/>
-                                    <field name="phone" placeholder="Phone"/>
+                                    <h1>Contact us</h1>
+                                    <group>
+                                        <field name="contact_name" placeholder="Name"/>
+                                        <field name="partner_name" placeholder="Company"/>
+                                        <field name="email_from" placeholder="Email"/>
+                                        <field name="phone" placeholder="Phone"/>
+                                    </group>
                                     <field name="description" placeholder="Your question"/>
                                     <button string="Submit" name="submit" type="object"/>
                                 </div>
                             </td>
                             <td>
                                 <div class="oe_portal_crm_office">
-                                    <h1>Our office</h1>
                                     <field name="company_ids" widget="many2many_kanban">
                                         <kanban>
                                             <field name="name"/>
@@ -102,7 +96,6 @@
                           </tr>
                         </table>
                     </div>
-                  </sheet>
                 </form>
             </field>
         </record>
@@ -139,5 +132,8 @@
         <menuitem name="Contact" id="portal_company_contact"
             parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
 
+        <!-- test menu item to compare with and without menu -->
+        <menuitem name="FullContact" id="portal_company_contact2" action="action_wizard_contact_us" sequence="120" groups="base.group_no_one"/>
+
     </data>
 </openerp>

From ae688e130f539ba862bcc7cb4cd49e7b9902408b Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 3 Jul 2012 18:04:58 +0200
Subject: [PATCH 030/312] [IMP] add the possibility to set a visibility
 (public, portal or private) for employees

bzr revid: abo@openerp.com-20120703160458-zzdk2kymapokm4j5
---
 addons/hr/hr_view.xml                  | 12 ++++----
 addons/portal_crm/__init__.py          |  1 +
 addons/portal_crm/__openerp__.py       |  1 +
 addons/portal_crm/hr_employee.py       | 42 ++++++++++++++++++++++++++
 addons/portal_crm/hr_employee_view.xml | 19 ++++++++++++
 5 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 addons/portal_crm/hr_employee.py
 create mode 100644 addons/portal_crm/hr_employee_view.xml

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5e6953a29d2..ee160276e01 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -59,7 +59,7 @@
                                     <field name="work_email" widget="email"/>
                                     <field name="work_location"/>
                                 </group>
-                                <group string="Job Information">
+                                <group name="job_information" string="Job Information">
                                     <field name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                     <field name="coach_id"/>
                                 </group>
@@ -207,7 +207,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_employee_form"/>
             <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record> 
+        </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
@@ -410,8 +410,8 @@
                 <search string="Jobs">
                     <field name="name" string="Job"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"  
-                            domain="[('state','=','open')]" 
+                    <filter icon="terp-camera_test"
+                            domain="[('state','=','open')]"
                             string="In Position"
                             help="In Position"/>
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
@@ -427,7 +427,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="view_hr_job_employee_form" model="ir.ui.view">
             <field name="name">hr.job.employee.form</field>
             <field name="model">hr.job</field>
@@ -444,7 +444,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
diff --git a/addons/portal_crm/__init__.py b/addons/portal_crm/__init__.py
index 6b791be9f25..4ea069fcbd8 100644
--- a/addons/portal_crm/__init__.py
+++ b/addons/portal_crm/__init__.py
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import wizard
+import hr_employee
\ No newline at end of file
diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py
index 55320cb0a40..3f4a24adfed 100644
--- a/addons/portal_crm/__openerp__.py
+++ b/addons/portal_crm/__openerp__.py
@@ -32,6 +32,7 @@ portal are installed.
     'author': 'OpenERP SA',
     'depends': ['crm','portal'],
     'data': [
+        'hr_employee_view.xml',
         'security/ir.model.access.csv',
         'wizard/contact_view.xml',
     ],
diff --git a/addons/portal_crm/hr_employee.py b/addons/portal_crm/hr_employee.py
new file mode 100644
index 00000000000..b4db10deb6c
--- /dev/null
+++ b/addons/portal_crm/hr_employee.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+
+
+class hr_employee(osv.osv):
+    _description = "Portal CRM Employee"
+    _inherit = 'hr.employee'
+
+    """
+    ``visibility``: defines if the employee appears on the portal's contact page
+                    - 'public' means the employee will appear for everyone (anonymous)
+                    - 'portal' means the employee will appear for portal users only
+                    - 'private' means the employee won't appear
+    """
+    _columns = {
+        'visibility': fields.selection([('public', 'Public'),('portal', 'Portal'),('private', 'Private')],
+            string='Visibility', help='Employee\'s visibility in the portal\'s contact page'),
+    }
+    _defaults = {
+        'visibility': 'private',
+    }
diff --git a/addons/portal_crm/hr_employee_view.xml b/addons/portal_crm/hr_employee_view.xml
new file mode 100644
index 00000000000..0bfb86284fc
--- /dev/null
+++ b/addons/portal_crm/hr_employee_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- add visibility field in employee form -->
+        <record id="view_employee_form" model="ir.ui.view">
+            <field name="name">res.portal.employee.form</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='job_information']" position="after">
+                    <group string="Employee's visibility">
+                        <field name="visibility"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

From 4a84ed0dfda08accc053b66db379f3d99be7cb3a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 3 Jul 2012 18:53:06 +0200
Subject: [PATCH 031/312] [IMP] apply the employee's visibility in the contact
 view right now, only 'public' and 'private' are working; 'portal' will
 require some tricky ir.rules and probably a group dedicated to anonymous
 users

bzr revid: abo@openerp.com-20120703165306-27erhp9vj3rdg7o2
---
 addons/portal/res_user.py                          | 2 --
 addons/portal/security/portal_security.xml         | 2 +-
 addons/portal_crm/security/portal_crm_security.xml | 6 ++++++
 addons/portal_crm/wizard/contact.py                | 2 +-
 addons/portal_event/security/portal_security.xml   | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 addons/portal_crm/security/portal_crm_security.xml

diff --git a/addons/portal/res_user.py b/addons/portal/res_user.py
index 127c3079b29..9ed95a8a740 100644
--- a/addons/portal/res_user.py
+++ b/addons/portal/res_user.py
@@ -30,7 +30,5 @@ class res_users(osv.osv):
             string='Related Partner'),
     }
 
-res_users()
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 37e94581d77..0b5057ef506 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- Don't use any implied_ids here; this group behavior is particular -->
         <record id="group_portal_member" model="res.groups">
diff --git a/addons/portal_crm/security/portal_crm_security.xml b/addons/portal_crm/security/portal_crm_security.xml
new file mode 100644
index 00000000000..39f923a895b
--- /dev/null
+++ b/addons/portal_crm/security/portal_crm_security.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+    </data>
+</openerp>
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 7c21b71a58b..a1e38fcc988 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -11,7 +11,7 @@ class crm_contact_us(osv.TransientModel):
     }
 
     def _get_employee(self, cr, uid, context=None):
-        r = self.pool.get('hr.employee').search(cr, uid, [], context=context)
+        r = self.pool.get('hr.employee').search(cr, uid, [('visibility', '!=', 'private')], context=context)
         return r
 
     def _get_companies(self, cr, uid, context=None):
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 82044fb8b11..c9aec1edd4b 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="portal_event_rule" model="ir.rule">
             <field name="name">Personal Events</field>

From 528c39acd8cb5deb98cce6a5250eabd3bcf23ac0 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 4 Jul 2012 11:00:34 +0200
Subject: [PATCH 032/312] [IMP] add a few comments

bzr revid: abo@openerp.com-20120704090034-bjhq0py72ogesl6m
---
 addons/portal_crm/security/portal_crm_security.xml | 2 ++
 addons/portal_crm/wizard/contact.py                | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/portal_crm/security/portal_crm_security.xml b/addons/portal_crm/security/portal_crm_security.xml
index 39f923a895b..2fb26abe7ec 100644
--- a/addons/portal_crm/security/portal_crm_security.xml
+++ b/addons/portal_crm/security/portal_crm_security.xml
@@ -2,5 +2,7 @@
 <openerp>
     <data noupdate="1">
 
+        <!-- Employees with a visibility == 'portal' can't be seen by anonymous -->
+
     </data>
 </openerp>
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index a1e38fcc988..53920cd4d7e 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -11,6 +11,7 @@ class crm_contact_us(osv.TransientModel):
     }
 
     def _get_employee(self, cr, uid, context=None):
+        """ Employees flagged as 'private' won't appear on the contact page """
         r = self.pool.get('hr.employee').search(cr, uid, [('visibility', '!=', 'private')], context=context)
         return r
 

From 187dab2064c87453634b7d5e41cfd7f81507eec1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 4 Jul 2012 12:22:43 +0200
Subject: [PATCH 033/312] [IMP] hide the last loggin time

bzr revid: abo@openerp.com-20120704102243-6icct35zc83doa4y
---
 addons/portal_crm/wizard/contact_view.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index d8322685ee0..b65d65fd1e8 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -74,11 +74,6 @@
                                                         <div class="oe_employee_details">
                                                             <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                                             <ul>
-                                                                <li id="last_login">
-                                                                    <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
-                                                                          <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
-                                                                    </span>
-                                                                </li>
                                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                                                 <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
                                                                 <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>

From 74050c22be164ab48002c85610f40088fe98c4ec Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 4 Jul 2012 16:58:49 +0200
Subject: [PATCH 034/312] [IMP] layout

bzr revid: abo@openerp.com-20120704145849-9n0o1ag7fd4yg9fh
---
 .../portal_crm/static/src/css/portal_crm.css  | 29 ++++++++++++++
 addons/portal_crm/wizard/contact_view.xml     | 40 +++++++++++--------
 2 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index e2bd342aada..5f2e8723ff4 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -10,11 +10,27 @@
 }
 
 /* Contact form section */
+.openerp .oe_portal_crm_contact .oe_portal_crm_contact_form {
+    margin-right: 10px;
+}
 .openerp .oe_portal_crm_contact .oe_portal_crm_contact_form input[type="text"] {
     width: 40%;
 }
 
 /* Offices list section */
+.openerp .oe_portal_crm_contact .oe_portal_crm_office {
+    background: #DDD;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+    -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_office * {
+    background: transparent !important;
+}
 .openerp .oe_portal_crm_contact .oe_portal_crm_office .oe_fold_column.oe_kanban_record {
     float: none;
     display: block;
@@ -22,8 +38,21 @@
     margin-bottom: 5px;
     padding: 5px;
 }
+.openerp .oe_portal_crm_contact .oe_portal_crm_office li:last-child {
+    margin-bottom: 1em;
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_office ul:last-child li:last-child {
+    margin-bottom: 0;
+}
 
 /* Employees list section */
 .openerp .oe_portal_crm_contact .oe_portal_crm_team {
     padding: 8px 0 0 0;
 }
+.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details {
+    width: 170px;
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image {
+    width: 65px;
+    height: 65px;
+}
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index b65d65fd1e8..7ebd4e749b9 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -10,17 +10,15 @@
             <field name="arch" type="xml">
                 <form string="Contact wizard view" version="7.0">
                     <div class="oe_portal_crm_contact">
+                        <h1>Contact us</h1>
                         <table>
                           <tr>
                             <td width="70%%">
                                 <div class="oe_portal_crm_contact_form">
-                                    <h1>Contact us</h1>
-                                    <group>
-                                        <field name="contact_name" placeholder="Name"/>
-                                        <field name="partner_name" placeholder="Company"/>
-                                        <field name="email_from" placeholder="Email"/>
-                                        <field name="phone" placeholder="Phone"/>
-                                    </group>
+                                    <field name="contact_name" placeholder="Name"/>
+                                    <field name="partner_name" placeholder="Company"/>
+                                    <field name="email_from" placeholder="Email"/>
+                                    <field name="phone" placeholder="Phone"/>
                                     <field name="description" placeholder="Your question"/>
                                     <button string="Submit" name="submit" type="object"/>
                                 </div>
@@ -42,15 +40,24 @@
                                                 <t t-name="kanban-box">
                                                     <!-- <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/> -->
                                                     <h4><field name="name"/></h4>
-                                                    <field name="street"/><br/>
-                                                    <field name="street2"/><br/>
-                                                    <field name="zip"/>
-                                                    <field name="city"/><br/>
-                                                    <field name="country_id"/><br/>
-                                                    <br/>
-                                                    <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value">
-                                                        <field name="email"/>
-                                                    </a>
+                                                    <ul class="oe_portal_crm_address">
+                                                        <li t-if="record.street"><field name="street"/></li>
+                                                        <li t-if="record.street2"><field name="street2"/></li>
+                                                        <li t-if="record.zip"><field name="zip"/></li>
+                                                        <li t-if="record.city"><field name="city"/></li>
+                                                        <li t-if="record.country_id"><field name="country_id"/></li>
+                                                    </ul>
+                                                    <ul class="oe_portal_crm_contact_info">
+                                                        <li t-if="record.phone"><field name="phone"/></li>
+                                                        <li t-if="record.email.raw_value">
+                                                            <a title="Mail" t-att-href="'mailto:'+record.email.value">
+                                                            <field name="email"/>
+                                                            </a>
+                                                        </li>
+                                                        <li t-if="record.website">
+                                                            <a t-att-href="record.website"><field name="website"/></a>
+                                                        </li>
+                                                    </ul>
                                                 </t>
                                             </templates>
                                         </kanban>
@@ -75,7 +82,6 @@
                                                             <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                                             <ul>
                                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
-                                                                <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
                                                                 <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
                                                                 <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
                                                                 <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>

From 9222ca3c797fb901042a3edc4eae8181eac6f2cf Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 4 Jul 2012 19:04:28 +0200
Subject: [PATCH 035/312] [FIX] module's name

bzr revid: abo@openerp.com-20120704170428-kq9jabzlfdfwskte
---
 addons/portal_project/__openerp__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/portal_project/__openerp__.py b/addons/portal_project/__openerp__.py
index f90c0cf9df2..4f8774bf99e 100644
--- a/addons/portal_project/__openerp__.py
+++ b/addons/portal_project/__openerp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    'name': 'Portal Issue',
+    'name': 'Portal Project',
     'version': '0.1',
     'category': 'Tools',
     'complexity': "easy",
     'description': """
-This module adds project menu and features (tasks) to your portal if project 
+This module adds project menu and features (tasks) to your portal if project
 and portal are installed.
     """,
     'author': 'OpenERP SA',

From c55858dd6b54bc5e101b0bb4232aaa40144f36cc Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 4 Jul 2012 20:19:17 +0200
Subject: [PATCH 036/312] [IMP] split depedencies between portal_crm and the
 new glue module portal_hr_employees this new glue module depending on hr and
 portal_crm is now responsible for inserting the employees list in the
 portal_crm contact page

bzr revid: abo@openerp.com-20120704181917-1o1ofcm66cek1dm3
---
 addons/portal_claim/__openerp__.py            |  6 +-
 addons/portal_crm/__init__.py                 |  1 -
 addons/portal_crm/__openerp__.py              | 10 ++--
 addons/portal_crm/hr_employee_view.xml        | 19 -------
 .../portal_crm/static/src/css/portal_crm.css  | 16 ------
 addons/portal_crm/wizard/contact.py           |  8 +--
 addons/portal_crm/wizard/contact_view.xml     | 28 +---------
 addons/portal_hr_employees/__init__.py        | 22 ++++++++
 addons/portal_hr_employees/__openerp__.py     | 47 ++++++++++++++++
 .../hr_employee.py                            | 18 +++++-
 .../portal_hr_employees/hr_employee_view.xml  | 56 +++++++++++++++++++
 .../security/ir.model.access.csv              |  0
 .../security/portal_crm_security.xml          |  0
 .../static/src/css/portal_hr_employees.css    | 11 ++++
 addons/portal_hr_recruitment/__openerp__.py   |  5 +-
 15 files changed, 164 insertions(+), 83 deletions(-)
 delete mode 100644 addons/portal_crm/hr_employee_view.xml
 create mode 100644 addons/portal_hr_employees/__init__.py
 create mode 100644 addons/portal_hr_employees/__openerp__.py
 rename addons/{portal_crm => portal_hr_employees}/hr_employee.py (69%)
 create mode 100644 addons/portal_hr_employees/hr_employee_view.xml
 rename addons/{portal_crm => portal_hr_employees}/security/ir.model.access.csv (100%)
 rename addons/{portal_crm => portal_hr_employees}/security/portal_crm_security.xml (100%)
 create mode 100644 addons/portal_hr_employees/static/src/css/portal_hr_employees.css

diff --git a/addons/portal_claim/__openerp__.py b/addons/portal_claim/__openerp__.py
index 9fba57ba9ac..197227cc45f 100644
--- a/addons/portal_claim/__openerp__.py
+++ b/addons/portal_claim/__openerp__.py
@@ -26,15 +26,15 @@
     'category': 'Tools',
     'complexity': "easy",
     'description': """
-This module adds claim menu and features to your portal if claim and portal are 
+This module adds claim menu and features to your portal if claim and portal are
 installed.
     """,
     'author': 'OpenERP SA',
     'depends': ['crm_claim','portal'],
     'data': [
-        'security/portal_security.xml',
         'portal_claim_view.xml',
-        "security/ir.model.access.csv",
+        'security/ir.model.access.csv',
+        'security/portal_security.xml',
     ],
     'installable': True,
     'auto_install':True,
diff --git a/addons/portal_crm/__init__.py b/addons/portal_crm/__init__.py
index 4ea069fcbd8..6b791be9f25 100644
--- a/addons/portal_crm/__init__.py
+++ b/addons/portal_crm/__init__.py
@@ -20,4 +20,3 @@
 ##############################################################################
 
 import wizard
-import hr_employee
\ No newline at end of file
diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py
index 3f4a24adfed..4fe023ccb48 100644
--- a/addons/portal_crm/__openerp__.py
+++ b/addons/portal_crm/__openerp__.py
@@ -26,18 +26,16 @@
     'category': 'Tools',
     'complexity': "easy",
     'description': """
-This module adds crm menu and features (contact form) to your portal if crm and
-portal are installed.
+This module adds a contact page (with a contact form creating a lead when
+submitted) to your portal if crm and portal are installed.
     """,
     'author': 'OpenERP SA',
     'depends': ['crm','portal'],
     'data': [
-        'hr_employee_view.xml',
-        'security/ir.model.access.csv',
         'wizard/contact_view.xml',
     ],
-    'installable': True,
-    'auto_install':True,
+    'installable': True
+,    'auto_install':True,
     'category':'Hidden',
     'css': [
         'static/src/css/portal_crm.css',
diff --git a/addons/portal_crm/hr_employee_view.xml b/addons/portal_crm/hr_employee_view.xml
deleted file mode 100644
index 0bfb86284fc..00000000000
--- a/addons/portal_crm/hr_employee_view.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- add visibility field in employee form -->
-        <record id="view_employee_form" model="ir.ui.view">
-            <field name="name">res.portal.employee.form</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='job_information']" position="after">
-                    <group string="Employee's visibility">
-                        <field name="visibility"/>
-                    </group>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index 5f2e8723ff4..0589eb92e71 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -1,7 +1,3 @@
-/*
- * General layout
- */
-
  /* Root container */
 .openerp .oe_portal_crm_contact {
     width: 800px;
@@ -44,15 +40,3 @@
 .openerp .oe_portal_crm_contact .oe_portal_crm_office ul:last-child li:last-child {
     margin-bottom: 0;
 }
-
-/* Employees list section */
-.openerp .oe_portal_crm_contact .oe_portal_crm_team {
-    padding: 8px 0 0 0;
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details {
-    width: 170px;
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image {
-    width: 65px;
-    height: 65px;
-}
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 53920cd4d7e..15923a6bb4f 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -7,20 +7,14 @@ class crm_contact_us(osv.TransientModel):
     _inherit = 'crm.lead'
     _columns = {
         'company_ids' : fields.many2many('res.company', string='Companies', readonly=True),
-        'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True),
     }
 
-    def _get_employee(self, cr, uid, context=None):
-        """ Employees flagged as 'private' won't appear on the contact page """
-        r = self.pool.get('hr.employee').search(cr, uid, [('visibility', '!=', 'private')], context=context)
-        return r
-
+    """ Little trick to display companies in our wizard view """
     def _get_companies(self, cr, uid, context=None):
         r = self.pool.get('res.company').search(cr, uid, [], context=context)
         return r
 
     _defaults = {
-        'employee_ids' : _get_employee,
         'company_ids' : _get_companies
     }
 
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 7ebd4e749b9..922ec231496 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -54,9 +54,6 @@
                                                             <field name="email"/>
                                                             </a>
                                                         </li>
-                                                        <li t-if="record.website">
-                                                            <a t-att-href="record.website"><field name="website"/></a>
-                                                        </li>
                                                     </ul>
                                                 </t>
                                             </templates>
@@ -68,30 +65,7 @@
                           <tr>
                             <td colspan="2">
                                 <div class="oe_portal_crm_team">
-                                    <h1>Meet the team</h1>
-                                    <field name="employee_ids" widget="many2many_kanban">
-                                        <kanban>
-                                            <field name="last_login"/>
-                                            <templates>
-                                                <t t-name="kanban-box">
-                                                    <div class="oe_employee_vignette">
-                                                        <div class="oe_employee_image">
-                                                            <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
-                                                        </div>
-                                                        <div class="oe_employee_details">
-                                                            <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
-                                                            <ul>
-                                                                <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
-                                                                <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
-                                                                <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
-                                                                <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
-                                                            </ul>
-                                                        </div>
-                                                    </div>
-                                                </t>
-                                            </templates>
-                                        </kanban>
-                                    </field>
+
                                 </div>
                             </td>
                           </tr>
diff --git a/addons/portal_hr_employees/__init__.py b/addons/portal_hr_employees/__init__.py
new file mode 100644
index 00000000000..f0abe52049a
--- /dev/null
+++ b/addons/portal_hr_employees/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import hr_employee
diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py
new file mode 100644
index 00000000000..7a6687faa64
--- /dev/null
+++ b/addons/portal_hr_employees/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Portal HR employees',
+    'version': '0.1',
+    'category': 'Tools',
+    'complexity': "easy",
+    'description': """
+This module adds a list of employees to your portal's contact page if hr and
+portal_crm (which creates the contact page) are installed.
+    """,
+    'author': 'OpenERP SA',
+    'depends': ['hr','portal_crm'],
+    'data': [
+        'hr_employee_view.xml',
+        'security/portal_crm_security.xml',
+        'security/ir.model.access.csv',
+    ],
+    'installable': True,
+    'auto_install':True,
+    'category':'Hidden',
+    'css': [
+        'static/src/css/portal_hr_employees.css',
+    ],
+
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_crm/hr_employee.py b/addons/portal_hr_employees/hr_employee.py
similarity index 69%
rename from addons/portal_crm/hr_employee.py
rename to addons/portal_hr_employees/hr_employee.py
index b4db10deb6c..d14b2400889 100644
--- a/addons/portal_crm/hr_employee.py
+++ b/addons/portal_hr_employees/hr_employee.py
@@ -21,10 +21,26 @@
 
 from osv import osv, fields
 
+class crm_contact_us(osv.TransientModel):
+    """ Add employees list to the portal's contact page """
+    _description = 'Contact form for the portal'
+    _inherit = 'portal_crm.crm_contact_us'
+    _columns = {
+        'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True),
+    }
 
+    """ Little trick to display employees in our wizard view """
+    def _get_employee(self, cr, uid, context=None):
+        """ Employees flagged as 'private' won't appear on the contact page """
+        r = self.pool.get('hr.employee').search(cr, uid, [('visibility', '!=', 'private')], context=context)
+        return r
+
+    _defaults = {
+        'employee_ids' : _get_employee,
+    }
 
 class hr_employee(osv.osv):
-    _description = "Portal CRM Employee"
+    _description = "Portal CRM employee"
     _inherit = 'hr.employee'
 
     """
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
new file mode 100644
index 00000000000..d8bc535057e
--- /dev/null
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- add visibility field to the employee form view -->
+        <record id="view_employee_form" model="ir.ui.view">
+            <field name="name">portal_hr_employees.employee.form</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='job_information']" position="after">
+                    <group string="Employee's visibility">
+                        <field name="visibility"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <!-- a kanban view of the employees to the portal's contact page -->
+        <record id="wizard_contact_form_view_employees_list" model="ir.ui.view">
+            <field name="name">portal_hr_employees.employees_list</field>
+            <field name="model">portal_crm.crm_contact_us</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="portal_crm.wizard_contact_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@class='oe_portal_crm_team']" position="inside">
+                    <h1>Meet the team</h1>
+                    <field name="employee_ids" widget="many2many_kanban">
+                        <kanban>
+                            <templates>
+                                <t t-name="kanban-box">
+                                    <div class="oe_employee_vignette">
+                                        <div class="oe_employee_image">
+                                            <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
+                                        </div>
+                                        <div class="oe_employee_details">
+                                            <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
+                                            <ul>
+                                                <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
+                                                <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
+                                                <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
+                                                <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                </t>
+                            </templates>
+                        </kanban>
+                    </field>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/portal_crm/security/ir.model.access.csv b/addons/portal_hr_employees/security/ir.model.access.csv
similarity index 100%
rename from addons/portal_crm/security/ir.model.access.csv
rename to addons/portal_hr_employees/security/ir.model.access.csv
diff --git a/addons/portal_crm/security/portal_crm_security.xml b/addons/portal_hr_employees/security/portal_crm_security.xml
similarity index 100%
rename from addons/portal_crm/security/portal_crm_security.xml
rename to addons/portal_hr_employees/security/portal_crm_security.xml
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
new file mode 100644
index 00000000000..d153f8c52fb
--- /dev/null
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -0,0 +1,11 @@
+/* Employees list section */
+.openerp .oe_portal_crm_contact .oe_portal_crm_team {
+    padding: 8px 0 0 0;
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details {
+    width: 170px;
+}
+.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image {
+    width: 65px;
+    height: 65px;
+}
diff --git a/addons/portal_hr_recruitment/__openerp__.py b/addons/portal_hr_recruitment/__openerp__.py
index 015e76d3d06..0b7fb78b7f0 100644
--- a/addons/portal_hr_recruitment/__openerp__.py
+++ b/addons/portal_hr_recruitment/__openerp__.py
@@ -21,13 +21,12 @@
 
 
 {
-    'name': 'Portal Jobs',
+    'name': 'Portal HR recruitment',
     'version': '0.1',
     'category': 'Tools',
     'complexity': "easy",
     'description': """
-This module adds applications menu and features to your portal if hr and portal 
-are installed.
+This module adds a jobs page to your portal if hr and portal are installed.
     """,
     'author': 'OpenERP SA',
     'depends': ['hr','portal'],

From 3019ad848c949da4b61912366a36921f336a0e31 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 5 Jul 2012 12:44:52 +0200
Subject: [PATCH 037/312] [IMP] don't display parentheses around an employee's
 login when he doesn't have one

bzr revid: abo@openerp.com-20120705104452-qq443kyt4gw0985l
---
 addons/hr/hr_view.xml                           | 4 +++-
 addons/portal_hr_employees/hr_employee_view.xml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 56db9bbaab1..10d97f167f7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -137,7 +137,9 @@
                                 <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
                             <div class="oe_employee_details">
-                                <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
+                                <h4>
+                                    <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                </h4>
                                 <ul>
                                     <li id="last_login">
                                         <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index d8bc535057e..0979e87f793 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -35,7 +35,9 @@
                                             <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
                                         </div>
                                         <div class="oe_employee_details">
-                                            <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
+                                            <h4>
+                                                <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                            </h4>
                                             <ul>
                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                                 <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>

From 23aeb705be5a3a9f3533420f3a23b0d40ca538cf Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 5 Jul 2012 19:26:11 +0200
Subject: [PATCH 038/312] [WIP] attach dropdown menus to employees vignettes to
 easily change their visibility

bzr revid: abo@openerp.com-20120705172611-r8su5cz8j3rpyk7t
---
 addons/portal_hr_employees/__openerp__.py          |  3 +++
 addons/portal_hr_employees/hr_employee_view.xml    | 14 ++++++++++++--
 .../static/src/css/portal_hr_employees.css         | 13 +++++++++++++
 .../static/src/js/portal_hr_employees.js           |  3 +++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 addons/portal_hr_employees/static/src/js/portal_hr_employees.js

diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py
index 7a6687faa64..974b8908049 100644
--- a/addons/portal_hr_employees/__openerp__.py
+++ b/addons/portal_hr_employees/__openerp__.py
@@ -42,6 +42,9 @@ portal_crm (which creates the contact page) are installed.
     'css': [
         'static/src/css/portal_hr_employees.css',
     ],
+    'js': [
+        'static/lib/jquery.expander/portal_hr_employees.js',
+    ],
 
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index 0979e87f793..37c52b03bf4 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -28,15 +28,25 @@
                     <h1>Meet the team</h1>
                     <field name="employee_ids" widget="many2many_kanban">
                         <kanban>
+                            <field name="visibility"/>
+
                             <templates>
                                 <t t-name="kanban-box">
                                     <div class="oe_employee_vignette">
+                                        <span class="oe_dropdown_toggle oe_dropdown_arrow">
+                                            <ul class="oe_dropdown_menu">
+                                                <li t-if="record.visibility.raw_value != 'private'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_private">Hide this employee</a></li>
+                                                <li t-if="record.visibility.raw_value != 'public'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_public">Make this employee visible for everyone</a></li>
+                                                <li t-if="record.visibility.raw_value != 'portal'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_portal">Make this employee visible for portal users</a></li>
+                                            </ul>
+                                        </span>
+
                                         <div class="oe_employee_image">
-                                            <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
+                                            <img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
                                         </div>
                                         <div class="oe_employee_details">
                                             <h4>
-                                                <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                                <field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t>
                                             </h4>
                                             <ul>
                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
index d153f8c52fb..619c95f408d 100644
--- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -9,3 +9,16 @@
     width: 65px;
     height: 65px;
 }
+
+/* Dropdown menu */
+.openerp .oe_portal_crm_contact .oe_employee_vignette .oe_dropdown_toggle {
+    position: absolute;
+    top: 10px;
+    right: 5px;
+}
+.openerp .oe_portal_crm_contact .oe_employee_vignette .oe_dropdown_arrow:after {
+    border-top: 4px solid transparent;
+}
+.openerp .oe_portal_crm_contact .oe_employee_vignette:hover .oe_dropdown_arrow:after {
+    border-top: 4px solid #404040;
+}
diff --git a/addons/portal_hr_employees/static/src/js/portal_hr_employees.js b/addons/portal_hr_employees/static/src/js/portal_hr_employees.js
new file mode 100644
index 00000000000..ea54ac09506
--- /dev/null
+++ b/addons/portal_hr_employees/static/src/js/portal_hr_employees.js
@@ -0,0 +1,3 @@
+openerp.portal_hr_employees = function(session) {
+
+}
\ No newline at end of file

From 3f500606351f150d2eaa19e9215eb1e60af00c2c Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 6 Jul 2012 12:05:01 +0200
Subject: [PATCH 039/312] [IMP] remove some weird triple " in stock demo data

bzr revid: abo@openerp.com-20120706100501-e9zxjnzbxnefothm
---
 addons/stock/stock_demo.xml | 47 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index ec0860f62c7..03a107b6947 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -6,9 +6,9 @@
             <field eval="[(4, ref('group_stock_user'))]" name="groups_id"/>
         </record>
 
-        <!--
-    Resource: stock.location
-    -->
+
+        <!-- Resource: stock.location -->
+
         <record id="stock_location_3" model="stock.location">
             <field name="name">IT Suppliers</field>
             <field name="location_id" ref="stock_location_suppliers"/>
@@ -44,16 +44,14 @@
         </record>
 
 
-        <!--
-    Resource: stock.inventory
-    -->
+        <!-- Resource: stock.inventory -->
 
         <record id="stock_inventory_0" model="stock.inventory">
             <field name="name">Starting Inventory</field>
         </record>
-        <!--
-    Resource: stock.inventory.line
-    -->
+
+
+        <!-- Resource: stock.inventory.line -->
 
         <record id="stock_inventory_line_0" model="stock.inventory.line">
             <field name="product_id" ref="product.product_product_pc1"/>
@@ -185,10 +183,10 @@
             <field eval="0" name="supplier"/>
             <field name="is_company">1</field>
             <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+            <field name="name">Shop 1</field>
         </record>
         <record id="res_partner_address_fabien0" model="res.partner">
-            <field eval="&quot;&quot;&quot;Felix&quot;&quot;&quot;" name="name"/>
+            <field name="name">Felix</field>
             <field name="parent_id" ref="res_partner_tinyshop0"/>
             <field name="use_parent_address" eval="1"/>
             <field eval="1" name="active"/>
@@ -197,17 +195,17 @@
             <field name="currency_id" ref="base.EUR"/>
             <field name="partner_id" ref="res_partner_tinyshop0"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+            <field name="name">Shop 1</field>
         </record>
         <record id="res_partner_tinyshop1" model="res.partner">
             <field eval="1" name="customer"/>
             <field eval="0" name="supplier"/>
             <field eval="1" name="active"/>
             <field name="is_company">1</field>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+            <field name="name">Shop 2</field>
         </record>
         <record id="res_partner_address_eric0" model="res.partner">
-            <field eval="&quot;&quot;&quot;Edwin&quot;&quot;&quot;" name="name"/>
+            <field name="name">Edwin</field>
             <field name="parent_id" ref="res_partner_tinyshop1"/>
             <field name="use_parent_address" eval="1"/>
             <field eval="1" name="active"/>
@@ -216,36 +214,36 @@
             <field name="currency_id" ref="base.EUR"/>
             <field name="partner_id" ref="res_partner_tinyshop1"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+            <field name="name">Shop 2</field>
         </record>
         <record id="stock_location_shop0" model="stock.location">
             <field model="res.partner" name="partner_id" search="[('name','=','Fabien')]"/>
             <field name="location_id" ref="stock.stock_location_locations"/>
             <field name="company_id" ref="res_company_shop0"/>
-            <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
-            <field eval="&quot;&quot;&quot;none&quot;&quot;&quot;" name="chained_location_type"/>
+            <field name="usage">internal</field>
+            <field name="chained_location_type">none</field>
             <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;manual&quot;&quot;&quot;" name="chained_auto_packing"/>
+            <field name="name">Shop 1</field>
+            <field name="chained_auto_packing">manual</field>
         </record>
         <record id="stock_location_shop1" model="stock.location">
             <field model="res.partner" name="partner_id" search="[('name','=','Eric')]"/>
             <field name="company_id" ref="res_company_tinyshop0"/>
             <field name="location_id" ref="stock.stock_location_locations"/>
-            <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
+            <field name="usage">internal</field>
             <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+            <field name="name">Shop 2</field>
         </record>
         <record id="stock_location_intermediatelocation0" model="stock.location">
             <field name="partner_id" ref="base.main_partner"/>
             <field name="location_id" ref="stock.stock_location_locations_partner"/>
-            <field eval="&quot;&quot;&quot;procurement&quot;&quot;&quot;" name="usage"/>
-            <field eval="&quot;&quot;&quot;Internal Shippings&quot;&quot;&quot;" name="name"/>
+            <field name="usage">procurement</field>
+            <field name="name">Internal Shippings</field>
         </record>
 
         <record id="stock_warehouse_shop0" model="stock.warehouse">
             <field name="lot_output_id" ref="stock.stock_location_output"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+            <field name="name">Shop 1</field>
             <field name="lot_stock_id" ref="stock_location_shop0"/>
             <field name="partner_id" ref="res_partner_address_fabien0"/>
             <field name="company_id" ref="res_company_shop0"/>
@@ -266,5 +264,6 @@
             <field eval="'account.account,'+str(ref('account.stk'))" model="account.account" name="value"/>
              <field name="company_id" ref="base.main_company"/>
         </record>
+
     </data>
 </openerp>

From 4eba8c2290766fc68f73ddb168ee851f333637a9 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 6 Jul 2012 12:27:56 +0200
Subject: [PATCH 040/312] [FIX] forgot to bzr add

bzr revid: abo@openerp.com-20120706102756-d7ihynymw01hipf6
---
 .../portal_hr_employee_view.xml               | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 addons/portal_hr_employees/portal_hr_employee_view.xml

diff --git a/addons/portal_hr_employees/portal_hr_employee_view.xml b/addons/portal_hr_employees/portal_hr_employee_view.xml
new file mode 100644
index 00000000000..26127d59208
--- /dev/null
+++ b/addons/portal_hr_employees/portal_hr_employee_view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- add visibility field to the employee form view -->
+        <record id="view_employee_form" model="ir.ui.view">
+            <field name="name">portal_hr_employees.employee.form</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='active_group']" position="after">
+                    <group string="Employee's visibility">
+                        <field name="visibility"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <!-- a kanban view of the employees to the portal's contact page -->
+        <record id="wizard_contact_form_view_employees_list" model="ir.ui.view">
+            <field name="name">portal_hr_employees.employees_list</field>
+            <field name="model">portal_crm.crm_contact_us</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="portal_crm.wizard_contact_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@class='oe_portal_crm_team']" position="inside">
+                    <h1>Meet the team</h1>
+                    <field name="employee_ids" widget="many2many_kanban">
+                        <kanban>
+                            <field name="visibility"/>
+
+                            <templates>
+                                <t t-name="kanban-box">
+                                    <div class="oe_employee_vignette">
+                                        <span class="oe_dropdown_toggle oe_dropdown_arrow">
+                                            <ul class="oe_dropdown_menu">
+                                                <li t-if="record.visibility.raw_value != 'private'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_private">Hide this employee</a></li>
+                                                <li t-if="record.visibility.raw_value != 'public'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_public">Make this employee visible for everyone</a></li>
+                                                <li t-if="record.visibility.raw_value != 'portal'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_portal">Make this employee visible for portal users</a></li>
+                                            </ul>
+                                        </span>
+
+                                        <div class="oe_employee_image">
+                                            <img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
+                                        </div>
+                                        <div class="oe_employee_details">
+                                            <h4>
+                                                <field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t>
+                                            </h4>
+                                            <ul>
+                                                <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
+                                                <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
+                                                <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
+                                                <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                </t>
+                            </templates>
+                        </kanban>
+                    </field>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 622c7f2ad448dee1a2716d0bcadd3eda76337c3d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 6 Jul 2012 16:34:01 +0200
Subject: [PATCH 041/312] [WIP] add dropdown to show/hide employees in the
 portal's contact page this is achieved by extending the many2many_kanban
 widget and adding it a few events

bzr revid: abo@openerp.com-20120706143401-z8zjla7kbiklbua5
---
 addons/portal_hr_employees/__openerp__.py     |  2 +-
 .../portal_hr_employee_view.xml               |  8 ++--
 .../static/src/js/portal_hr_employees.js      | 39 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py
index 7bbdec99adf..ec5d821d280 100644
--- a/addons/portal_hr_employees/__openerp__.py
+++ b/addons/portal_hr_employees/__openerp__.py
@@ -43,7 +43,7 @@ portal_crm (which creates the contact page) are installed.
         'static/src/css/portal_hr_employees.css',
     ],
     'js': [
-        'static/lib/jquery.expander/portal_hr_employees.js',
+        'static/src/js/portal_hr_employees.js',
     ],
 
 }
diff --git a/addons/portal_hr_employees/portal_hr_employee_view.xml b/addons/portal_hr_employees/portal_hr_employee_view.xml
index 26127d59208..2ee9539db39 100644
--- a/addons/portal_hr_employees/portal_hr_employee_view.xml
+++ b/addons/portal_hr_employees/portal_hr_employee_view.xml
@@ -26,7 +26,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_portal_crm_team']" position="inside">
                     <h1>Meet the team</h1>
-                    <field name="employee_ids" widget="many2many_kanban">
+                    <field name="employee_ids" widget="many2many_kanban_custom">
                         <kanban>
                             <field name="visibility"/>
 
@@ -35,9 +35,9 @@
                                     <div class="oe_employee_vignette">
                                         <span class="oe_dropdown_toggle oe_dropdown_arrow">
                                             <ul class="oe_dropdown_menu">
-                                                <li t-if="record.visibility.raw_value != 'private'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_private">Hide this employee</a></li>
-                                                <li t-if="record.visibility.raw_value != 'public'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_public">Make this employee visible for everyone</a></li>
-                                                <li t-if="record.visibility.raw_value != 'portal'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_portal">Make this employee visible for portal users</a></li>
+                                                <li t-if="record.visibility.raw_value != 'private'"><a href="#" t-attf-data-id='{record.id.raw_value}' class="oe_employee_make_private">Hide this employee</a></li>
+                                                <li t-if="record.visibility.raw_value != 'public'"><a href="#" t-attf-data-id='{record.id.raw_value}' class="oe_employee_make_public">Make this employee visible for everyone</a></li>
+                                                <li t-if="record.visibility.raw_value != 'portal'"><a href="#" t-attf-data-id='{record.id.raw_value}' class="oe_employee_make_portal">Make this employee visible for portal users</a></li>
                                             </ul>
                                         </span>
 
diff --git a/addons/portal_hr_employees/static/src/js/portal_hr_employees.js b/addons/portal_hr_employees/static/src/js/portal_hr_employees.js
index ea54ac09506..99d0c5a1cbb 100644
--- a/addons/portal_hr_employees/static/src/js/portal_hr_employees.js
+++ b/addons/portal_hr_employees/static/src/js/portal_hr_employees.js
@@ -1,3 +1,40 @@
 openerp.portal_hr_employees = function(session) {
+    /*
+     * Extend the many2many_kanban widget and add it a few things such
+     * as delegates.
+     */
 
-}
\ No newline at end of file
+    // phe: short name for "portal hr employees"
+    var phe = session.portal_hr_employees = {};
+
+    phe.many2many_kanban_custom = session.web.form.FieldMany2ManyKanban.extend({
+        start: function() {
+            var self = this;
+
+            this._super.apply(this, arguments);
+
+            // add events
+            this.add_events();
+        },
+        add_events: function() {
+            var self = this;
+
+            // event: make an employee public
+            this.$element.delegate('a.oe_employee_make_public', 'click', function (e) {
+                console.log('make employee#'+$(this).attr('data-id')+' public');
+            });
+
+            // event: make an employee private
+            this.$element.delegate('a.oe_employee_make_private', 'click', function (e) {
+                console.log('make employee#'+$(this).attr('data-id')+' private');
+            });
+
+            // event: make an employee portal
+            this.$element.delegate('a.oe_employee_make_portal', 'click', function (e) {
+                console.log('make employee#'+$(this).attr('data-id')+' portal');
+            });
+        },
+    });
+
+    session.web.form.widgets.add('many2many_kanban_custom', 'openerp.portal_hr_employees.many2many_kanban_custom');
+}

From 0ca634e6a4299bca613428dcdc0448f9906e3a99 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 6 Jul 2012 17:58:26 +0200
Subject: [PATCH 042/312] [RM] the dropdown feature isn't a top priority, after
 all

bzr revid: abo@openerp.com-20120706155826-i271xel4zduvmq6g
---
 .../portal_hr_employee_view.xml               | 12 +-----
 .../static/src/css/portal_hr_employees.css    | 13 ------
 .../static/src/js/portal_hr_employees.js      | 40 -------------------
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 addons/portal_hr_employees/static/src/js/portal_hr_employees.js

diff --git a/addons/portal_hr_employees/portal_hr_employee_view.xml b/addons/portal_hr_employees/portal_hr_employee_view.xml
index 2ee9539db39..8278bd81c14 100644
--- a/addons/portal_hr_employees/portal_hr_employee_view.xml
+++ b/addons/portal_hr_employees/portal_hr_employee_view.xml
@@ -26,27 +26,19 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_portal_crm_team']" position="inside">
                     <h1>Meet the team</h1>
-                    <field name="employee_ids" widget="many2many_kanban_custom">
+                    <field name="employee_ids" widget="many2many_kanban">
                         <kanban>
                             <field name="visibility"/>
 
                             <templates>
                                 <t t-name="kanban-box">
                                     <div class="oe_employee_vignette">
-                                        <span class="oe_dropdown_toggle oe_dropdown_arrow">
-                                            <ul class="oe_dropdown_menu">
-                                                <li t-if="record.visibility.raw_value != 'private'"><a href="#" t-attf-data-id='{record.id.raw_value}' class="oe_employee_make_private">Hide this employee</a></li>
-                                                <li t-if="record.visibility.raw_value != 'public'"><a href="#" t-attf-data-id='{record.id.raw_value}' class="oe_employee_make_public">Make this employee visible for everyone</a></li>
-                                                <li t-if="record.visibility.raw_value != 'portal'"><a href="#" t-attf-data-id='{record.id.raw_value}' class="oe_employee_make_portal">Make this employee visible for portal users</a></li>
-                                            </ul>
-                                        </span>
-
                                         <div class="oe_employee_image">
                                             <img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
                                         </div>
                                         <div class="oe_employee_details">
                                             <h4>
-                                                <field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t>
+                                                <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                             </h4>
                                             <ul>
                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
index 619c95f408d..d153f8c52fb 100644
--- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -9,16 +9,3 @@
     width: 65px;
     height: 65px;
 }
-
-/* Dropdown menu */
-.openerp .oe_portal_crm_contact .oe_employee_vignette .oe_dropdown_toggle {
-    position: absolute;
-    top: 10px;
-    right: 5px;
-}
-.openerp .oe_portal_crm_contact .oe_employee_vignette .oe_dropdown_arrow:after {
-    border-top: 4px solid transparent;
-}
-.openerp .oe_portal_crm_contact .oe_employee_vignette:hover .oe_dropdown_arrow:after {
-    border-top: 4px solid #404040;
-}
diff --git a/addons/portal_hr_employees/static/src/js/portal_hr_employees.js b/addons/portal_hr_employees/static/src/js/portal_hr_employees.js
deleted file mode 100644
index 99d0c5a1cbb..00000000000
--- a/addons/portal_hr_employees/static/src/js/portal_hr_employees.js
+++ /dev/null
@@ -1,40 +0,0 @@
-openerp.portal_hr_employees = function(session) {
-    /*
-     * Extend the many2many_kanban widget and add it a few things such
-     * as delegates.
-     */
-
-    // phe: short name for "portal hr employees"
-    var phe = session.portal_hr_employees = {};
-
-    phe.many2many_kanban_custom = session.web.form.FieldMany2ManyKanban.extend({
-        start: function() {
-            var self = this;
-
-            this._super.apply(this, arguments);
-
-            // add events
-            this.add_events();
-        },
-        add_events: function() {
-            var self = this;
-
-            // event: make an employee public
-            this.$element.delegate('a.oe_employee_make_public', 'click', function (e) {
-                console.log('make employee#'+$(this).attr('data-id')+' public');
-            });
-
-            // event: make an employee private
-            this.$element.delegate('a.oe_employee_make_private', 'click', function (e) {
-                console.log('make employee#'+$(this).attr('data-id')+' private');
-            });
-
-            // event: make an employee portal
-            this.$element.delegate('a.oe_employee_make_portal', 'click', function (e) {
-                console.log('make employee#'+$(this).attr('data-id')+' portal');
-            });
-        },
-    });
-
-    session.web.form.widgets.add('many2many_kanban_custom', 'openerp.portal_hr_employees.many2many_kanban_custom');
-}

From 40531c4f540e5a93c85ae51f6b5a1fc4d70ca28a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 9 Jul 2012 11:19:43 +0200
Subject: [PATCH 043/312] [FIX] remove 'portal' visibility stuff also put the
 'company's news' view in 'inline' mode

bzr revid: abo@openerp.com-20120709091943-kpgfc4vw51pbzsd8
---
 addons/portal/portal_data.xml                             | 1 +
 addons/portal_hr_employees/__openerp__.py                 | 4 ----
 addons/portal_hr_employees/hr_employee.py                 | 3 +--
 .../portal_hr_employees/security/portal_crm_security.xml  | 8 --------
 4 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 addons/portal_hr_employees/security/portal_crm_security.xml

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 3f7e6804d9b..1f0d830657e 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -11,6 +11,7 @@
             <field name="res_model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
             <field name="view_mode">form</field>
+            <field name="target">inline</field>
         </record>
 
         <!-- default portal menu structure -->
diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py
index ec5d821d280..b7c25c2274f 100644
--- a/addons/portal_hr_employees/__openerp__.py
+++ b/addons/portal_hr_employees/__openerp__.py
@@ -33,7 +33,6 @@ portal_crm (which creates the contact page) are installed.
     'depends': ['hr','portal_crm'],
     'data': [
         'portal_hr_employee_view.xml',
-        'security/portal_crm_security.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
@@ -42,9 +41,6 @@ portal_crm (which creates the contact page) are installed.
     'css': [
         'static/src/css/portal_hr_employees.css',
     ],
-    'js': [
-        'static/src/js/portal_hr_employees.js',
-    ],
 
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py
index d14b2400889..a4630ba3b3e 100644
--- a/addons/portal_hr_employees/hr_employee.py
+++ b/addons/portal_hr_employees/hr_employee.py
@@ -46,11 +46,10 @@ class hr_employee(osv.osv):
     """
     ``visibility``: defines if the employee appears on the portal's contact page
                     - 'public' means the employee will appear for everyone (anonymous)
-                    - 'portal' means the employee will appear for portal users only
                     - 'private' means the employee won't appear
     """
     _columns = {
-        'visibility': fields.selection([('public', 'Public'),('portal', 'Portal'),('private', 'Private')],
+        'visibility': fields.selection([('public', 'Public'),('private', 'Private')],
             string='Visibility', help='Employee\'s visibility in the portal\'s contact page'),
     }
     _defaults = {
diff --git a/addons/portal_hr_employees/security/portal_crm_security.xml b/addons/portal_hr_employees/security/portal_crm_security.xml
deleted file mode 100644
index 2fb26abe7ec..00000000000
--- a/addons/portal_hr_employees/security/portal_crm_security.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-        <!-- Employees with a visibility == 'portal' can't be seen by anonymous -->
-
-    </data>
-</openerp>

From 501001a918ad14ece01e17a5ce9d93b47b149c17 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 9 Jul 2012 17:54:24 +0200
Subject: [PATCH 044/312] [WIP] issues view in the portal

bzr revid: abo@openerp.com-20120709155424-2vda15p1s9rca8iz
---
 addons/portal_project_issue/__openerp__.py    |   5 +-
 .../portal_project_issue_view.xml             |  63 +++++++-
 .../static/src/css/portal_project_issue.css   |  28 ++++
 addons/project_issue/project_issue_view.xml   | 139 +++++++++---------
 4 files changed, 163 insertions(+), 72 deletions(-)
 create mode 100644 addons/portal_project_issue/static/src/css/portal_project_issue.css

diff --git a/addons/portal_project_issue/__openerp__.py b/addons/portal_project_issue/__openerp__.py
index d1be2ec604d..17ba4b0d5aa 100644
--- a/addons/portal_project_issue/__openerp__.py
+++ b/addons/portal_project_issue/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Tools',
     'complexity': "easy",
     'description': """
-This module adds issue menu and features to your portal if project_issue and 
+This module adds issue menu and features to your portal if project_issue and
 portal are installed.
     """,
     'author': 'OpenERP SA',
@@ -39,5 +39,8 @@ portal are installed.
     'installable': True,
     'auto_install':True,
     'category':'Hidden',
+    'css': [
+        'static/src/css/portal_project_issue.css',
+    ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index fdbf1037c20..2097f2efda0 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -2,12 +2,71 @@
 <openerp>
     <data>
 
+        <record id="portal_project_issue_kanban_view" model="ir.ui.view">
+            <field name="name">Project Issue Kanban</field>
+            <field name="model">project.issue</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" class="oe_portal_project_issue">
+                    <field name="priority"/>
+                    <field name="user_email"/>
+                    <field name="user_id"/>
+                    <field name="date_deadline"/>
+                    <field name="create_date"/>
+                    <templates>
+                        <t t-name="kanban-tooltip">
+                           <ul class="oe_kanban_tooltip">
+                              <li><b>Project:</b> <field name="project_id"/></li>
+                              <li><b>Category:</b> <field name="categ_id"/></li>
+                           </ul>
+                        </t>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_card oe_kanban_global_click">
+                                <div class="oe_kanban_content" tooltip="kanban-tooltip">
+                                    <div>
+                                        <h1><a type="edit"><field name="name"/></a></h1>
+                                        <field name="partner_id"/> <br/>
+                                        <field name="version_id"/>
+                                    </div>
+                                    <div class="oe_kanban_footer_left">
+                                        <div class="oe_right">
+                                            Creation: <field name="create_date"/>
+                                            <span class="oe_kanban_highlight">
+                                                <t t-set="priority" t-value="record.priority.raw_value || 5"/>
+                                                <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
+                                                   <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
+                                                </a>
+                                                <a type="object" name="set_priority" args="['5']" t-if="priority lte 3" title="Normal Priority">
+                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                                </a>
+                                                <a type="object" name="set_priority" args="['2']" title="High Priority">
+                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                                </a>
+                                                <a type="object" name="set_priority" args="['1']" title="Highest Priority">
+                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                                </a>
+                                            </span>
+                                            <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())">
+                                                <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span>
+                                            </t>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <record id="project_issue_categ_act0" model="ir.actions.act_window">
             <field name="name">Issues</field>
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
-            <field name="view_mode">kanban,tree,calendar</field>
-            <field name="view_id" eval="False"/>
+            <field name="view_mode">kanban,form</field>
+            <field name="view_id" ref="portal_project_issue_kanban_view"/>
             <field name="domain" eval=""/>
             <field name="context">{"search_default_user_id":'', "search_default_draft":'', "search_default_todo":''}</field>
             <field name="search_view_id" ref="project_issue.view_project_issue_filter"/>
diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/portal_project_issue/static/src/css/portal_project_issue.css
new file mode 100644
index 00000000000..3ad30208d6d
--- /dev/null
+++ b/addons/portal_project_issue/static/src/css/portal_project_issue.css
@@ -0,0 +1,28 @@
+.oe_portal_project_issue {
+    width: 960px;
+    margin: 0 auto;
+}
+
+.oe_portal_project_issue .oe_fold_column.oe_kanban_record {
+    float: none;
+    display: block;
+    width: 100%;
+    border-width: 1px;
+    border-radius: 4px;
+    border-style: solid;
+    border-bottom-color: #B9B9B9;
+    border-left-color: #D8D8D8;
+    border-right-color: #D8D8D8;
+    border-top-color: #D8D8D8;
+    margin-bottom: 5px;
+}
+
+.oe_portal_project_issue .oe_fold_column.oe_kanban_record .oe_kanban_content {
+    padding: 5px;
+}
+
+.oe_portal_project_issue .oe_fold_column.oe_kanban_record h1 {
+    margin: 0;
+    font-size: 1.2em;
+    font-weight: bold;
+}
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c6629f2f9d4..860a1153fce 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -252,73 +252,73 @@
         </record>
 
 
-    <!-- Project Issue Karban View-->
+        <!-- Project Issue Karban View-->
 
-    <record model="ir.ui.view" id="project_issue_kanban_view">
-        <field name="name">Project Issue Kanban</field>
-        <field name="model">project.issue</field>
-        <field name="type">kanban</field>
-        <field name="arch" type="xml">
-            <kanban default_group_by="stage_id">
-                <field name="color"/>
-                <field name="priority"/>
-                <field name="user_email"/>
-                <field name="user_id"/>
-                <field name="date_deadline"/>
-                <templates>
-                    <t t-name="kanban-tooltip">
-                       <ul class="oe_kanban_tooltip">
-                          <li><b>Project:</b> <field name="project_id"/></li>
-                          <li><b>Category:</b> <field name="categ_id"/></li>
-                       </ul>
-                    </t>
-                    <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                <span class="oe_e">i</span>
-                                <ul class="oe_dropdown_menu">
-                                    <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
-                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                </ul>
-                            </div>
-                            <div class="oe_kanban_content" tooltip="kanban-tooltip">
-                                <div>
-                                    <b><field name="name"/></b> <br/>
-                                    <field name="partner_id"/> <br/>
-                                    <field name="version_id"/>
-                                </div> 
-                                <div class="oe_kanban_footer_left">
-                                    <div class="oe_right">
-                                        <span class="oe_kanban_highlight">
-                                            <t t-set="priority" t-value="record.priority.raw_value || 5"/>
-                                            <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
-                                               <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['5']" t-if="priority lte 3" title="Normal Priority">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['2']" title="High Priority"> 
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['1']" title="Highest Priority">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                        </span>
-                                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())">
-                                            <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span>
-                                        </t>
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+        <record model="ir.ui.view" id="project_issue_kanban_view">
+            <field name="name">Project Issue Kanban</field>
+            <field name="model">project.issue</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="stage_id">
+                    <field name="color"/>
+                    <field name="priority"/>
+                    <field name="user_email"/>
+                    <field name="user_id"/>
+                    <field name="date_deadline"/>
+                    <templates>
+                        <t t-name="kanban-tooltip">
+                           <ul class="oe_kanban_tooltip">
+                              <li><b>Project:</b> <field name="project_id"/></li>
+                              <li><b>Category:</b> <field name="categ_id"/></li>
+                           </ul>
+                        </t>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">i</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><a type="edit" >Edit...</a></li>
+                                        <li><a type="delete">Delete</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content" tooltip="kanban-tooltip">
+                                    <div>
+                                        <b><field name="name"/></b> <br/>
+                                        <field name="partner_id"/> <br/>
+                                        <field name="version_id"/>
+                                    </div>
+                                    <div class="oe_kanban_footer_left">
+                                        <div class="oe_right">
+                                            <span class="oe_kanban_highlight">
+                                                <t t-set="priority" t-value="record.priority.raw_value || 5"/>
+                                                <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
+                                                   <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
+                                                </a>
+                                                <a type="object" name="set_priority" args="['5']" t-if="priority lte 3" title="Normal Priority">
+                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                                </a>
+                                                <a type="object" name="set_priority" args="['2']" title="High Priority">
+                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                                </a>
+                                                <a type="object" name="set_priority" args="['1']" title="Highest Priority">
+                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                                </a>
+                                            </span>
+                                            <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())">
+                                                <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span>
+                                            </t>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        </div>
                                     </div>
                                 </div>
+                                <div class="oe_clear"></div>
                             </div>
-                            <div class="oe_clear"></div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
 
 
         # ------------------------------------------------------
@@ -365,7 +365,7 @@
                 </search>
             </field>
         </record>
-        
+
         <act_window id="act_project_project_2_project_issue_all"
             name="Issues"
             src_model="project.project"
@@ -374,9 +374,9 @@
             view_mode="kanban,tree,form,calendar,graph"
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
 
-    # ------------------------------------------------------
-    # Project
-    # ------------------------------------------------------
+        # ------------------------------------------------------
+        # Project
+        # ------------------------------------------------------
 
         <record id="view_project_form_inherited" model="ir.ui.view">
             <field name="name">project.project.form.inherited</field>
@@ -396,7 +396,7 @@
                 </field>
             </field>
        </record>
-        
+
         <record id="view_project_kanban_inherited" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
@@ -414,7 +414,8 @@
                 </xpath>
             </field>
         </record>
-      <record id="analytic_account_inherited_issue_form" model="ir.ui.view">
+
+        <record id="analytic_account_inherited_issue_form" model="ir.ui.view">
             <field name="name">account.analytic.account.issue.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>

From 22d2489912618088ffb29f36b2655dcbba1618b5 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 10 Jul 2012 10:58:04 +0200
Subject: [PATCH 045/312] [WIP] add project category (should become a m2m ?)

bzr revid: abo@openerp.com-20120710085804-pyqxt3v377j0422k
---
 .../portal_project_issue/portal_project_issue_view.xml   | 9 +++------
 .../static/src/css/portal_project_issue.css              | 4 ++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 2097f2efda0..e12151a0c43 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -14,12 +14,6 @@
                     <field name="date_deadline"/>
                     <field name="create_date"/>
                     <templates>
-                        <t t-name="kanban-tooltip">
-                           <ul class="oe_kanban_tooltip">
-                              <li><b>Project:</b> <field name="project_id"/></li>
-                              <li><b>Category:</b> <field name="categ_id"/></li>
-                           </ul>
-                        </t>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_kanban_content" tooltip="kanban-tooltip">
@@ -29,6 +23,9 @@
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
+                                        <div class="oe_left">
+                                            <field name="categ_id"/>
+                                        </div>
                                         <div class="oe_right">
                                             Creation: <field name="create_date"/>
                                             <span class="oe_kanban_highlight">
diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/portal_project_issue/static/src/css/portal_project_issue.css
index 3ad30208d6d..d59b281d094 100644
--- a/addons/portal_project_issue/static/src/css/portal_project_issue.css
+++ b/addons/portal_project_issue/static/src/css/portal_project_issue.css
@@ -26,3 +26,7 @@
     font-size: 1.2em;
     font-weight: bold;
 }
+
+.oe_portal_project_issue .oe_fold_column.oe_kanban_record .oe_kanban_footer_left {
+    height: 24px;
+}

From 6e65727395399d006aa8f11967997cdbce41e86e Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 10 Jul 2012 18:47:25 +0200
Subject: [PATCH 046/312] [FIX] remove useless tooltip attr

bzr revid: abo@openerp.com-20120710164725-370mpfeb4i8linua
---
 addons/portal_project_issue/portal_project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index e12151a0c43..7c0e2a382d9 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -16,7 +16,7 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_card oe_kanban_global_click">
-                                <div class="oe_kanban_content" tooltip="kanban-tooltip">
+                                <div class="oe_kanban_content">
                                     <div>
                                         <h1><a type="edit"><field name="name"/></a></h1>
                                         <field name="partner_id"/> <br/>

From 07b310b3640c1b2494ebeb89ac01d7f9d3606e05 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 11 Jul 2012 15:21:30 +0200
Subject: [PATCH 047/312] [WIP] replace previous categ (inherited from
 crm.case.categ - using m2o relation) by a new one (project.category - using
 m2m relation and many2many_tags widget for display) the idea is to give the
 opportunity to 'tag' a project's tasks and issues instead of classifying them
 in a single category

- display in the kanban view isn't ready yet
- demo data will have to be updated accordingly
- some code in project_issue/project_issue.py has been commented out: probably dead code, will be reviewed

bzr revid: abo@openerp.com-20120711132130-uwlom1xu8rl4cr3k
---
 .../portal_project_issue_view.xml             |  4 +-
 addons/project/project.py                     | 30 +++++++-----
 .../board_project_issue_view.xml              |  2 +-
 addons/project_issue/project_issue.py         | 47 +++++++++----------
 addons/project_issue/project_issue_demo.xml   | 20 +-------
 addons/project_issue/project_issue_view.xml   | 11 +++--
 .../report/project_issue_report.py            |  2 +-
 .../report/project_issue_report_view.xml      |  4 +-
 8 files changed, 57 insertions(+), 63 deletions(-)

diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 7c0e2a382d9..f1f557889f1 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -13,6 +13,7 @@
                     <field name="user_id"/>
                     <field name="date_deadline"/>
                     <field name="create_date"/>
+                    <field name="categ_ids"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_card oe_kanban_global_click">
@@ -24,7 +25,8 @@
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <div class="oe_left">
-                                            <field name="categ_id"/>
+                                            <!-- <field name="categ_ids" widget="many2many_tags"/> -->
+                                            <t t-raw="record.categ_ids.raw_value"/>
                                         </div>
                                         <div class="oe_right">
                                             Creation: <field name="create_date"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index 5810f34ad4a..2a4bdfa2a73 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -220,7 +220,7 @@ class project(osv.osv):
         'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
                         type='many2many', relation='res.users', string='Followers'),
      }
-    
+
     def dummy(self, cr, uid, ids, context):
         return True
 
@@ -566,7 +566,7 @@ class task(base_stage, osv.osv):
         # restore order of the search
         result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
         return result
-    
+
     def _read_group_user_id(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
         res_users = self.pool.get('res.users')
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
@@ -903,7 +903,7 @@ class task(base_stage, osv.osv):
         return True
 
     def action_close(self, cr, uid, ids, context=None):
-        """ This action closes the task 
+        """ This action closes the task
         """
         task_id = len(ids) and ids[0] or False
         self._check_child_task(cr, uid, ids, context=context)
@@ -913,7 +913,7 @@ class task(base_stage, osv.osv):
     def do_close(self, cr, uid, ids, context=None):
         """ Compatibility when changing to case_close. """
         return self.case_close(cr, uid, ids, context=context)
-    
+
     def case_close(self, cr, uid, ids, context=None):
         """ Closes Task """
         if not isinstance(ids, list): ids = [ids]
@@ -946,7 +946,7 @@ class task(base_stage, osv.osv):
     def do_cancel(self, cr, uid, ids, context=None):
         """ Compatibility when changing to case_cancel. """
         return self.case_cancel(cr, uid, ids, context=context)
-    
+
     def case_cancel(self, cr, uid, ids, context=None):
         tasks = self.browse(cr, uid, ids, context=context)
         self._check_child_task(cr, uid, ids, context=context)
@@ -958,7 +958,7 @@ class task(base_stage, osv.osv):
     def do_open(self, cr, uid, ids, context=None):
         """ Compatibility when changing to case_open. """
         return self.case_open(cr, uid, ids, context=context)
-    
+
     def case_open(self, cr, uid, ids, context=None):
         if not isinstance(ids,list): ids = [ids]
         self.case_set(cr, uid, ids, 'open', {'date_start': fields.datetime.now()}, context=context)
@@ -968,7 +968,7 @@ class task(base_stage, osv.osv):
     def do_draft(self, cr, uid, ids, context=None):
         """ Compatibility when changing to case_draft. """
         return self.case_draft(cr, uid, ids, context=context)
-    
+
     def case_draft(self, cr, uid, ids, context=None):
         self.case_set(cr, uid, ids, 'draft', {}, context=context)
         self.case_draft_send_note(cr, uid, ids, context=context)
@@ -977,11 +977,11 @@ class task(base_stage, osv.osv):
     def do_pending(self, cr, uid, ids, context=None):
         """ Compatibility when changing to case_pending. """
         return self.case_pending(cr, uid, ids, context=context)
-    
+
     def case_pending(self, cr, uid, ids, context=None):
         self.case_set(cr, uid, ids, 'pending', {}, context=context)
         return self.case_pending_send_note(cr, uid, ids, context=context)
-    
+
     def _delegate_task_attachments(self, cr, uid, task_id, delegated_task_id, context=None):
         attachment = self.pool.get('ir.attachment')
         attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', task_id)], context=context)
@@ -1083,7 +1083,7 @@ class task(base_stage, osv.osv):
             new_stage = vals.get('stage_id')
             vals_reset_kstate = dict(vals, kanban_state='normal')
             for t in self.browse(cr, uid, ids, context=context):
-                #TO FIX:Kanban view doesn't raise warning 
+                #TO FIX:Kanban view doesn't raise warning
                 #stages = [stage.id for stage in t.project_id.type_ids]
                 #if new_stage not in stages:
                     #raise osv.except_osv(_('Warning !'), _('Stage is not defined in the project.'))
@@ -1129,7 +1129,7 @@ class task(base_stage, osv.osv):
 
         result += "\n"
         return result
-    
+
     # ---------------------------------------------------
     # OpenChatter methods and notifications
     # ---------------------------------------------------
@@ -1359,3 +1359,11 @@ class project_task_history_cumulative(osv.osv):
         )
         """)
 
+
+class project_category(osv.osv):
+    """ Category of project's task (or issue) """
+    _name = "project.category"
+    _description = "Category of project's task, issue, ..."
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+    }
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index cedcd85d4fc..8bc34177d7d 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -18,7 +18,7 @@
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
                     <field name="state" groups="base.group_no_one"/>
-                    <field name="categ_id" invisible="1"/>
+                    <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
             </field>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5f9b0a369ca..ff98ef29cc4 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -236,7 +236,7 @@ class project_issue(base_stage, osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True,select=True),
         'date': fields.datetime('Date'),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
+        'categ_ids': fields.many2many('project.category', 'project_issue_categ_rel', 'project_issue_id', 'project_category_id', 'Categories'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
@@ -279,7 +279,6 @@ class project_issue(base_stage, osv.osv):
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
-        'categ_id' : lambda *a: False,
          }
 
     _group_by_full = {
@@ -304,11 +303,11 @@ class project_issue(base_stage, osv.osv):
     def convert_issue_task(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        
+
         case_obj = self.pool.get('project.issue')
         data_obj = self.pool.get('ir.model.data')
         task_obj = self.pool.get('project.task')
-        
+
         result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
         res = data_obj.read(cr, uid, result, ['res_id'])
         id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
@@ -352,21 +351,21 @@ class project_issue(base_stage, osv.osv):
         }
 
 
-    def _convert(self, cr, uid, ids, xml_id, context=None):
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
-        categ_id = False
-        if id2:
-            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
-        if categ_id:
-            self.write(cr, uid, ids, {'categ_id': categ_id})
-        return True
+    # def _convert(self, cr, uid, ids, xml_id, context=None):
+    #     data_obj = self.pool.get('ir.model.data')
+    #     id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
+    #     categ_id = False
+    #     if id2:
+    #         categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
+    #     if categ_id:
+    #         self.write(cr, uid, ids, {'categ_id': categ_id})
+    #     return True
 
-    def convert_to_feature(self, cr, uid, ids, context=None):
-        return self._convert(cr, uid, ids, 'feature_request_categ', context=context)
+    # def convert_to_feature(self, cr, uid, ids, context=None):
+    #     return self._convert(cr, uid, ids, 'feature_request_categ', context=context)
 
-    def convert_to_bug(self, cr, uid, ids, context=None):
-        return self._convert(cr, uid, ids, 'bug_categ', context=context)
+    # def convert_to_bug(self, cr, uid, ids, context=None):
+    #     return self._convert(cr, uid, ids, 'bug_categ', context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
         issue = self.read(cr, uid, id, ['name'], context=context)
@@ -376,7 +375,7 @@ class project_issue(base_stage, osv.osv):
         default['name'] = issue['name'] + _(' (copy)')
         return super(project_issue, self).copy(cr, uid, id, default=default,
                 context=context)
-    
+
     def write(self, cr, uid, ids, vals, context=None):
         #Update last action date every time the user change the stage, the state or send a new email
         logged_fields = ['stage_id', 'state', 'message_ids']
@@ -463,7 +462,7 @@ class project_issue(base_stage, osv.osv):
     # -------------------------------------------------------
     # Mail gateway
     # -------------------------------------------------------
-    
+
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
         """ Overrides mail_thread message_new that is called by the mailgateway
             through message_process.
@@ -485,7 +484,7 @@ class project_issue(base_stage, osv.osv):
         custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
 
         res_id = super(project_issue, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
-        self.convert_to_bug(cr, uid, [res_id], context=context)
+        # self.convert_to_bug(cr, uid, [res_id], context=context)
         return res_id
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -515,11 +514,11 @@ class project_issue(base_stage, osv.osv):
                 update_vals[key] = res.group(2).lower()
 
         return super(project_issue, self).message_update(cr, uid, ids, update_vals=update_vals, context=context)
-    
+
     # -------------------------------------------------------
     # OpenChatter methods and notifications
     # -------------------------------------------------------
-    
+
     def message_get_subscribers(self, cr, uid, ids, context=None):
         """ Override to add responsible user. """
         user_ids = super(project_issue, self).message_get_subscribers(cr, uid, ids, context=context)
@@ -588,11 +587,11 @@ project()
 class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
-    
+
     _columns = {
         'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
     }
-    
+
     def _trigger_project_creation(self, cr, uid, vals, context=None):
         res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or vals.get('use_issues')
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index b3fb4582cf2..2cda2e189e8 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -9,12 +9,11 @@
         <field name="partner_id" ref="base.res_partner_agrolait"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
-        <field name="categ_id" ref="bug_categ"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="15.0" name="duration"/>
         <field eval="&quot;Bug in Accounts module&quot;" name="name"/>
         <field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
-        <field name="stage_id" ref="project.project_tt_specification"/>        
+        <field name="stage_id" ref="project.project_tt_specification"/>
     </record>
 
     <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
@@ -25,7 +24,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="3.5" name="duration"/>
-        <field name="categ_id" ref="bug_categ"/>
         <field eval="&quot;Program not giving proper output&quot;" name="name"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="stage_id" ref="project.project_tt_specification"/>
@@ -38,7 +36,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="2.3" name="duration"/>
-        <field name="categ_id" ref="bug_categ"/>
         <field name="project_id" ref="project.project_project_23"/>
         <field eval="&quot;Output incorrect&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_development"/>
@@ -52,7 +49,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="4.0" name="duration"/>
-        <field name="categ_id" ref="bug_categ"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="&quot;Problem loading page&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_testing"/>
@@ -66,7 +62,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="1.0" name="duration"/>
-        <field name="categ_id" ref="bug_categ"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="&quot;Page not Found&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_development"/>
@@ -80,7 +75,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="4.0" name="duration"/>
-        <field name="categ_id" ref="bug_categ"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="&quot;Programming Error&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_testing"/>
@@ -94,7 +88,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="2.0" name="duration"/>
-        <field name="categ_id" ref="bug_categ"/>
         <field name="project_id" ref="project.project_project_9"/>
         <field eval="&quot;Logical Error in Program&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_testing"/>
@@ -108,7 +101,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="7.3" name="duration"/>
-        <field name="categ_id" ref="bug_categ"/>
         <field name="project_id" ref="project.project_project_9"/>
         <field eval="&quot;Constraint Error&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_testing"/>
@@ -121,7 +113,6 @@
         <field name="partner_id" ref="base.res_partner_5"/>
         <field eval="1" name="active"/>
         <field eval="1.3" name="duration"/>
-        <field name="categ_id" ref="feature_request_categ"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="&quot;Error in Program&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_testing"/>
@@ -135,7 +126,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="13.0" name="duration"/>
-        <field name="categ_id" ref="feature_request_categ"/>
         <field name="project_id" ref="project.project_project_9"/>
         <field eval="&quot;Patches Error in Program&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_testing"/>
@@ -149,7 +139,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="3.2" name="duration"/>
-        <field name="categ_id" ref="feature_request_categ"/>
         <field name="project_id" ref="project.project_project_21"/>
         <field eval="&quot;New Features To Be Added&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_merge"/>
@@ -163,11 +152,10 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="3.0" name="duration"/>
-        <field name="categ_id" ref="feature_request_categ"/>
         <field name="project_id" ref="project.project_project_21"/>
         <field eval="&quot;Add menus to the module&quot;" name="name"/>
         <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-        <field name="stage_id" ref="project.project_tt_development"/> 
+        <field name="stage_id" ref="project.project_tt_development"/>
     </record>
 
     <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
@@ -178,7 +166,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="2.0" name="duration"/>
-        <field name="categ_id" ref="feature_request_categ"/>
         <field name="project_id" ref="project.project_project_9"/>
         <field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
         <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -193,7 +180,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="2.45" name="duration"/>
-        <field name="categ_id" ref="feature_request_categ"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="&quot;Create new object&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_specification"/>
@@ -207,7 +193,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="15.0" name="duration"/>
-        <field name="categ_id" ref="feature_request_categ"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_development"/>
@@ -221,7 +206,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="06.15" name="duration"/>
-        <field name="categ_id" ref="feature_request_categ"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_specification"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 860a1153fce..eeed1fb3821 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -126,9 +126,10 @@
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                        </group><group>
+                        </group>
+                        <group>
                             <field name="task_id" on_change="onchange_task_id(task_id)"/>
-                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                            <field name="categ_ids" widget="many2many_tags"/>
                             <field name="version_id" widget="selection"/>
                             <field name="priority"/>
                             <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
@@ -181,7 +182,7 @@
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
                     <field name="state" groups="base.group_no_one"/>
-                    <field name="categ_id" invisible="1"/>
+                    <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
             </field>
@@ -223,7 +224,7 @@
                             domain="[]" context="{'group_by':'version_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
-                            context="{'group_by':'categ_id'}"/>
+                            context="{'group_by':'categ_ids'}"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
                             context="{'group_by':'priority'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]"
@@ -269,7 +270,7 @@
                         <t t-name="kanban-tooltip">
                            <ul class="oe_kanban_tooltip">
                               <li><b>Project:</b> <field name="project_id"/></li>
-                              <li><b>Category:</b> <field name="categ_id"/></li>
+                              <li><b>Category:</b> <field name="categ_ids"/></li>
                            </ul>
                         </t>
                         <t t-name="kanban-box">
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index be3309d7175..df874e7aee7 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -50,7 +50,7 @@ class project_issue_report(osv.osv):
         'opening_date': fields.date('Date of Opening', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
         'date_closed': fields.date('Date of Closing', readonly=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
+        'categ_ids': fields.many2many('project.category', 'project_issue_categ_rel', 'project_issue_id', 'project_category_id', 'Categories'),
         'stage_id': fields.many2one('project.task.type', 'Stage'),
         'nbr': fields.integer('# of Issues', readonly=True),
         'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True),
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 862f52b1931..c891b7ea624 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -17,10 +17,10 @@
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="categ_id" invisible="1"/>
+                    <field name="categ_ids" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="task_id" invisible="1"/>                    
+                    <field name="task_id" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>

From 3a649f70256749983d7579160509a59d524ddc1c Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 11 Jul 2012 16:43:04 +0200
Subject: [PATCH 048/312] [FIX] can't handle many2many relation in reports

bzr revid: abo@openerp.com-20120711144304-a6ab47s9nmz6yj2l
---
 addons/project_issue/project_issue.py               | 2 +-
 addons/project_issue/report/project_issue_report.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ff98ef29cc4..9c8abe41216 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -236,7 +236,7 @@ class project_issue(base_stage, osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True,select=True),
         'date': fields.datetime('Date'),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
-        'categ_ids': fields.many2many('project.category', 'project_issue_categ_rel', 'project_issue_id', 'project_category_id', 'Categories'),
+        'categ_ids': fields.many2many('project.category', string='Categories'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index df874e7aee7..f42dc458b16 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -50,7 +50,6 @@ class project_issue_report(osv.osv):
         'opening_date': fields.date('Date of Opening', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
         'date_closed': fields.date('Date of Closing', readonly=True),
-        'categ_ids': fields.many2many('project.category', 'project_issue_categ_rel', 'project_issue_id', 'project_category_id', 'Categories'),
         'stage_id': fields.many2one('project.task.type', 'Stage'),
         'nbr': fields.integer('# of Issues', readonly=True),
         'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True),
@@ -86,7 +85,6 @@ class project_issue_report(osv.osv):
                     c.working_hours_open,
                     c.working_hours_close,
                     c.section_id,
-                    c.categ_id,
                     c.stage_id,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
                     c.company_id as company_id,
@@ -104,7 +102,7 @@ class project_issue_report(osv.osv):
 
                 FROM
                     project_issue c
-                WHERE c.active= 'true' and c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
+                WHERE c.active= 'true'
             )""")
 
 project_issue_report()

From ae109b6fc8c380cd3442a5f57622322802a0de4e Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 11 Jul 2012 17:13:22 +0200
Subject: [PATCH 049/312] [FIX] project issue's report view

bzr revid: abo@openerp.com-20120711151322-km011c1fqkm6im5a
---
 .../report/project_issue_report_view.xml            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index c891b7ea624..d01acd6f558 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -17,19 +17,18 @@
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="categ_ids" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
-                    <field name="nbr" string="#Project Issues" sum='#Number of Project Issues'/>
-                    <field name="delay_open" avg='Avg Opening Delay'/>
-                    <field name="delay_close" avg='Avg Closing Delay'/>
-                    <field name="working_hours_open" avg='Open Working Hours'/>
-                    <field name="working_hours_close" avg='Close Working hours'/>
-                    <field name="email" sum='# Emails'/>
+                    <field name="nbr" string="#Project Issues" sum="#Number of Project Issues"/>
+                    <field name="delay_open" avg="Avg Opening Delay"/>
+                    <field name="delay_close" avg="Avg Closing Delay"/>
+                    <field name="working_hours_open" avg="Open Working Hours"/>
+                    <field name="working_hours_close" avg="Close Working hours"/>
+                    <field name="email" sum="# Emails"/>
                   </tree>
             </field>
         </record>

From 43fb6b3ee39999fd55a045a961372691b8926e58 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 11 Jul 2012 17:25:58 +0200
Subject: [PATCH 050/312] [CHG] require that Widget#attributes be an object if
 present, not a function

bzr revid: xmo@openerp.com-20120711152558-9jm096g7mowgfvf5
---
 addons/web/static/src/js/corelib.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 73fa6839607..d71ff91247d 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -711,10 +711,10 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
             $el = $(_.str.trim(instance.web.qweb.render(
                 this.template, {widget: this})));
         } else {
-            var attrs = _.extend({}, getValue(this, 'attributes') || {});
+            var attrs = _.extend({}, this.attributes || {});
             if (this.id) { attrs.id = this.id; }
             if (this.className) { attrs['class'] = this.className; }
-            $el = $(this.make(this.tagName, attrs))
+            $el = $(this.make(this.tagName, attrs));
         }
         var $oldel = this.$el;
         this.setElement($el);

From d47a272822e4c5cd9ed1ea5d85d4d1ecdbd0c913 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 11 Jul 2012 18:40:02 +0200
Subject: [PATCH 051/312] [IMP] properly display categories in portal's issues
 view since the many2many_tags widget doesn't work in kanban views, this is
 achieved by a bit Javascript - cf. portal_project_issue.js

bzr revid: abo@openerp.com-20120711164002-y37dn0mjufbgy7lz
---
 addons/portal_project_issue/__openerp__.py    |  3 ++
 .../portal_project_issue_view.xml             |  7 +++--
 .../static/src/css/portal_project_issue.css   | 19 ++++++++++++
 .../static/src/js/portal_project_issue.js     | 31 +++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 addons/portal_project_issue/static/src/js/portal_project_issue.js

diff --git a/addons/portal_project_issue/__openerp__.py b/addons/portal_project_issue/__openerp__.py
index 17ba4b0d5aa..46af01b9a6d 100644
--- a/addons/portal_project_issue/__openerp__.py
+++ b/addons/portal_project_issue/__openerp__.py
@@ -42,5 +42,8 @@ portal are installed.
     'css': [
         'static/src/css/portal_project_issue.css',
     ],
+    'js': [
+        'static/src/js/portal_project_issue.js',
+    ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index f1f557889f1..20c581881a6 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -25,9 +25,10 @@
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <div class="oe_left">
-                                            <!-- <field name="categ_ids" widget="many2many_tags"/> -->
-                                            <t t-raw="record.categ_ids.raw_value"/>
-                                        </div>
+                                            <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
+                                                <span class="oe_form_field_many2manytags_box" t-att-data-categ_id="categ_id"></span>
+                                            </t
+>                                        </div>
                                         <div class="oe_right">
                                             Creation: <field name="create_date"/>
                                             <span class="oe_kanban_highlight">
diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/portal_project_issue/static/src/css/portal_project_issue.css
index d59b281d094..cfc871748d8 100644
--- a/addons/portal_project_issue/static/src/css/portal_project_issue.css
+++ b/addons/portal_project_issue/static/src/css/portal_project_issue.css
@@ -30,3 +30,22 @@
 .oe_portal_project_issue .oe_fold_column.oe_kanban_record .oe_kanban_footer_left {
     height: 24px;
 }
+
+/* many2many tags */
+.oe_portal_project_issue * span.oe_form_field_many2manytags_box {
+    display: none; /* display it only after the names have been set - cf. portal_project_issue.js */
+    border-radius: 2px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    position: relative;
+    float: left;
+    border: 1px solid #9DACCC;
+    background: #E2E6F0;
+    color: black;
+    padding: 0px 3px 0px 3px;
+    margin: 0 2px 2px 0;
+    height: 16px;
+    font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
+}
diff --git a/addons/portal_project_issue/static/src/js/portal_project_issue.js b/addons/portal_project_issue/static/src/js/portal_project_issue.js
new file mode 100644
index 00000000000..edd0d04532a
--- /dev/null
+++ b/addons/portal_project_issue/static/src/js/portal_project_issue.js
@@ -0,0 +1,31 @@
+openerp.portal_project_issue = function(openerp) {
+    openerp.web_kanban.KanbanView.include({
+        on_groups_started: function() {
+            var self = this;
+            self._super.apply(this, arguments);
+
+            if (this.dataset.model === 'project.issue' || this.dataset.model === 'project.task') {
+                /*
+                 * Set proper names to project categories.
+                 * In kanban views, many2many fields only return a list of ids.
+                 * Therefore, we have to fetch the matching data by ourselves.
+                 */
+                var categ_ids = [];
+
+                // Collect categories ids
+                this.$element.find('.oe_form_field_many2manytags_box').each(function() {
+                    categ_ids.push($(this).data('categ_id'));
+                });
+
+                // Find their matching names
+                var dataset = new openerp.web.DataSetSearch(this, 'project.category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
+                dataset.read_slice(['id', 'name']).then(function(result) {
+                    _.each(result, function(v, k) {
+                        // Set the proper value in the DOM and display the element
+                        self.$element.find('.oe_form_field_many2manytags_box[data-categ_id=' + v.id + ']').text(v.name).toggle();
+                    });
+                });
+            }
+        }
+    });
+};

From 4af50da7dc0e75222ae3fd94ef7c2ac58d5a9c00 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 13:33:26 +0200
Subject: [PATCH 052/312] [IMP] refactor the handling of many2many tags in
 issues and tasks kanban views

bzr revid: abo@openerp.com-20120712113326-a0p30oij7g67gmtj
---
 addons/portal_project_issue/__openerp__.py    |  3 -
 .../portal_project_issue_view.xml             |  4 +-
 .../static/src/js/portal_project_issue.js     | 31 --------
 addons/project/static/src/js/project.js       | 70 ++++++++++++++-----
 addons/project_issue/__openerp__.py           |  5 +-
 .../static/src/js/project_issue.js            | 13 ++++
 6 files changed, 72 insertions(+), 54 deletions(-)
 delete mode 100644 addons/portal_project_issue/static/src/js/portal_project_issue.js
 create mode 100644 addons/project_issue/static/src/js/project_issue.js

diff --git a/addons/portal_project_issue/__openerp__.py b/addons/portal_project_issue/__openerp__.py
index 46af01b9a6d..17ba4b0d5aa 100644
--- a/addons/portal_project_issue/__openerp__.py
+++ b/addons/portal_project_issue/__openerp__.py
@@ -42,8 +42,5 @@ portal are installed.
     'css': [
         'static/src/css/portal_project_issue.css',
     ],
-    'js': [
-        'static/src/js/portal_project_issue.js',
-    ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 20c581881a6..97a5c9d2b2f 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -27,8 +27,8 @@
                                         <div class="oe_left">
                                             <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
                                                 <span class="oe_form_field_many2manytags_box" t-att-data-categ_id="categ_id"></span>
-                                            </t
->                                        </div>
+                                            </t>
+                                        </div>
                                         <div class="oe_right">
                                             Creation: <field name="create_date"/>
                                             <span class="oe_kanban_highlight">
diff --git a/addons/portal_project_issue/static/src/js/portal_project_issue.js b/addons/portal_project_issue/static/src/js/portal_project_issue.js
deleted file mode 100644
index edd0d04532a..00000000000
--- a/addons/portal_project_issue/static/src/js/portal_project_issue.js
+++ /dev/null
@@ -1,31 +0,0 @@
-openerp.portal_project_issue = function(openerp) {
-    openerp.web_kanban.KanbanView.include({
-        on_groups_started: function() {
-            var self = this;
-            self._super.apply(this, arguments);
-
-            if (this.dataset.model === 'project.issue' || this.dataset.model === 'project.task') {
-                /*
-                 * Set proper names to project categories.
-                 * In kanban views, many2many fields only return a list of ids.
-                 * Therefore, we have to fetch the matching data by ourselves.
-                 */
-                var categ_ids = [];
-
-                // Collect categories ids
-                this.$element.find('.oe_form_field_many2manytags_box').each(function() {
-                    categ_ids.push($(this).data('categ_id'));
-                });
-
-                // Find their matching names
-                var dataset = new openerp.web.DataSetSearch(this, 'project.category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
-                dataset.read_slice(['id', 'name']).then(function(result) {
-                    _.each(result, function(v, k) {
-                        // Set the proper value in the DOM and display the element
-                        self.$element.find('.oe_form_field_many2manytags_box[data-categ_id=' + v.id + ']').text(v.name).toggle();
-                    });
-                });
-            }
-        }
-    });
-};
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 510fcbb99e7..978d3012b26 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -1,25 +1,61 @@
 openerp.project = function(openerp) {
     openerp.web_kanban.KanbanView.include({
-        on_groups_started: function() {
+        project_display_members_names: function() {
+            /*
+             * Set avatar title for members.
+             * In kanban views, many2many fields only return a list of ids.
+             * We can implement return value of m2m fields like [(1,"Adminstration"),...].
+             */
             var self = this;
-            self._super.apply(this, arguments);
-            if (this.dataset.model === 'project.project') {
-                /* Set avatar title for members.
-                   In many2many fields, returns only list of ids.
-                   we can implement return value of m2m fields like [(1,"Adminstration"),...].
-                */
-                var members_ids = [];
-                this.$element.find('.oe_kanban_project_avatars img').each(function() {
-                    members_ids.push($(this).data('member_id'));
-                });
-                var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]);
-                dataset.read_slice(['id', 'name']).then(function(result) {
-                    _.each(result, function(v, k) {
-                        self.$element.find('.oe_kanban_project_avatars img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
-                            offset: 10
-                        });
+            var members_ids = [];
+
+            // Collect members ids
+            self.$element.find('.oe_kanban_project_avatars img').each(function() {
+                members_ids.push($(this).data('member_id'));
+            });
+
+            // Find their matching names
+            var dataset = new openerp.web.DataSetSearch(self, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]);
+            dataset.read_slice(['id', 'name']).then(function(result) {
+                _.each(result, function(v, k) {
+                    // Set the proper value in the DOM
+                    self.$element.find('.oe_kanban_project_avatars img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
+                        offset: 10
                     });
                 });
+            });
+        },
+        project_display_categ_names: function() {
+            /*
+             * Set proper names to project categories.
+             * In kanban views, many2many fields only return a list of ids.
+             * Therefore, we have to fetch the matching data by ourselves.
+             */
+            var self = this;
+            var categ_ids = [];
+
+            // Collect categories ids
+            self.$element.find('.oe_form_field_many2manytags_box').each(function() {
+                categ_ids.push($(this).data('categ_id'));
+            });
+
+            // Find their matching names
+            var dataset = new openerp.web.DataSetSearch(self, 'project.category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
+            dataset.read_slice(['id', 'name']).then(function(result) {
+                _.each(result, function(v, k) {
+                    // Set the proper value in the DOM and display the element
+                    self.$element.find('.oe_form_field_many2manytags_box[data-categ_id=' + v.id + ']').text(v.name).toggle();
+                });
+            });
+        },
+        on_groups_started: function() {
+            var self = this;
+            self._super.apply(self, arguments);
+
+            if (self.dataset.model === 'project.project') {
+                self.project_display_members_names();
+            } else if (self.dataset.model === 'project.task') {
+                self.project_display_categ_names();
             }
         }
     });
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 9037523d41e..6ea94b58c66 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -38,7 +38,7 @@ and decide on their status as they evolve.
     'website': 'http://www.openerp.com',
     'images': ['images/issue_analysis.jpeg','images/project_issue.jpeg'],
     'depends': [
-        'base_status', 
+        'base_status',
         'crm',
         'project',
     ],
@@ -65,6 +65,9 @@ and decide on their status as they evolve.
     'auto_install': False,
     'application': True,
     'certificate' : '001236490750848623845',
+    'js': [
+        'static/src/js/project_issue.js',
+    ],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/static/src/js/project_issue.js b/addons/project_issue/static/src/js/project_issue.js
new file mode 100644
index 00000000000..24e5ff7cc49
--- /dev/null
+++ b/addons/project_issue/static/src/js/project_issue.js
@@ -0,0 +1,13 @@
+openerp.portal_project_issue = function(openerp) {
+    openerp.web_kanban.KanbanView.include({
+        on_groups_started: function() {
+            var self = this;
+            self._super.apply(this, arguments);
+
+            if (self.dataset.model === 'project.issue') {
+                // Load project's categories names from m2m field
+                self.project_display_categ_names();
+            }
+        }
+    });
+};

From 14a03e0d5eda36f02a49dc204dfc700223c4852d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 14:38:40 +0200
Subject: [PATCH 053/312] [IMP] make project_display_members_names() and
 project_display_categ_names() CSS agnostic instead of finding DOM elements by
 element type *and* CSS class (with long and tending to change names), these
 functions will only use element type (here <img> and <span>) and data
 attribute (which is used in the function anyway)

bzr revid: abo@openerp.com-20120712123840-m8kuupefggmgl5v4
---
 addons/project/static/src/js/project.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 978d3012b26..0712026799b 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -10,7 +10,7 @@ openerp.project = function(openerp) {
             var members_ids = [];
 
             // Collect members ids
-            self.$element.find('.oe_kanban_project_avatars img').each(function() {
+            self.$element.find('img[data-member_id]').each(function() {
                 members_ids.push($(this).data('member_id'));
             });
 
@@ -19,7 +19,7 @@ openerp.project = function(openerp) {
             dataset.read_slice(['id', 'name']).then(function(result) {
                 _.each(result, function(v, k) {
                     // Set the proper value in the DOM
-                    self.$element.find('.oe_kanban_project_avatars img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
+                    self.$element.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
                         offset: 10
                     });
                 });
@@ -35,7 +35,7 @@ openerp.project = function(openerp) {
             var categ_ids = [];
 
             // Collect categories ids
-            self.$element.find('.oe_form_field_many2manytags_box').each(function() {
+            self.$element.find('span[data-categ_id]').each(function() {
                 categ_ids.push($(this).data('categ_id'));
             });
 
@@ -44,7 +44,7 @@ openerp.project = function(openerp) {
             dataset.read_slice(['id', 'name']).then(function(result) {
                 _.each(result, function(v, k) {
                     // Set the proper value in the DOM and display the element
-                    self.$element.find('.oe_form_field_many2manytags_box[data-categ_id=' + v.id + ']').text(v.name).toggle();
+                    self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name).toggle();
                 });
             });
         },

From 00a65e017202ebb8df5641398f65d86c498ff4f0 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 15:10:02 +0200
Subject: [PATCH 054/312] [IMP] many2many tags CSS classes have been properly
 namespaced (cf. this branc:
 ~openerp-dev/openerp-web/trunk-m2m_tags_namespacing_imp-abo): adapt views
 accordingly also skip the little toggle() trick - it's kinda overkill

bzr revid: abo@openerp.com-20120712131002-lj085r2moshptbts
---
 .../portal_project_issue_view.xml             |  4 ++--
 .../static/src/css/portal_project_issue.css   | 23 -------------------
 addons/project/static/src/js/project.js       |  2 +-
 addons/project_issue/project_issue_view.xml   | 17 +++++++++-----
 4 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 97a5c9d2b2f..9bfdbe1524a 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -24,9 +24,9 @@
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <div class="oe_left">
+                                        <div class="oe_left oe_field_many2many_tags">
                                             <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                                <span class="oe_form_field_many2manytags_box" t-att-data-categ_id="categ_id"></span>
+                                                <span class="oe_field_many2many_tag" t-att-data-categ_id="categ_id"></span>
                                             </t>
                                         </div>
                                         <div class="oe_right">
diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/portal_project_issue/static/src/css/portal_project_issue.css
index cfc871748d8..3ad30208d6d 100644
--- a/addons/portal_project_issue/static/src/css/portal_project_issue.css
+++ b/addons/portal_project_issue/static/src/css/portal_project_issue.css
@@ -26,26 +26,3 @@
     font-size: 1.2em;
     font-weight: bold;
 }
-
-.oe_portal_project_issue .oe_fold_column.oe_kanban_record .oe_kanban_footer_left {
-    height: 24px;
-}
-
-/* many2many tags */
-.oe_portal_project_issue * span.oe_form_field_many2manytags_box {
-    display: none; /* display it only after the names have been set - cf. portal_project_issue.js */
-    border-radius: 2px;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    position: relative;
-    float: left;
-    border: 1px solid #9DACCC;
-    background: #E2E6F0;
-    color: black;
-    padding: 0px 3px 0px 3px;
-    margin: 0 2px 2px 0;
-    height: 16px;
-    font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
-}
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 0712026799b..c8250edcafd 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -44,7 +44,7 @@ openerp.project = function(openerp) {
             dataset.read_slice(['id', 'name']).then(function(result) {
                 _.each(result, function(v, k) {
                     // Set the proper value in the DOM and display the element
-                    self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name).toggle();
+                    self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name);
                 });
             });
         },
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index eeed1fb3821..91bbb5084a1 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -16,9 +16,9 @@
         <record id="action_project_issue_unread" model="ir.values">
             <field name="name">action_project_issue_unread</field>
             <field name="action_id" ref="actions_server_project_issue_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_unread'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_unread'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_project_issue" />
+            <field name="model_id" ref="model_project_issue"/>
             <field name="model">project.issue</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -34,9 +34,9 @@
         <record id="action_project_issue_read" model="ir.values">
             <field name="name">action_project_issue_read</field>
             <field name="action_id" ref="actions_server_project_issue_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_read'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_read'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_project_issue" />
+            <field name="model_id" ref="model_project_issue"/>
             <field name="model">project.issue</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -204,7 +204,7 @@
                         <separator orientation="vertical"/>
                         <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
-                        <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
+                        <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="project_id"/>
@@ -290,6 +290,11 @@
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
+                                        <div class="oe_left oe_field_many2many_tags">
+                                            <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
+                                                <span class="oe_field_many2many_tag" t-att-data-categ_id="categ_id"></span>
+                                            </t>
+                                        </div>
                                         <div class="oe_right">
                                             <span class="oe_kanban_highlight">
                                                 <t t-set="priority" t-value="record.priority.raw_value || 5"/>
@@ -427,7 +432,7 @@
                     <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
                 </xpath>
                 <xpath expr='//separator[@name="project_sep"]' position='after'>
-                    <field name="use_issues" />
+                    <field name="use_issues"/>
                 </xpath>
             </field>
         </record>

From 0b57f6bae06d53a0cd7dd752c0c0e5695e1ff2af Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 15:35:22 +0200
Subject: [PATCH 055/312] [IMP] adapt tags CSS class names (cf. this branc:
 ~openerp-dev/openerp-web/trunk-m2m_tags_namespacing_imp-abo)

bzr revid: abo@openerp.com-20120712133522-w0og1j6ytduc21if
---
 addons/portal_project_issue/portal_project_issue_view.xml | 4 ++--
 addons/project_issue/project_issue_view.xml               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 9bfdbe1524a..54e7038ed8d 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -24,9 +24,9 @@
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <div class="oe_left oe_field_many2many_tags">
+                                        <div class="oe_left oe_tags">
                                             <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                                <span class="oe_field_many2many_tag" t-att-data-categ_id="categ_id"></span>
+                                                <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
                                             </t>
                                         </div>
                                         <div class="oe_right">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 91bbb5084a1..ba1d28c3e78 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -290,9 +290,9 @@
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <div class="oe_left oe_field_many2many_tags">
+                                        <div class="oe_left oe_tags">
                                             <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                                <span class="oe_field_many2many_tag" t-att-data-categ_id="categ_id"></span>
+                                                <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
                                             </t>
                                         </div>
                                         <div class="oe_right">

From 5e622426947df66786e177ba9beaf3eaba02a977 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 16:32:02 +0200
Subject: [PATCH 056/312] [IMP] add categories to tasks

bzr revid: abo@openerp.com-20120712143202-rdfqlv50qswwukqd
---
 addons/project/project.py       |  1 +
 addons/project/project_data.xml |  1 +
 addons/project/project_view.xml | 21 +++++++++++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 2a4bdfa2a73..d0b77079772 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -700,6 +700,7 @@ class task(base_stage, osv.osv):
                       When the case is over, the state is set to \'Done\'.\
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
+        'categ_ids': fields.many2many('project.category', string='Categories'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
                                          help="A task's kanban state indicates special situations affecting it:\n"
                                               " * Normal is the default situation\n"
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 4c95373d91f..68ab9d768e0 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -59,5 +59,6 @@
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 53a56735ec8..99f501ad2a6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -11,7 +11,7 @@
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-        
+
         <act_window
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
             id="act_project_project_2_project_task_all"
@@ -161,7 +161,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
-                       <field name="complete_name" string="Project Name"/> 
+                       <field name="complete_name" string="Project Name"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-mail-message-new"
                            string="Inbox" help="Unread messages"
@@ -405,7 +405,7 @@
                             -->
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                     states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
-                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
+                            <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                     states="cancelled" context="{'button_reactivate':True}"/>
                             <button name="action_close" string="Done" type="object"
                                     states="draft,open,pending"/>
@@ -445,6 +445,9 @@
                                 groups="project.group_time_work_estimation_tasks"
                                 invisible="1"/>
                         </group>
+                        <group>
+                            <field name="categ_ids" widget="many2many_tags"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Description">
@@ -522,6 +525,7 @@
                     <field name="date_deadline"/>
                     <field name="message_summary"/>
                     <field name="needaction_pending"/>
+                    <field name="categ_ids"/>
                     <templates>
                     <t t-name="kanban-box">
                         <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
@@ -554,13 +558,18 @@
                                                     ,[5, (hours gte 5 and hours lt 10)]
                                                     ,[10, (hours gte 10)]
                                                 ]"/>
-                                                <t t-foreach="times" t-as="time"><a 
+                                                <t t-foreach="times" t-as="time"><a
                                                     t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}" type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a><b
                                                     t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b></t>
                                                 <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
                                     </span>
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
+                                    <div class="oe_left oe_tags">
+                                        <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
+                                            <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
+                                        </t>
+                                    </div>
                                     <div class="oe_right">
                                         <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a>
                                         <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
@@ -661,7 +670,7 @@
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
                         <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" 
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
                             help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="project_id"/>
@@ -684,7 +693,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="analytic_account_inherited_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form.inherit</field>
             <field name="model">account.analytic.account</field>

From 99e88da06dc20d3b83d0ec634991bd194307d7b0 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 17:43:36 +0200
Subject: [PATCH 057/312] [FIX] remove dead code

bzr revid: abo@openerp.com-20120712154336-u45rxpicpijvpo87
---
 addons/project_issue/project_issue.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 9c8abe41216..a1b27d97c13 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -350,23 +350,6 @@ class project_issue(base_stage, osv.osv):
             'nodestroy': True
         }
 
-
-    # def _convert(self, cr, uid, ids, xml_id, context=None):
-    #     data_obj = self.pool.get('ir.model.data')
-    #     id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
-    #     categ_id = False
-    #     if id2:
-    #         categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
-    #     if categ_id:
-    #         self.write(cr, uid, ids, {'categ_id': categ_id})
-    #     return True
-
-    # def convert_to_feature(self, cr, uid, ids, context=None):
-    #     return self._convert(cr, uid, ids, 'feature_request_categ', context=context)
-
-    # def convert_to_bug(self, cr, uid, ids, context=None):
-    #     return self._convert(cr, uid, ids, 'bug_categ', context=context)
-
     def copy(self, cr, uid, id, default=None, context=None):
         issue = self.read(cr, uid, id, ['name'], context=context)
         if not default:

From 3a75505023850630d20b1138f3cc5d48962eb6d4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 18:14:23 +0200
Subject: [PATCH 058/312] [IMP] add demo data for tasks and issues categories

bzr revid: abo@openerp.com-20120712161423-hn6rywd6ysfl21ek
---
 addons/project/project_demo.xml             | 71 +++++++++++----------
 addons/project_issue/project_issue_demo.xml | 20 ++++++
 2 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 07951280dc7..0916fc5890f 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -56,20 +56,33 @@
             <field name="state">open</field>
             <field name="type">normal</field>
             <field name="description">Integrate a Sale and Warehouse Management.</field>
-            <field eval="[(6, 0, [
+            <field name="members" eval="[(6, 0, [
                     ref('base.user_niv'),
                     ref('base.user_al'),
                     ref('base.user_qdp'),
                     ref('base.user_fpi'),
                     ref('base.user_jth'),
                     ref('base.user_mit'),
-                    ref('base.user_vad')])]" name="members"/>
+                    ref('base.user_vad')])]"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="name">Integrate a Sale and Warehouse Management.</field>
         </record>
 
-        <!-- Tasks -->
+        <!-- Categories -->
+        <record id="project_category_01" model="project.category">
+            <field name="name">Partner's suggestion</field>
+        </record>
+        <record id="project_category_02" model="project.category">
+            <field name="name">Feature request</field>
+        </record>
+        <record id="project_category_03" model="project.category">
+            <field name="name">Experiment</field>
+        </record>
+        <record id="project_category_04" model="project.category">
+            <field name="name">Usability</field>
+        </record>
 
+        <!-- Tasks -->
         <record id="project_task_1" model="project.task">
             <field eval="100.0" name="planned_hours"/>
             <field eval="100.0" name="remaining_hours"/>
@@ -79,8 +92,9 @@
             <field name="name">Prepare Requirements Document</field>
             <field name="stage_id" ref="project_tt_specification"/>
             <field name="color">3</field>
+            <field name="categ_ids" eval="[(6, 0, [
+                    ref('project.project_category_02')])]"/>
         </record>
-
         <record id="project_task_2" model="project.task">
             <field eval="80.0" name="planned_hours"/>
             <field eval="80.0" name="remaining_hours"/>
@@ -90,7 +104,6 @@
             <field name="name">Make SRS</field>
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
-
         <record id="project_task_3" model="project.task">
             <field eval="40.0" name="planned_hours"/>
             <field eval="40.0" name="remaining_hours"/>
@@ -100,8 +113,11 @@
             <field name="name">Design Use Cases</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
             <field name="stage_id" ref="project_tt_specification"/>
+            <field name="color">4</field>
+            <field name="categ_ids" eval="[(6, 0, [
+                    ref('project_category_02'),
+                    ref('project_category_04')])]"/>
         </record>
-
         <record id="project_task_4" model="project.task">
             <field eval="25.0" name="planned_hours"/>
             <field eval="25.0" name="remaining_hours"/>
@@ -114,7 +130,6 @@
             <field name="color">3</field>
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
-
         <record id="project_task_5" model="project.task">
             <field eval="25.0" name="planned_hours"/>
             <field eval="25.0" name="remaining_hours"/>
@@ -127,7 +142,6 @@
             <field name="date_deadline" eval="time.strftime('%Y-%m-%d')"/>
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
-
         <record id="project_task_6" model="project.task">
             <field eval="20.0" name="planned_hours"/>
             <field eval="20.0" name="remaining_hours"/>
@@ -137,7 +151,6 @@
             <field name="name">Risk Management Planning</field>
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
-
         <record id="project_task_7" model="project.task">
             <field eval="30.0" name="planned_hours"/>
             <field eval="30.0" name="remaining_hours"/>
@@ -147,7 +160,6 @@
             <field name="name">Create Project Schedules</field>
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
-
         <record id="project_task_8" model="project.task">
             <field eval="10.0" name="planned_hours"/>
             <field eval="10.0" name="remaining_hours"/>
@@ -157,8 +169,9 @@
             <field name="name">Dataflow Design</field>
             <field name="priority">0</field>
             <field name="stage_id" ref="project_tt_specification"/>
+            <field name="categ_ids" eval="[(6, 0, [
+                    ref('project.project_category_01')])]"/>
         </record>
-
         <record id="project_task_9" model="project.task">
             <field eval="50.0" name="planned_hours"/>
             <field eval="50.0" name="remaining_hours"/>
@@ -168,7 +181,6 @@
             <field name="name">User Interface Design</field>
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
-
         <record id="project_task_10" model="project.task">
             <field eval="40.0" name="planned_hours"/>
             <field eval="40.0" name="remaining_hours"/>
@@ -179,7 +191,6 @@
             <field name="kanban_state">blocked</field>
             <field name="stage_id" ref="project_tt_development"/>
         </record>
-
         <record id="project_task_11" model="project.task">
             <field eval="90.0" name="planned_hours"/>
             <field eval="90.0" name="remaining_hours"/>
@@ -189,9 +200,8 @@
             <field name="name">Develop module in Warehouse</field>
             <field name="stage_id" ref="project_tt_merge"/>
         </record>
-
         <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/>
-        
+
         <record id="project_task_12" model="project.task">
             <field eval="20.0" name="planned_hours"/>
             <field eval="20.0" name="remaining_hours"/>
@@ -200,10 +210,13 @@
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Integrate Modules</field>
             <field name="stage_id" ref="project_tt_development"/>
+            <field name="color">7</field>
+            <field name="categ_ids" eval="[(6, 0, [
+                    ref('project_category_01'),
+                    ref('project_category_03')])]"/>
         </record>
-
         <function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/>
-        
+
         <record id="project_task_13" model="project.task">
             <field eval="50.0" name="planned_hours"/>
             <field eval="50.0" name="remaining_hours"/>
@@ -213,7 +226,6 @@
             <field name="name">Unit Testing</field>
             <field name="stage_id" ref="project_tt_development"/>
         </record>
-
         <function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/>
 
         <record id="project_task_14" model="project.task">
@@ -223,9 +235,8 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Regression Test</field>
-            <field name="stage_id" ref="project_tt_development"/> 
+            <field name="stage_id" ref="project_tt_development"/>
         </record>
-
         <record id="project_task_15" model="project.task">
             <field eval="15.0" name="planned_hours"/>
             <field eval="15.0" name="remaining_hours"/>
@@ -236,7 +247,6 @@
             <field name="stage_id" ref="project_tt_specification"/>
             <field name="date_start">2011-02-06</field>
         </record>
-
         <record id="project_task_16" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="40.0" name="planned_hours"/>
@@ -271,19 +281,10 @@
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
 
-        <!--
-    Resource: project.project
-    -->
+        <!-- Projects -->
         <record id="base.main_company" model="res.company">
             <field name="project_time_mode_id" ref="product.uom_hour"></field>
         </record>
-        <!-- Projects -->
-
-        <!-- <record id="all_projects_account" model="project.project">
-            <field name="name">Projects</field>
-            <field name="code">3</field>
-        </record> -->
-        
 
         <record id="project_project_9" model="project.project">
             <field name="name">OpenERP Integration</field>
@@ -326,7 +327,7 @@
             <field name="name">Specific adaptation to MRP</field>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_116')], {'install_mode': True}"/>
-       
+
         <record id="project_task_130" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
@@ -346,7 +347,7 @@
             <field name="name">Modifications asked by the customer.</field>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_131')], {'install_mode': True}"/>
-        
+
         <record id="project_task_184" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
@@ -378,7 +379,7 @@
             <field name="name">Analysis, Data Importation</field>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_188')], {'install_mode': True}"/>
-        
+
         <record id="project_task_189" model="project.task">
             <field name="sequence">20</field>
             <field name="planned_hours">16.0</field>
@@ -389,7 +390,7 @@
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
         <function model="project.task" name="do_open" eval="[ref('project_task_189')], {'install_mode': True}"/>
-        
+
         <record id="project_task_190" model="project.task">
             <field name="sequence">20</field>
             <field name="planned_hours">32.0</field>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 2cda2e189e8..db4af16af24 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -2,6 +2,18 @@
 <openerp>
 <data noupdate="1">
 
+    <!-- Categories -->
+    <record id="project_issue_category_01" model="project.category">
+        <field name="name">Little problem</field>
+    </record>
+    <record id="project_issue_category_02" model="project.category">
+        <field name="name">PBCK</field>
+    </record>
+    <record id="project_issue_category_03" model="project.category">
+        <field name="name">Deadly bug</field>
+    </record>
+
+    <!-- Issues -->
     <record id="crm_case_buginaccountsmodule0" model="project.issue">
         <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
         <field eval="&quot;5&quot;" name="priority"/>
@@ -14,6 +26,8 @@
         <field eval="&quot;Bug in Accounts module&quot;" name="name"/>
         <field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
         <field name="stage_id" ref="project.project_tt_specification"/>
+        <field name="categ_ids" eval="[(6, 0, [
+                ref('project_issue_category_01')])]"/>
     </record>
 
     <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
@@ -39,6 +53,9 @@
         <field name="project_id" ref="project.project_project_23"/>
         <field eval="&quot;Output incorrect&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_development"/>
+        <field name="categ_ids" eval="[(6, 0, [
+                ref('project_issue_category_01'),
+                ref('project_issue_category_02')])]"/>
     </record>
 
     <record id="crm_case_problemloadingpage0" model="project.issue">
@@ -78,6 +95,9 @@
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="&quot;Programming Error&quot;" name="name"/>
         <field name="stage_id" ref="project.project_tt_testing"/>
+        <field name="categ_ids" eval="[(6, 0, [
+                ref('project_issue_category_02'),
+                ref('project_issue_category_03')])]"/>
     </record>
 
     <record id="crm_case_logicalerrorinprogram0" model="project.issue">

From 4b04cbadb819a31ced36edf476e79128e0a593ab Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 18:18:16 +0200
Subject: [PATCH 059/312] [IMP] remove dummy '&quot;'

bzr revid: abo@openerp.com-20120712161816-f4muvayxfs562ybc
---
 addons/project_issue/project_issue_demo.xml | 72 ++++++++++-----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index db4af16af24..5efc183ce31 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -16,15 +16,15 @@
     <!-- Issues -->
     <record id="crm_case_buginaccountsmodule0" model="project.issue">
         <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-        <field eval="&quot;5&quot;" name="priority"/>
+        <field name="priority">5</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_agrolait"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field eval="15.0" name="duration"/>
-        <field eval="&quot;Bug in Accounts module&quot;" name="name"/>
-        <field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
+        <field name="name">Bug in Accounts module</field>
+        <field name="email_from">agr@agrolait.com</field>
         <field name="stage_id" ref="project.project_tt_specification"/>
         <field name="categ_ids" eval="[(6, 0, [
                 ref('project_issue_category_01')])]"/>
@@ -32,26 +32,26 @@
 
     <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
         <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
-        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="priority">3</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_asus"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="3.5" name="duration"/>
-        <field eval="&quot;Program not giving proper output&quot;" name="name"/>
+        <field name="name">Program not giving proper output</field>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="stage_id" ref="project.project_tt_specification"/>
     </record>
 
     <record id="crm_case_outputincorrect0" model="project.issue">
         <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="priority">4</field>
         <field name="user_id" ref="base.user_demo"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="2.3" name="duration"/>
         <field name="project_id" ref="project.project_project_23"/>
-        <field eval="&quot;Output incorrect&quot;" name="name"/>
+        <field name="name">Output incorrect</field>
         <field name="stage_id" ref="project.project_tt_development"/>
         <field name="categ_ids" eval="[(6, 0, [
                 ref('project_issue_category_01'),
@@ -60,40 +60,40 @@
 
     <record id="crm_case_problemloadingpage0" model="project.issue">
         <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="priority">3</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_14"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="4.0" name="duration"/>
         <field name="project_id" ref="project.project_project_22"/>
-        <field eval="&quot;Problem loading page&quot;" name="name"/>
+        <field name="name">Problem loading page</field>
         <field name="stage_id" ref="project.project_tt_testing"/>
     </record>
 
     <record id="crm_case_pagenotfound0" model="project.issue">
         <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="priority">3</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="1.0" name="duration"/>
         <field name="project_id" ref="project.project_project_22"/>
-        <field eval="&quot;Page not Found&quot;" name="name"/>
+        <field name="name">Page not Found</field>
         <field name="stage_id" ref="project.project_tt_development"/>
     </record>
 
     <record id="crm_case_programmingerror0" model="project.issue">
         <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="priority">3</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_5"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="4.0" name="duration"/>
         <field name="project_id" ref="project.project_project_22"/>
-        <field eval="&quot;Programming Error&quot;" name="name"/>
+        <field name="name">Programming Error</field>
         <field name="stage_id" ref="project.project_tt_testing"/>
         <field name="categ_ids" eval="[(6, 0, [
                 ref('project_issue_category_02'),
@@ -102,136 +102,136 @@
 
     <record id="crm_case_logicalerrorinprogram0" model="project.issue">
         <field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
-        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="priority">2</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_6"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="2.0" name="duration"/>
         <field name="project_id" ref="project.project_project_9"/>
-        <field eval="&quot;Logical Error in Program&quot;" name="name"/>
+        <field name="name">Logical Error in Program</field>
         <field name="stage_id" ref="project.project_tt_testing"/>
     </record>
 
     <record id="crm_case_constrainterror0" model="project.issue">
         <field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
-        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="priority">2</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_6"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="7.3" name="duration"/>
         <field name="project_id" ref="project.project_project_9"/>
-        <field eval="&quot;Constraint Error&quot;" name="name"/>
+        <field name="name">Constraint Error</field>
         <field name="stage_id" ref="project.project_tt_testing"/>
     </record>
 
     <record id="crm_case_errorinprogram0" model="project.issue">
         <field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
-        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="priority">2</field>
         <field name="user_id" ref="base.user_demo"/>
         <field name="partner_id" ref="base.res_partner_5"/>
         <field eval="1" name="active"/>
         <field eval="1.3" name="duration"/>
         <field name="project_id" ref="project.project_project_22"/>
-        <field eval="&quot;Error in Program&quot;" name="name"/>
+        <field name="name">Error in Program</field>
         <field name="stage_id" ref="project.project_tt_testing"/>
     </record>
 
     <record id="crm_case_patcheserrorinprogram0" model="project.issue">
         <field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
-        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="priority">2</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_2"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="13.0" name="duration"/>
         <field name="project_id" ref="project.project_project_9"/>
-        <field eval="&quot;Patches Error in Program&quot;" name="name"/>
+        <field name="name">Patches Error in Program</field>
         <field name="stage_id" ref="project.project_tt_testing"/>
     </record>
 
     <record id="crm_case_newfeaturestobeadded0" model="project.issue">
         <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="priority">4</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_maxtor"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="3.2" name="duration"/>
         <field name="project_id" ref="project.project_project_21"/>
-        <field eval="&quot;New Features To Be Added&quot;" name="name"/>
+        <field name="name">New Features To Be Added</field>
         <field name="stage_id" ref="project.project_tt_merge"/>
     </record>
 
     <record id="crm_case_addmenustothemodule0" model="project.issue">
         <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
-        <field eval="&quot;1&quot;" name="priority"/>
+        <field name="priority">1</field>
         <field name="user_id" ref="base.user_demo"/>
         <field name="partner_id" ref="base.res_partner_9"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="3.0" name="duration"/>
         <field name="project_id" ref="project.project_project_21"/>
-        <field eval="&quot;Add menus to the module&quot;" name="name"/>
-        <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+        <field name="name">Add menus to the module</field>
+        <field name="email_from">info@opensides.be</field>
         <field name="stage_id" ref="project.project_tt_development"/>
     </record>
 
     <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
         <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="priority">3</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_10"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="2.0" name="duration"/>
         <field name="project_id" ref="project.project_project_9"/>
-        <field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
-        <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+        <field name="name">Include Attendance sheet in Project</field>
+        <field name="email_from">contact@tecsas.fr</field>
         <field name="stage_id" ref="project.project_tt_development"/>
     </record>
 
     <record id="crm_case_createnewobject0" model="project.issue">
         <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="priority">3</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_6"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="2.45" name="duration"/>
         <field name="project_id" ref="project.project_project_22"/>
-        <field eval="&quot;Create new object&quot;" name="name"/>
+        <field name="name">Create new object</field>
         <field name="stage_id" ref="project.project_tt_specification"/>
     </record>
 
     <record id="crm_case_improvereportsinhrms0" model="project.issue">
         <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="priority">4</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_11"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="15.0" name="duration"/>
         <field name="project_id" ref="project.project_project_22"/>
-        <field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
+        <field name="name">Improve Reports in HRMS</field>
         <field name="stage_id" ref="project.project_tt_development"/>
     </record>
 
     <record id="crm_case_improvereportsinpms0" model="project.issue">
         <field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
-        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="priority">2</field>
         <field name="user_id" ref="base.user_demo"/>
         <field name="partner_id" ref="base.res_partner_11"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="06.15" name="duration"/>
         <field name="project_id" ref="project.project_project_22"/>
-        <field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
+        <field name="name">Improve Reports in PMS</field>
         <field name="stage_id" ref="project.project_tt_specification"/>
     </record>
 
-    <!--        Call Function to set some issues as Unread -->
+    <!-- Call Function to set some issues as Unread -->
     <function model="project.issue" name="message_mark_as_unread"
         eval="[ ref('crm_case_improvereportsinhrms0'), ref('crm_case_createnewobject0')], {}"
     />

From 357d05b5ddcb21ec418bfebb9f3932847e738a9f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 12 Jul 2012 18:19:19 +0200
Subject: [PATCH 060/312] [IMP] also: identation

bzr revid: abo@openerp.com-20120712161919-gi9g22oag00y4b1z
---
 addons/project_issue/project_issue_demo.xml | 435 ++++++++++----------
 1 file changed, 217 insertions(+), 218 deletions(-)

diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 5efc183ce31..298dd6a25d9 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -1,240 +1,239 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+    <data noupdate="1">
 
-    <!-- Categories -->
-    <record id="project_issue_category_01" model="project.category">
-        <field name="name">Little problem</field>
-    </record>
-    <record id="project_issue_category_02" model="project.category">
-        <field name="name">PBCK</field>
-    </record>
-    <record id="project_issue_category_03" model="project.category">
-        <field name="name">Deadly bug</field>
-    </record>
+        <!-- Categories -->
+        <record id="project_issue_category_01" model="project.category">
+            <field name="name">Little problem</field>
+        </record>
+        <record id="project_issue_category_02" model="project.category">
+            <field name="name">PBCK</field>
+        </record>
+        <record id="project_issue_category_03" model="project.category">
+            <field name="name">Deadly bug</field>
+        </record>
 
-    <!-- Issues -->
-    <record id="crm_case_buginaccountsmodule0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-        <field name="priority">5</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field eval="15.0" name="duration"/>
-        <field name="name">Bug in Accounts module</field>
-        <field name="email_from">agr@agrolait.com</field>
-        <field name="stage_id" ref="project.project_tt_specification"/>
-        <field name="categ_ids" eval="[(6, 0, [
-                ref('project_issue_category_01')])]"/>
-    </record>
+        <!-- Issues -->
+        <record id="crm_case_buginaccountsmodule0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
+            <field name="priority">5</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field eval="15.0" name="duration"/>
+            <field name="name">Bug in Accounts module</field>
+            <field name="email_from">agr@agrolait.com</field>
+            <field name="stage_id" ref="project.project_tt_specification"/>
+            <field name="categ_ids" eval="[(6, 0, [
+                    ref('project_issue_category_01')])]"/>
+        </record>
 
-    <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
-        <field name="priority">3</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_asus"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="3.5" name="duration"/>
-        <field name="name">Program not giving proper output</field>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="stage_id" ref="project.project_tt_specification"/>
-    </record>
+        <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
+            <field name="priority">3</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_asus"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="3.5" name="duration"/>
+            <field name="name">Program not giving proper output</field>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field name="stage_id" ref="project.project_tt_specification"/>
+        </record>
 
-    <record id="crm_case_outputincorrect0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-        <field name="priority">4</field>
-        <field name="user_id" ref="base.user_demo"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="2.3" name="duration"/>
-        <field name="project_id" ref="project.project_project_23"/>
-        <field name="name">Output incorrect</field>
-        <field name="stage_id" ref="project.project_tt_development"/>
-        <field name="categ_ids" eval="[(6, 0, [
-                ref('project_issue_category_01'),
-                ref('project_issue_category_02')])]"/>
-    </record>
+        <record id="crm_case_outputincorrect0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
+            <field name="priority">4</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="2.3" name="duration"/>
+            <field name="project_id" ref="project.project_project_23"/>
+            <field name="name">Output incorrect</field>
+            <field name="stage_id" ref="project.project_tt_development"/>
+            <field name="categ_ids" eval="[(6, 0, [
+                    ref('project_issue_category_01'),
+                    ref('project_issue_category_02')])]"/>
+        </record>
 
-    <record id="crm_case_problemloadingpage0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-        <field name="priority">3</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_14"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="4.0" name="duration"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Problem loading page</field>
-        <field name="stage_id" ref="project.project_tt_testing"/>
-    </record>
+        <record id="crm_case_problemloadingpage0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
+            <field name="priority">3</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_14"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="4.0" name="duration"/>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field name="name">Problem loading page</field>
+            <field name="stage_id" ref="project.project_tt_testing"/>
+        </record>
 
-    <record id="crm_case_pagenotfound0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-        <field name="priority">3</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="1.0" name="duration"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Page not Found</field>
-        <field name="stage_id" ref="project.project_tt_development"/>
-    </record>
+        <record id="crm_case_pagenotfound0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
+            <field name="priority">3</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="1.0" name="duration"/>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field name="name">Page not Found</field>
+            <field name="stage_id" ref="project.project_tt_development"/>
+        </record>
 
-    <record id="crm_case_programmingerror0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-        <field name="priority">3</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_5"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="4.0" name="duration"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Programming Error</field>
-        <field name="stage_id" ref="project.project_tt_testing"/>
-        <field name="categ_ids" eval="[(6, 0, [
-                ref('project_issue_category_02'),
-                ref('project_issue_category_03')])]"/>
-    </record>
+        <record id="crm_case_programmingerror0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
+            <field name="priority">3</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_5"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="4.0" name="duration"/>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field name="name">Programming Error</field>
+            <field name="stage_id" ref="project.project_tt_testing"/>
+            <field name="categ_ids" eval="[(6, 0, [
+                    ref('project_issue_category_02'),
+                    ref('project_issue_category_03')])]"/>
+        </record>
 
-    <record id="crm_case_logicalerrorinprogram0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
-        <field name="priority">2</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_6"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="2.0" name="duration"/>
-        <field name="project_id" ref="project.project_project_9"/>
-        <field name="name">Logical Error in Program</field>
-        <field name="stage_id" ref="project.project_tt_testing"/>
-    </record>
+        <record id="crm_case_logicalerrorinprogram0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
+            <field name="priority">2</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_6"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="2.0" name="duration"/>
+            <field name="project_id" ref="project.project_project_9"/>
+            <field name="name">Logical Error in Program</field>
+            <field name="stage_id" ref="project.project_tt_testing"/>
+        </record>
 
-    <record id="crm_case_constrainterror0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
-        <field name="priority">2</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_6"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="7.3" name="duration"/>
-        <field name="project_id" ref="project.project_project_9"/>
-        <field name="name">Constraint Error</field>
-        <field name="stage_id" ref="project.project_tt_testing"/>
-    </record>
+        <record id="crm_case_constrainterror0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
+            <field name="priority">2</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_6"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="7.3" name="duration"/>
+            <field name="project_id" ref="project.project_project_9"/>
+            <field name="name">Constraint Error</field>
+            <field name="stage_id" ref="project.project_tt_testing"/>
+        </record>
 
-    <record id="crm_case_errorinprogram0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
-        <field name="priority">2</field>
-        <field name="user_id" ref="base.user_demo"/>
-        <field name="partner_id" ref="base.res_partner_5"/>
-        <field eval="1" name="active"/>
-        <field eval="1.3" name="duration"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Error in Program</field>
-        <field name="stage_id" ref="project.project_tt_testing"/>
-    </record>
+        <record id="crm_case_errorinprogram0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
+            <field name="priority">2</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="partner_id" ref="base.res_partner_5"/>
+            <field eval="1" name="active"/>
+            <field eval="1.3" name="duration"/>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field name="name">Error in Program</field>
+            <field name="stage_id" ref="project.project_tt_testing"/>
+        </record>
 
-    <record id="crm_case_patcheserrorinprogram0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
-        <field name="priority">2</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_2"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="13.0" name="duration"/>
-        <field name="project_id" ref="project.project_project_9"/>
-        <field name="name">Patches Error in Program</field>
-        <field name="stage_id" ref="project.project_tt_testing"/>
-    </record>
+        <record id="crm_case_patcheserrorinprogram0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
+            <field name="priority">2</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="13.0" name="duration"/>
+            <field name="project_id" ref="project.project_project_9"/>
+            <field name="name">Patches Error in Program</field>
+            <field name="stage_id" ref="project.project_tt_testing"/>
+        </record>
 
-    <record id="crm_case_newfeaturestobeadded0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-        <field name="priority">4</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_maxtor"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="3.2" name="duration"/>
-        <field name="project_id" ref="project.project_project_21"/>
-        <field name="name">New Features To Be Added</field>
-        <field name="stage_id" ref="project.project_tt_merge"/>
-    </record>
+        <record id="crm_case_newfeaturestobeadded0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
+            <field name="priority">4</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_maxtor"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="3.2" name="duration"/>
+            <field name="project_id" ref="project.project_project_21"/>
+            <field name="name">New Features To Be Added</field>
+            <field name="stage_id" ref="project.project_tt_merge"/>
+        </record>
 
-    <record id="crm_case_addmenustothemodule0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
-        <field name="priority">1</field>
-        <field name="user_id" ref="base.user_demo"/>
-        <field name="partner_id" ref="base.res_partner_9"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="3.0" name="duration"/>
-        <field name="project_id" ref="project.project_project_21"/>
-        <field name="name">Add menus to the module</field>
-        <field name="email_from">info@opensides.be</field>
-        <field name="stage_id" ref="project.project_tt_development"/>
-    </record>
+        <record id="crm_case_addmenustothemodule0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
+            <field name="priority">1</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="partner_id" ref="base.res_partner_9"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="3.0" name="duration"/>
+            <field name="project_id" ref="project.project_project_21"/>
+            <field name="name">Add menus to the module</field>
+            <field name="email_from">info@opensides.be</field>
+            <field name="stage_id" ref="project.project_tt_development"/>
+        </record>
 
-    <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-        <field name="priority">3</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_10"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="2.0" name="duration"/>
-        <field name="project_id" ref="project.project_project_9"/>
-        <field name="name">Include Attendance sheet in Project</field>
-        <field name="email_from">contact@tecsas.fr</field>
-        <field name="stage_id" ref="project.project_tt_development"/>
-    </record>
+        <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
+            <field name="priority">3</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_10"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="2.0" name="duration"/>
+            <field name="project_id" ref="project.project_project_9"/>
+            <field name="name">Include Attendance sheet in Project</field>
+            <field name="email_from">contact@tecsas.fr</field>
+            <field name="stage_id" ref="project.project_tt_development"/>
+        </record>
 
-    <record id="crm_case_createnewobject0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-        <field name="priority">3</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_6"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="2.45" name="duration"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Create new object</field>
-        <field name="stage_id" ref="project.project_tt_specification"/>
-    </record>
+        <record id="crm_case_createnewobject0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
+            <field name="priority">3</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_6"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="2.45" name="duration"/>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field name="name">Create new object</field>
+            <field name="stage_id" ref="project.project_tt_specification"/>
+        </record>
 
-    <record id="crm_case_improvereportsinhrms0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-        <field name="priority">4</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="15.0" name="duration"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Improve Reports in HRMS</field>
-        <field name="stage_id" ref="project.project_tt_development"/>
-    </record>
+        <record id="crm_case_improvereportsinhrms0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
+            <field name="priority">4</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="partner_id" ref="base.res_partner_11"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="15.0" name="duration"/>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field name="name">Improve Reports in HRMS</field>
+            <field name="stage_id" ref="project.project_tt_development"/>
+        </record>
 
-    <record id="crm_case_improvereportsinpms0" model="project.issue">
-        <field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
-        <field name="priority">2</field>
-        <field name="user_id" ref="base.user_demo"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="1" name="active"/>
-        <field eval="06.15" name="duration"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Improve Reports in PMS</field>
-        <field name="stage_id" ref="project.project_tt_specification"/>
-    </record>
+        <record id="crm_case_improvereportsinpms0" model="project.issue">
+            <field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
+            <field name="priority">2</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="partner_id" ref="base.res_partner_11"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="1" name="active"/>
+            <field eval="06.15" name="duration"/>
+            <field name="project_id" ref="project.project_project_22"/>
+            <field name="name">Improve Reports in PMS</field>
+            <field name="stage_id" ref="project.project_tt_specification"/>
+        </record>
 
-    <!-- Call Function to set some issues as Unread -->
-    <function model="project.issue" name="message_mark_as_unread"
-        eval="[ ref('crm_case_improvereportsinhrms0'), ref('crm_case_createnewobject0')], {}"
-    />
+        <!-- Call function to set some issues as 'unread' -->
+        <function model="project.issue" name="message_mark_as_unread"
+            eval="[ ref('crm_case_improvereportsinhrms0'), ref('crm_case_createnewobject0')], {}"/>
 
-</data>
+    </data>
 </openerp>

From 30e9f896637387742159fadd5844152367d2ea62 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 13 Jul 2012 17:02:54 +0530
Subject: [PATCH 061/312] [IMP] : Update Description for modules

bzr revid: cha@tinyerp.com-20120713113254-e63czzwtjdpnr7ea
---
 addons/web/__openerp__.py           | 6 ++++--
 addons/web_calendar/__openerp__.py  | 2 +-
 addons/web_dashboard/__openerp__.py | 2 +-
 addons/web_diagram/__openerp__.py   | 3 ++-
 addons/web_gantt/__openerp__.py     | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index d54c643808b..bcaf36b8801 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -3,8 +3,10 @@
     "category": "Hidden",
     "description":
         """
-        OpenERP Web core module.
-        This module provides the core of the OpenERP Web Client.
+OpenERP Web core module.
+========================
+
+This module provides the core of the OpenERP Web Client.
         """,
     "depends" : [],
     'auto_install': True,
diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py
index 755d6fdb1f7..1ad3f5897a6 100644
--- a/addons/web_calendar/__openerp__.py
+++ b/addons/web_calendar/__openerp__.py
@@ -3,7 +3,7 @@
     "category": "Hidden",
     "description":
         """
-        OpenERP Web Calendar view.
+OpenERP Web Calendar view.
         """,
     "version": "2.0",
     "depends": ['web'],
diff --git a/addons/web_dashboard/__openerp__.py b/addons/web_dashboard/__openerp__.py
index a48b3f9c0f5..d54756d410f 100644
--- a/addons/web_dashboard/__openerp__.py
+++ b/addons/web_dashboard/__openerp__.py
@@ -3,7 +3,7 @@
     "category": "Hidden",
     "description":
         """
-        OpenERP Web Dashboard view.
+OpenERP Web Dashboard view.
         """,
     "version": "2.0",
     "depends": ['web'],
diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py
index 247506cf581..95fbccde7f0 100644
--- a/addons/web_diagram/__openerp__.py
+++ b/addons/web_diagram/__openerp__.py
@@ -1,7 +1,8 @@
 {
     "name" : "OpenERP Web Diagram",
     "category" : "Hidden",
-    "description":'Openerp Web Diagram view',
+    "description":"""
+Openerp Web Diagram view.""",
     "version" : "2.0",
     "depends" : ["web"],
     "js": [
diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py
index 3357dbae53f..73748239549 100644
--- a/addons/web_gantt/__openerp__.py
+++ b/addons/web_gantt/__openerp__.py
@@ -3,7 +3,7 @@
     "category": "Hidden",
     "description":
         """
-        OpenERP Web Gantt chart view.
+OpenERP Web Gantt chart view.
         """,
     "version": "2.0",
     "depends": ['web'],

From 7decd8085d61fe51330e1be9d5de8128b3831deb Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 13 Jul 2012 17:14:57 +0530
Subject: [PATCH 062/312] [IMP] : Update Description for modules

bzr revid: cha@tinyerp.com-20120713114457-2cfrfinkjlh03x8w
---
 addons/web_graph/__openerp__.py   | 15 ++++++++-------
 addons/web_hello/__openerp__.py   |  2 +-
 addons/web_kanban/__openerp__.py  |  2 +-
 addons/web_mobile/__openerp__.py  |  2 +-
 addons/web_process/__openerp__.py |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py
index 84412a9c240..6b7566a36e4 100644
--- a/addons/web_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -1,14 +1,15 @@
 {
     "name": "Graph Views",
     "category" : "Hidden",
-    "description":"""Graph Views for Web Client
+    "description":"""
+Graph Views for Web Client.
 
-* Parse a <graph> view but allows changing dynamically the presentation
-* Graph Types: pie, lines, areas, bars, radar
-* Stacked/Not Stacked for areas and bars
-* Legends: top, inside (top/left), hidden
-* Features: download as PNG or CSV, browse data grid, switch orientation
-* Unlimited "Group By" levels (not stacked), two cross level analysis (stacked)
+    * Parse a <graph> view but allows changing dynamically the presentation
+    * Graph Types: pie, lines, areas, bars, radar
+    * Stacked/Not Stacked for areas and bars
+    * Legends: top, inside (top/left), hidden
+    * Features: download as PNG or CSV, browse data grid, switch orientation
+    * Unlimited "Group By" levels (not stacked), two cross level analysis (stacked)
 """,
     "version": "3.0",
     "depends": ['web'],
diff --git a/addons/web_hello/__openerp__.py b/addons/web_hello/__openerp__.py
index b7e17a520a8..6d3fc02faae 100644
--- a/addons/web_hello/__openerp__.py
+++ b/addons/web_hello/__openerp__.py
@@ -3,7 +3,7 @@
     "category": "Hidden",
     "description":
         """
-        OpenERP Web example module.
+OpenERP Web example module.
         """,
     "version": "2.0",
     "depends": [],
diff --git a/addons/web_kanban/__openerp__.py b/addons/web_kanban/__openerp__.py
index 8a769342461..5b5d792dc4b 100644
--- a/addons/web_kanban/__openerp__.py
+++ b/addons/web_kanban/__openerp__.py
@@ -3,7 +3,7 @@
     "category": "Hidden",
     "description":
         """
-        OpenERP Web kanban view.
+OpenERP Web kanban view.
         """,
     "version" : "2.0",
     "depends" : ["web"],
diff --git a/addons/web_mobile/__openerp__.py b/addons/web_mobile/__openerp__.py
index cd5a4836a5a..8660ba3ca6b 100644
--- a/addons/web_mobile/__openerp__.py
+++ b/addons/web_mobile/__openerp__.py
@@ -3,7 +3,7 @@
     "category": "Hidden",
     "description":
         """
-        OpenERP Web Mobile.
+OpenERP Web Mobile.
         """,
     "version" : "2.0",
     "depends" : [],
diff --git a/addons/web_process/__openerp__.py b/addons/web_process/__openerp__.py
index b488ddb95d2..bdab3f215ad 100644
--- a/addons/web_process/__openerp__.py
+++ b/addons/web_process/__openerp__.py
@@ -3,7 +3,7 @@
     "version": "2.0",
      "description":
         """
-        OpenERP Web process view.
+OpenERP Web process view.
         """,
     "depends" : ["web_diagram"],
     "js": [

From 03f7d7f7c13833bfcaf87edfaf13df111f70abe6 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 13 Jul 2012 17:19:26 +0530
Subject: [PATCH 063/312] [IMP] : Update Description for modules

bzr revid: cha@tinyerp.com-20120713114926-i1n8f4u2ew7eco62
---
 addons/web_rpc/__openerp__.py   | 3 ++-
 addons/web_tests/__openerp__.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web_rpc/__openerp__.py b/addons/web_rpc/__openerp__.py
index 27ec39f5748..75ef2c8c80d 100644
--- a/addons/web_rpc/__openerp__.py
+++ b/addons/web_rpc/__openerp__.py
@@ -1,7 +1,8 @@
 {
     "name" : "OpenERP Web Web",
     "category" : "Hidden",
-    "description":'Openerp Web Web',
+    "description":"""
+Openerp Web Web.""",
     "version" : "2.0",
     "depends" : [],
     "installable" : False,
diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py
index dc26ecc42ad..ce88b1bd9ae 100644
--- a/addons/web_tests/__openerp__.py
+++ b/addons/web_tests/__openerp__.py
@@ -3,7 +3,7 @@
     "category": "Hidden",
     "description":
         """
-        OpenERP Web test suite.
+OpenERP Web test suite.
         """,
     "version": "2.0",
     "depends": [],

From 652ff6a97f8bb8766a9cf8565ce2c4cd3367f3f0 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 16 Jul 2012 14:14:40 +0200
Subject: [PATCH 064/312] [FIX] remove a test menu; add rights for portal
 members on the project_category model

bzr revid: abo@openerp.com-20120716121440-cfjp60f4l4w05z63
---
 addons/portal/portal_view.xml                      | 1 -
 addons/portal_crm/wizard/contact_view.xml          | 3 ---
 addons/portal_project/security/ir.model.access.csv | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 818753dede6..0c526a31ef6 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -2,7 +2,6 @@
 <openerp>
     <data>
 
-
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
             <field name="name">Portal List</field>
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 922ec231496..4f1a776fe91 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -107,8 +107,5 @@
         <menuitem name="Contact" id="portal_company_contact"
             parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
 
-        <!-- test menu item to compare with and without menu -->
-        <menuitem name="FullContact" id="portal_company_contact2" action="action_wizard_contact_us" sequence="120" groups="base.group_no_one"/>
-
     </data>
 </openerp>
diff --git a/addons/portal_project/security/ir.model.access.csv b/addons/portal_project/security/ir.model.access.csv
index 212230634c3..dceca5ba8bb 100644
--- a/addons/portal_project/security/ir.model.access.csv
+++ b/addons/portal_project/security/ir.model.access.csv
@@ -2,3 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_task,tasks,project.model_project_task,portal.group_portal_member,1,0,0,0
 access_task_type,task_type,project.model_project_task_type,portal.group_portal_member,1,0,0,0
 access_task_work,task_work,project.model_project_task_work,portal.group_portal_member,1,0,0,0
+access_project_category,project_category,project.model_project_category,portal.group_portal_member,1,0,0,0

From e31e32cc48c2603a69f101fd6dc409dacabe206d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 16 Jul 2012 14:17:41 +0200
Subject: [PATCH 065/312] [FIX] categ_id doesn't exist anymore; long live to
 categ_ids

bzr revid: abo@openerp.com-20120716121741-y71lb0ruzr3obeb0
---
 addons/project_issue/project_issue_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 1cbf9a5c274..4804456c555 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -133,14 +133,12 @@
                                 <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline"/>
                                 <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
                             </div>
+                            <field name="categ_ids" widget="many2many_tags"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
                             <group>
-                                <group>
-                                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                                </group>
                                 <group>
                                     <field name="version_id" widget="selection"/>
                                 </group>

From 53578cfeb5d0251ebc94b53a2a810227bfae5b1a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 16 Jul 2012 15:52:09 +0200
Subject: [PATCH 066/312] [IMP] restore the portal menu dedicated to portal
 users

portal's menu items are not nested in the 'Feeds' menu anymore

bzr revid: abo@openerp.com-20120716135209-nm51jjeam7d7xq86
---
 addons/portal/portal_data.xml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 1f0d830657e..0e0e0d1aafb 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,6 +2,13 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="portal" model="res.portal">
+            <field name="name">Portal</field>
+            <field name="group_id" ref="group_portal_member"/>
+            <field name="override_menu" eval="False"/>
+        </record>
+
+        <!-- Mail group for the company's news -->
         <record id="company_news_feed" model="mail.group">
             <field name="name">Company's news feed</field>
         </record>
@@ -14,20 +21,16 @@
             <field name="target">inline</field>
         </record>
 
-        <!-- default portal menu structure -->
-        <menuitem name="Our company" id="portal_company" parent="mail.mail_feeds_main" sequence="20"/>
-            <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+        <!-- Portal's menu structure -->
+        <menuitem name="Portal" id="portal"/>
 
-        <menuitem name="Orders" id="portal_orders" parent="mail.mail_feeds_main" sequence="30"/>
-        <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="mail.mail_feeds_main" sequence="40"/>
-        <menuitem name="Projects" id="portal_projects" parent="mail.mail_feeds_main" sequence="50"/>
-        <menuitem name="After Sale Services" id="portal_after_sales" parent="mail.mail_feeds_main" sequence="60"/>
+            <menuitem name="Our company" id="portal_company" parent="portal" sequence="20"/>
+                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
 
-        <record id="portal" model="res.portal">
-            <field name="name">Portal</field>
-            <field name="group_id" ref="group_portal_member"/>
-            <field name="override_menu" eval="False"/>
-        </record>
+            <menuitem name="Orders" id="portal_orders" parent="portal" sequence="30"/>
+            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal" sequence="40"/>
+            <menuitem name="Projects" id="portal_projects" parent="portal" sequence="50"/>
+            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal" sequence="60"/>
 
     </data>
 </openerp>

From c1a5cb0d2197eb9ce3ab00909cf549b203016c85 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 11:48:24 +0200
Subject: [PATCH 067/312] [FIX] uniqid constraint not respected in portal and
 not null constraint not respected (no idea where this one came from...)

bzr revid: abo@openerp.com-20120717094824-qk580yg3gcmu6evy
---
 addons/portal/portal_data.xml | 2 +-
 addons/portal/portal_demo.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 0e0e0d1aafb..bfd3476fe1b 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -22,7 +22,7 @@
         </record>
 
         <!-- Portal's menu structure -->
-        <menuitem name="Portal" id="portal"/>
+        <menuitem name="Portal" id="portal_menu"/>
 
             <menuitem name="Our company" id="portal_company" parent="portal" sequence="20"/>
                 <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 1776493eb32..9e6e034837c 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -13,6 +13,7 @@
         </record>
 
         <record id="portal" model="res.portal">
+            <field name="name">My company's portal</field>
             <field name="users" eval="[(4,ref('portal_demo_user'))]"/>
         </record>
 

From 910f09726eda282ce9710b42eca28ceecf28e434 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 12:22:37 +0200
Subject: [PATCH 068/312] [FIX] wrong parent_id in menu items

bzr revid: abo@openerp.com-20120717102237-wckbt1584ffeuh46
---
 addons/portal/portal_data.xml | 14 +++++++++-----
 addons/portal/portal_demo.xml |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index bfd3476fe1b..c30dc3920e7 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -24,13 +24,17 @@
         <!-- Portal's menu structure -->
         <menuitem name="Portal" id="portal_menu"/>
 
-            <menuitem name="Our company" id="portal_company" parent="portal" sequence="20"/>
+            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
                 <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
 
-            <menuitem name="Orders" id="portal_orders" parent="portal" sequence="30"/>
-            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal" sequence="40"/>
-            <menuitem name="Projects" id="portal_projects" parent="portal" sequence="50"/>
-            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal" sequence="60"/>
+            <!--
+                Create menu items that we'll leave empty for now - they'll be
+                filled up by other portal modules.
+            -->
+            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
+            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
+            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
 
     </data>
 </openerp>
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 9e6e034837c..a0fb515eea2 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -12,8 +12,8 @@
             <field name="partner_id" eval="ref('base.res_partner_agrolait')"/>
         </record>
 
+        <!-- Add the demo user to the portal -->
         <record id="portal" model="res.portal">
-            <field name="name">My company's portal</field>
             <field name="users" eval="[(4,ref('portal_demo_user'))]"/>
         </record>
 

From 59b86a1edf52017772317f542c50356e9b782774 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:07:57 +0200
Subject: [PATCH 069/312] [IMP] only portal members and anonymous users can see
 the Portal menu

bzr revid: abo@openerp.com-20120718100757-wg3itkwrvxcknvtj
---
 addons/portal/portal_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index c30dc3920e7..307844ed50a 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -22,7 +22,7 @@
         </record>
 
         <!-- Portal's menu structure -->
-        <menuitem name="Portal" id="portal_menu"/>
+        <menuitem name="Portal" id="portal_menu" groups="portal.group_portal_member,anonymous.group_anonymous"/>
 
             <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
                 <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>

From fefa9f35b8f1196df298a6b62531ad6071c44368 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 15:43:09 +0200
Subject: [PATCH 070/312] [IMP] add a proper sequence number on the Portal's
 top menu item.  This should work properly after the merge of
 trunk-imp_top_menus_sequences-abo

bzr revid: abo@openerp.com-20120718134309-c7uztya4ziykt661
---
 addons/portal/portal_data.xml   | 7 +++++--
 addons/portal/res_user_view.xml | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 307844ed50a..74bf1711b7e 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -21,8 +21,11 @@
             <field name="target">inline</field>
         </record>
 
-        <!-- Portal's menu structure -->
-        <menuitem name="Portal" id="portal_menu" groups="portal.group_portal_member,anonymous.group_anonymous"/>
+        <!-- Top menu item -->
+        <menuitem name="Portal"
+            id="portal_menu"
+            groups="portal.group_portal_member,anonymous.group_anonymous"
+            sequence="20"/>
 
             <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
                 <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
diff --git a/addons/portal/res_user_view.xml b/addons/portal/res_user_view.xml
index 492c2ec5559..d481b865b79 100644
--- a/addons/portal/res_user_view.xml
+++ b/addons/portal/res_user_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <!-- add partner field in user form -->
         <record id="view_users_form" model="ir.ui.view">
             <field name="name">res.portal.users.form</field>
@@ -13,5 +14,6 @@
                 </field>
             </field>
         </record>
+
     </data>
 </openerp>

From 585cbe8d2e8db793f02a89729cec5e1d1be39ef3 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 15:56:51 +0200
Subject: [PATCH 071/312] [IMP] better formatting for project's demo data

bzr revid: abo@openerp.com-20120718135651-bnqfnu4r04psdde0
---
 addons/project/project_demo.xml | 115 ++++++++++++++++----------------
 1 file changed, 57 insertions(+), 58 deletions(-)

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 0916fc5890f..91b272d60ff 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -4,48 +4,48 @@
 
          <!-- Users -->
         <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]" name="groups_id"/>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]"/>
         </record>
 
         <record id="base.user_niv" model="res.users">
             <field name="name">Nicolas</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]"/>
             <field name="login">niv</field>
             <field name="password">niv</field>
         </record>
         <record id="base.user_al" model="res.users">
             <field name="name">Antony</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]"/>
             <field name="login">al</field>
             <field name="password">al</field>
         </record>
         <record id="base.user_qdp" model="res.users">
             <field name="name">Quentin</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
             <field name="login">qdp</field>
             <field name="password">qdp</field>
         </record>
         <record id="base.user_fpi" model="res.users">
             <field name="name">Francois</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
             <field name="login">fpi</field>
             <field name="password">fpi</field>
         </record>
         <record id="base.user_jth" model="res.users">
             <field name="name">Julien</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
             <field name="login">jth</field>
             <field name="password">jth</field>
         </record>
         <record id="base.user_mit" model="res.users">
             <field name="name">Minh</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
             <field name="login">mit</field>
             <field name="password">mit</field>
         </record>
         <record id="base.user_vad" model="res.users">
             <field name="name">Valérie</field>
-            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_user')])]"/>
             <field name="login">vad</field>
             <field name="password">vad</field>
         </record>
@@ -84,8 +84,8 @@
 
         <!-- Tasks -->
         <record id="project_task_1" model="project.task">
-            <field eval="100.0" name="planned_hours"/>
-            <field eval="100.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="100.0"/>
+            <field name="remaining_hours" eval="100.0"/>
             <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -96,8 +96,8 @@
                     ref('project.project_category_02')])]"/>
         </record>
         <record id="project_task_2" model="project.task">
-            <field eval="80.0" name="planned_hours"/>
-            <field eval="80.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="80.0"/>
+            <field name="remaining_hours" eval="80.0"/>
             <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -105,8 +105,8 @@
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
         <record id="project_task_3" model="project.task">
-            <field eval="40.0" name="planned_hours"/>
-            <field eval="40.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="40.0"/>
+            <field name="remaining_hours" eval="40.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -119,20 +119,20 @@
                     ref('project_category_04')])]"/>
         </record>
         <record id="project_task_4" model="project.task">
-            <field eval="25.0" name="planned_hours"/>
-            <field eval="25.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="25.0"/>
+            <field name="remaining_hours" eval="25.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Budget Planning</field>
             <field name="description">Use the account_budget module</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-19')"/>
-            <field name="color">3</field>
+            <field name="color">5</field>
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
         <record id="project_task_5" model="project.task">
-            <field eval="25.0" name="planned_hours"/>
-            <field eval="25.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="25.0"/>
+            <field name="remaining_hours" eval="25.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -143,8 +143,8 @@
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
         <record id="project_task_6" model="project.task">
-            <field eval="20.0" name="planned_hours"/>
-            <field eval="20.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="20.0"/>
+            <field name="remaining_hours" eval="20.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -152,8 +152,8 @@
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
         <record id="project_task_7" model="project.task">
-            <field eval="30.0" name="planned_hours"/>
-            <field eval="30.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="30.0"/>
+            <field name="remaining_hours" eval="30.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -161,8 +161,8 @@
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
         <record id="project_task_8" model="project.task">
-            <field eval="10.0" name="planned_hours"/>
-            <field eval="10.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="10.0"/>
+            <field name="remaining_hours" eval="10.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -173,8 +173,8 @@
                     ref('project.project_category_01')])]"/>
         </record>
         <record id="project_task_9" model="project.task">
-            <field eval="50.0" name="planned_hours"/>
-            <field eval="50.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="50.0"/>
+            <field name="remaining_hours" eval="50.0"/>
             <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -182,8 +182,8 @@
             <field name="stage_id" ref="project_tt_specification"/>
         </record>
         <record id="project_task_10" model="project.task">
-            <field eval="40.0" name="planned_hours"/>
-            <field eval="40.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="40.0"/>
+            <field name="remaining_hours" eval="40.0"/>
             <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -192,8 +192,8 @@
             <field name="stage_id" ref="project_tt_development"/>
         </record>
         <record id="project_task_11" model="project.task">
-            <field eval="90.0" name="planned_hours"/>
-            <field eval="90.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="90.0"/>
+            <field name="remaining_hours" eval="90.0"/>
             <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -203,14 +203,14 @@
         <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/>
 
         <record id="project_task_12" model="project.task">
-            <field eval="20.0" name="planned_hours"/>
-            <field eval="20.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="20.0"/>
+            <field name="remaining_hours" eval="20.0"/>
             <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Integrate Modules</field>
             <field name="stage_id" ref="project_tt_development"/>
-            <field name="color">7</field>
+            <field name="color">6</field>
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_01'),
                     ref('project_category_03')])]"/>
@@ -218,8 +218,8 @@
         <function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/>
 
         <record id="project_task_13" model="project.task">
-            <field eval="50.0" name="planned_hours"/>
-            <field eval="50.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="50.0"/>
+            <field name="remaining_hours" eval="50.0"/>
             <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -229,8 +229,8 @@
         <function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/>
 
         <record id="project_task_14" model="project.task">
-            <field eval="30.0" name="planned_hours"/>
-            <field eval="30.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="30.0"/>
+            <field name="remaining_hours" eval="30.0"/>
             <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -238,8 +238,8 @@
             <field name="stage_id" ref="project_tt_development"/>
         </record>
         <record id="project_task_15" model="project.task">
-            <field eval="15.0" name="planned_hours"/>
-            <field eval="15.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="15.0"/>
+            <field name="remaining_hours" eval="15.0"/>
             <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -248,9 +248,9 @@
             <field name="date_start">2011-02-06</field>
         </record>
         <record id="project_task_16" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="40.0" name="planned_hours"/>
-            <field eval="40.0" name="remaining_hours"/>
+            <field name="sequence" eval="10"/>
+            <field name="planned_hours" eval="40.0"/>
+            <field name="remaining_hours" eval="40.0"/>
             <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -261,8 +261,8 @@
         <function model="project.task" name="do_open" eval="[ref('project_task_16')], {'install_mode': True}"/>
 
         <record id="project_task_17" model="project.task">
-            <field eval="5.0" name="planned_hours"/>
-            <field eval="5.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="5.0"/>
+            <field name="remaining_hours" eval="5.0"/>
             <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -272,8 +272,8 @@
         <function model="project.task" name="do_open" eval="[ref('project_task_17')], {'install_mode': True}"/>
 
         <record id="project_task_18" model="project.task">
-            <field eval="10.0" name="planned_hours"/>
-            <field eval="10.0" name="remaining_hours"/>
+            <field name="planned_hours" eval="10.0"/>
+            <field name="remaining_hours" eval="10.0"/>
             <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
@@ -290,30 +290,30 @@
             <field name="name">OpenERP Integration</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge')])]" name="type_ids"/>
+            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge')])]"/>
         </record>
         <record id="project_project_21" model="project.project">
             <field name="priority">10</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Study + Prototype</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development')])]" name="type_ids"/>
-            <field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
+            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development')])]"/>
+            <field name="members" eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]"/>
         </record>
         <record id="project_project_22" model="project.project">
             <field name="priority">20</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Specific Developments</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="[(6, 0, [ref('project_tt_specification'), ref('project_tt_development')])]" name="type_ids"/>
-            <field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
+            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'), ref('project_tt_development')])]"/>
+            <field name="members" eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]"/>
         </record>
         <record id="project_project_23" model="project.project">
             <field name="priority">30</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Install, data import, configuration</field>
-            <field eval="[(6, 0, [ref('project_tt_development')])]" name="type_ids"/>
-            <field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
+            <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
+            <field name="members" eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]"/>
         </record>
 
         <!-- Tasks -->
@@ -356,7 +356,7 @@
             <field name="priority">0</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Customer analysis + Architecture</field>
-            <field name="color">3</field>
+            <field name="color">7</field>
         </record>
         <record id="project_task_186" model="project.task">
             <field name="sequence">15</field>
@@ -366,7 +366,7 @@
             <field name="user_id" eval="False"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
-            <field name="color">4</field>
+            <field name="color">8</field>
         </record>
         <record id="project_task_188" model="project.task">
             <field name="sequence">17</field>
@@ -403,8 +403,7 @@
 
         <!-- Schedule tasks to assign users and dates -->
         <function model="project.project" name="schedule_tasks"
-            eval="[ref('project_project_21'), ref('project_project_22'), ref('project_project_23')], {'install_mode': True}"
-        />
+            eval="[ref('project_project_21'), ref('project_project_22'), ref('project_project_23')], {'install_mode': True}"/>
 
     </data>
 </openerp>

From ea3c3b3d9fc81bd8a98e3887bc2bfb37a6907048 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 15:58:12 +0200
Subject: [PATCH 072/312] [ADD] a dependence from portal to anonymous this will
 be necessary to restrict the Portal's top menu item to anonymous user (among
 others)

bzr revid: abo@openerp.com-20120718135812-v5gn6prr0j3vdqmo
---
 addons/portal/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index aaf94526615..72be8edb4b8 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name' : "Portal",
     'version' : "1.0",
-    'depends' : ["base", "share"],
+    'depends' : ["base", "share", "anonymous"],
     'author' : "OpenERP SA",
     'category': 'Portal',
     'description': """

From 267000df85e4d7193bd9e1afb66df6cac3e520f4 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 12:50:21 +0530
Subject: [PATCH 073/312] [IMP] improved serch views in workfolw_view.xml

bzr revid: tpa@tinyerp.com-20120719072021-8w1gtye3dm9r92ji
---
 .../addons/base/ir/workflow/workflow_view.xml  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index 00662a68f29..4a57e71a8f7 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -164,16 +164,11 @@
         <field name="arch" type="xml">
             <search string="Workflow Activity">
                 <field name="name" string="Workflow Activity"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-camera_test" string="Flow Start"
-                domain="[('flow_start', '=',True)]" />
-                <filter icon="terp-gtk-stop" string="Flow Stop"
-                domain="[('flow_stop', '=',True)]" />
-                <separator orientation="vertical"/>
                 <field name="wkf_id"/>
                 <field name="action_id"/>
                 <field name="kind"/>
-                <newline/>
+                <filter icon="terp-camera_test" string="Flow Start" domain="[('flow_start', '=',True)]" />
+                <filter icon="terp-gtk-stop" string="Flow Stop" domain="[('flow_stop', '=',True)]" />
                 <group expand="0" string="Group By...">
                     <filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
                 </group>
@@ -242,7 +237,6 @@
         <field name="arch" type="xml">
             <search string="Transition">
                 <field name="signal" filter_domain="['|', ('signal','ilike',self), ('condition','ilike',self)]" string="Workflow Transition"/>
-                <separator orientation="vertical"/>
                 <field name="act_from"/>
                 <field name="act_to"/>
             </search>
@@ -301,12 +295,10 @@
         <field name="arch" type="xml">
             <search string="Workflow Instances">
                 <field name="res_type" string="Resource Object"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
-                <separator orientation="vertical"/>
                 <field name="wkf_id" widget="selection"/>
                 <field name="res_id"/>
                 <field name="state"/>
+                <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
         </search>
       </field>
     </record>
@@ -366,13 +358,11 @@
         <field name="arch" type="xml">
             <search string="Workflow Workitems">
                 <field name="state" string="State"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
-                <separator orientation="vertical"/>
                 <field name="wkf_id" widget="selection"/>
                 <field name="act_id"/>
                 <field name="subflow_id"/>
                 <field name="inst_id"/>
+                <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
             </search>
         </field>
     </record>

From 80c4e66b88e7c5fb7e356614135e48875924846e Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 12:51:46 +0530
Subject: [PATCH 074/312] [IMP]Improve search view

bzr revid: tch@tinyerp.com-20120719072146-hdm840zp2zrg9glh
---
 addons/audittrail/audittrail_view.xml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 55c55398f4e..b15cb849767 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -63,15 +63,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                    <group>
-                        <field name="name" string="Audittrail Rule"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
-                        <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
-                        <separator orientation="vertical"/>
-                        <field name="object_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Audittrail Rule"/>
+                    <field name="object_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
+                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -171,16 +166,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                    <group>
-                        <field name="name" string="Audittrail Log"/>
-                        <separator orientation="vertical"/>
-                        <field name="object_id"/>
-                        <field name="user_id"  widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Audittrail Log"/>
+                    <field name="object_id"/>
+                    <field name="user_id"  widget="selection"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
                     </group>

From 85cb4a7a1fc5cb37dbcd4d0ecd3fd0ab7e67cdb9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 12:54:13 +0530
Subject: [PATCH 075/312] [IMP] improved serch views in ir_filters.xml

bzr revid: tpa@tinyerp.com-20120719072413-2kgxximcv5wnso6h
---
 openerp/addons/base/ir/ir_filters.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index 55ebd11de4a..60c52c958ec 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -54,15 +54,12 @@
             <field name="arch" type="xml">
                 <search string="Filters">
                     <field name="name" string="Filter Name"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Personal" domain="[('user_id','!=',False)]" help="Filters visible only for one user"/>
-                    <filter string="Shared" domain="[('user_id','=',False)]" help="Filters shared with all users"/>
-                    <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
-                        name="my_filters"
-                        string="My Filters"/>
-                    <separator orientation="vertical"/>
                     <field name="model_id"/>
                     <field name="user_id"/>
+                    <filter string="Personal" domain="[('user_id','!=',False)]" help="Filters visible only for one user"/>
+                    <filter string="Shared" domain="[('user_id','=',False)]" help="Filters shared with all users"/>
+                    <separator/>
+                    <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]" name="my_filters" string="My Filters"/>
                 </search>
             </field>
         </record>

From b8047dbe5ad8c09feedc430cd0e202b3854058b3 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 14:22:50 +0530
Subject: [PATCH 076/312] [IMP] improved serch views in ir.xml

bzr revid: tpa@tinyerp.com-20120719085250-7re2616osotst9ye
---
 openerp/addons/base/ir/ir.xml | 176 ++++++++++------------------------
 1 file changed, 52 insertions(+), 124 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 25537cef4b3..857b5dd8d80 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -71,7 +71,6 @@
                     <field name="name"
                         filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
                         string="Client Action"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
@@ -203,7 +202,6 @@
                 <search string="Sequences">
                     <field name="name" string="Sequence"/>
                     <field name="code"/>
-                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
@@ -392,12 +390,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Report Xml">
-                    <group col="10" colspan="4">
-                        <field name="name"
-                            filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
-                            string="Report"/>
-                    </group>
-                    <newline/>
+                    <field name="name"
+                        filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
+                        string="Report"/>
                     <group expand="0" string="Group By" colspan="4">
                         <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'report_type'}"/>
                     </group>
@@ -499,11 +494,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Open a Window">
-                    <group col="10" colspan="4">
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
-                        <field name="view_type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
+                    <field name="view_type"/>
                     <group expand="0" string="Group By" colspan="4">
                         <filter string="View Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'view_type'}"/>
                     </group>
@@ -661,20 +653,11 @@
             <field name="arch" type="xml">
                 <search string="Views">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-stock_zoom"
-                        string="Search"
-                        domain="[('type', '=', 'search')]"/>
-                    <filter icon="gtk-indent"
-                        string="Tree"
-                        domain="[('type', '=', 'tree')]"/>
-                    <filter icon="gtk-new"
-                        string="Form"
-                        domain="[('type', '=','form')]"/>
-                    <separator orientation="vertical"/>
                     <field name="inherit_id"/>
                     <field name="type"/>
-                    <newline/>
+                    <filter icon="terp-stock_zoom" string="Search" domain="[('type', '=', 'search')]"/>
+                    <filter icon="gtk-indent" string="Tree" domain="[('type', '=', 'tree')]"/>
+                    <filter icon="gtk-new" string="Form" domain="[('type', '=','form')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -802,31 +785,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Attachments">
-                    <group colspan="4" col="10">
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
-                        <field name="create_date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-stage"
-                            string="URL"
-                            domain="[('type','=','url')]"/>
-                        <filter icon="terp-stock_align_left_24"
-                            string="Binary"
-                            domain="[('type','=','binary')]"/>
-                        <filter name="my_documents_filter" 
-                            string="My Document(s)"
-                            icon="terp-personal"
-                            domain="[('create_uid','=',uid)]"
-                            help="Filter on my documents"/>
-                        <separator orientation="vertical"/>
-                        <field name="create_uid"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
+                    <field name="create_date"/>
+                    <field name="create_uid"/>
+                    <field name="type"/>
+                    <filter icon="terp-stage" string="URL" domain="[('type','=','url')]"/>
+                    <filter icon="terp-stock_align_left_24" string="Binary" domain="[('type','=','binary')]"/>
+                    <separator/>
+                    <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('create_uid','=',uid)]" help="Filter on my documents"/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
                         <filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
                         <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
@@ -955,16 +925,10 @@
             <field name="arch" type="xml">
                 <search string="Model Description">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"
-                        string="In Memory"
-                        domain="[('osv_memory', '=', True)]"/>
-                    <filter icon="terp-stock_align_left_24"
-                        string="Custom"
-                        domain="[('state', '=', 'manual')]"/>
-                    <filter icon="terp-translate"
-                        string="Base"
-                        domain="[('state', '=', 'base')]"/>
+                    <filter icon="terp-camera_test" string="In Memory" domain="[('osv_memory', '=', True)]"/>
+                    <separator/>
+                    <filter icon="terp-stock_align_left_24" string="Custom" domain="[('state', '=', 'manual')]"/>
+                    <filter icon="terp-translate" string="Base" domain="[('state', '=', 'base')]"/>
                 </search>
             </field>
         </record>
@@ -1035,22 +999,15 @@
             <field name="arch" type="xml">
                 <search string="Fields">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+"
-                        string="Required"
-                        domain="[('required', '=', True)]"/>
-                    <filter icon="terp-dialog-close"
-                        string="Readonly"
-                        domain="[('readonly', '=', True)]"/>
-                    <filter icon="terp-translate"
-                        string="Translate"
-                        domain="[('translate', '=', True)]"/>
-                    <newline/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
-                    <newline/>
+                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Required" domain="[('required', '=', True)]"/>
+                    <separator/>
+                    <filter icon="terp-dialog-close" string="Readonly" domain="[('readonly', '=', True)]"/>
+                    <separator/>
+                    <filter icon="terp-translate" string="Translate" domain="[('translate', '=', True)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
@@ -1104,17 +1061,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="External Identifiers">
-                    <field name="name"
-                        filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]"
-                        string="External Identifier"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"
-                        string="Updatable"
-                        domain="[('noupdate', '=', False)]"/>
-                    <separator orientation="vertical"/>
+                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]" string="External Identifier"/>
                     <field name="res_id"/>
                     <field name="noupdate"/>
-                    <newline/>
+                    <filter icon="terp-camera_test" string="Updatable" domain="[('noupdate', '=', False)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -1237,13 +1187,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Translations">
-                    <filter icon="terp-gdu-smart-failing"
-                        string="Untranslated"
-                        domain="['|',('value', '=', False),('value','=','')]"/>
-                    <separator orientation="vertical"/>
                     <field name="lang"/>
                     <field name="src"/>
                     <field name="value"/>
+                    <filter icon="terp-gdu-smart-failing" string="Untranslated" domain="['|',('value', '=', False),('value','=','')]"/>
                 </search>
             </field>
         </record>
@@ -1469,11 +1416,9 @@
             <field name="arch" type="xml">
                 <search string="Scheduled Actions">
                     <field name="name" string="Scheduled Action"/>
-                    <separator orientation="vertical"/>
                     <field name="user_id" widget="selection"/>
                     <field name="nextcall"/>
                     <field name="active"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Execution" icon="terp-go-month"
@@ -1554,18 +1499,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Access Controls">
-                    <group>
-                        <field name="name" string="Access Control"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
-                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
-                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
-                        <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                        <field name="group_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Access Control"/>
+                    <field name="model_id"/>
+                    <field name="group_id"/>
+                    <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+                    <separator/>
+                    <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                    <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
+                    <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
                         <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
@@ -1651,17 +1592,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Record Rules">
-                    <group>
-                        <field name="name" string="Record Rule"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
-                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
-                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
-                        <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                        <field name="groups"/>
-                    </group>
+                    <field name="name" string="Record Rule"/>
+                    <field name="model_id"/>
+                    <field name="groups"/>
+                    <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
+                    <separator/>
+                    <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                    <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
+                    <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
                 </search>
             </field>
         </record>
@@ -1794,13 +1732,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Server Actions">
-                    <group col="10" colspan="4">
-                        <field name="name" string="Server Action"/>
-                    <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Server Action"/>
+                    <field name="model_id"/>
+                    <field name="state"/>
                     <group expand="0" string="Group By" colspan="4" col="4">
                         <filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -1878,14 +1812,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Actions">
-                    <group>
-                        <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
-                        <separator orientation="vertical"/>
-                        <field name="action_id"/>
-                        <field name="category_id"/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
+                    <field name="action_id"/>
+                    <field name="category_id"/>
+                    <field name="state"/>
+                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" context="{'group_by': 'category_id'}" icon="terp-folder-orange"/>
                     </group>
@@ -2008,9 +1938,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Outgoing Mail Servers">
-                    <field name="name"
-                        filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]"
-                        string="Outgoing Mail Server"/>
+                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]" string="Outgoing Mail Server"/>
                     <field name="smtp_encryption"/>
                 </search>
             </field>

From 57a7759640342eb52e30e0fcbfb2457cec7118b8 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 14:25:18 +0530
Subject: [PATCH 077/312] [IMP]Improve search view in event module

bzr revid: tch@tinyerp.com-20120719085518-how9o87wo5yycb4b
---
 addons/event/event_view.xml | 50 ++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1b1b5daa9a9..4e22843a4aa 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -324,35 +324,29 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Events">
+                    <field name="name" string="Events"/>
+                    <field name="type" widget="selection"/>
+                    <field name="user_id" widget="selection"/>
                     <filter icon="terp-mail-message-new"
                         string="Inbox" help="Unread messages"
                         name="needaction_pending"
                         domain="[('needaction_pending','=',True)]"/>
-                    <separator orientation="vertical"/>
-                    <group>
-                        <field name="name" string="Events"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
-                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
-                        <filter icon="terp-personal"
+                    <separator/>
+                    <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
+                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
+                    <separator/>
+                    <filter icon="terp-personal"
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
-                        <filter icon="terp-go-today" string="Upcoming"
+                    <filter icon="terp-go-today" string="Upcoming"
                                 name="upcoming"
                                 domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
                                 help="Upcoming events from today" />
-                        <separator orientation="vertical"/>
-                        <field name="type" widget="selection"/>
-                        <field name="user_id" widget="selection"/>
-                    </group>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Starting Date" icon="terp-go-month"
                             domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
@@ -525,34 +519,28 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
-                    <group>
-                        <filter icon="terp-mail-message-new"
+                    <field name="name" string="Participant"
+                            filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
+                    <field name="event_id" widget="selection"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-mail-message-new"
                             string="Inbox" help="Unread messages"
                             name="needaction_pending"
                             domain="[('needaction_pending','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name" string="Participant"
-                            filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
-                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
-                        <filter icon="terp-personal"
+                    <separator/>
+                    <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
+                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
+                    <separator/>
+                    <filter icon="terp-personal"
                               string="My Registrations"
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="event_id" widget="selection"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    </group>
-
                 </search>
             </field>
         </record>

From b0cdc3a9bdbf66ec56116820645c88764335a0c0 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 14:26:36 +0530
Subject: [PATCH 078/312] [IMP] improved serch views in module_view.xml

bzr revid: tpa@tinyerp.com-20120719085636-dnt3gjeggh5aw2am
---
 openerp/addons/base/module/module_view.xml | 26 +++++++++-------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 5624c8ff58c..5bfe8f77519 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -41,21 +41,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search modules">
-                    <group col='10' colspan='4'>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
-                        <field name="description" string="Keywords"/>
-                        <separator orientation="vertical"/>
-                        <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
-                        <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
-                        <filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
-                        <filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
-                        <separator orientation="vertical"/>
-                        <field name="category_id"/>
-                        <newline/>
-                        <group expand="0" string="Group By...">
-                            <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
-                            <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
-                        </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
+                    <field name="description" string="Keywords"/>
+                    <field name="category_id"/>
+                    <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
+                    <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
+                    <filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                     </group>
                </search>
             </field>

From 449e2c3fc720e8c7ade943e900ecac2e891ac306 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 14:37:25 +0530
Subject: [PATCH 079/312] [IMP] improved serch views in res

bzr revid: tpa@tinyerp.com-20120719090725-cnf2a2ud0x4blyuq
---
 openerp/addons/base/res/ir_property_view.xml |  7 +---
 openerp/addons/base/res/res_bank_view.xml    |  4 +--
 openerp/addons/base/res/res_lang_view.xml    | 12 ++-----
 openerp/addons/base/res/res_partner_view.xml | 38 +++++++++-----------
 openerp/addons/base/res/res_widget_view.xml  |  2 +-
 5 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 8ca8e98bb32..8f48a0320cd 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -9,14 +9,9 @@
             <field name="arch" type="xml">
                 <search string="Parameters">
                     <field name="name" string="Name"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-project"
-                        string="Generic"
-                        help="Parameters that are used by all resources."
-                        domain="[('res_id','=',False)]"/>
-                    <separator orientation="vertical"/>
                     <field name="fields_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <filter icon="terp-project" string="Generic" help="Parameters that are used by all resources." domain="[('res_id','=',False)]"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 13419f7a881..5f5ddadc3f7 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -146,11 +146,9 @@
             <field name="arch" type="xml">
                 <search string="Bank Accounts">
                     <field name="bank_name" filter_domain="['|', ('bank_name','ilike',self), ('acc_number','ilike',self)]" string="Bank Name"/>
-                    <separator orientation="vertical"/>
-                    <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
-                    <separator orientation="vertical"/>
                     <field name="company_id" invisible="context.get('company_hide', True)"/>
                     <field name="partner_id"/>
+                    <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml
index c7811ce4d09..c4f8bc97e63 100644
--- a/openerp/addons/base/res/res_lang_view.xml
+++ b/openerp/addons/base/res/res_lang_view.xml
@@ -108,15 +108,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Languages">
-                     <group>
-                        <field name="name"
-                            filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
-                            string="Language"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="direction"/>
-                    </group>
+                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]" string="Language"/>
+                    <field name="direction"/>
+                    <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 5d6ed868911..bba6b921833 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -241,27 +241,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Partner">
-                   <group col='10' colspan='4'>
-                        <field name="name" 
-                            filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
-                            string="Partner"/>
-                        <separator orientation="vertical"/>
-                        <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
-                        <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
-                        <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
-                        <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-                        <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>                        
-                        <separator orientation="vertical"/>
-                        <field name="category_id"/>
-                        <field name="user_id"/>
-                        <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
-                   </group>
-                   <newline />
-                   <group expand="0" string="Group By...">
-                       <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-                       <filter string="Company" context="{'group_by': 'parent_id'}"/>
-                   </group>
-               </search>
+                    <field name="name" filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]" string="Partner"/>
+                    <field name="category_id"/>
+                    <field name="user_id"/>
+                    <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
+                    <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
+                    <separator/>
+                    <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
+                    <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
+                    <separator/>
+                    <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                    <separator/>
+                    <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>                        
+                    <group expand="0" string="Group By...">
+                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                        <filter string="Company" context="{'group_by': 'parent_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/openerp/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml
index 74a17a98ce7..5608b702e8a 100644
--- a/openerp/addons/base/res/res_widget_view.xml
+++ b/openerp/addons/base/res/res_widget_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <search string="Search Widget">
                     <field name="title" string="Widget"/>
-                 </search>
+                </search>
             </field>
         </record>
         <record id="res_widget_form" model="ir.ui.view">

From bda8a855313ae2e4b4855a5cea389205279caf0f Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 14:52:11 +0530
Subject: [PATCH 080/312] [IMP]Improve search view in fetchmail module

bzr revid: tch@tinyerp.com-20120719092211-nn3gmuuo2jwfgjf6
---
 addons/fetchmail/fetchmail_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 9567f7746f3..3325ae38c0b 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -80,10 +80,9 @@
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
                     <field name="name" string="Incoming Mail Server"/>
-                    <separator orientation="vertical"/>
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
-                    <separator orientation="vertical"/>
+                    <separator/>
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
                 </search>
             </field>

From 6ee8246ce246c6e26ff73b374e3ede8d69faa906 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 15:14:51 +0530
Subject: [PATCH 081/312] [IMP] remove applied widget on fields in search
 views.

bzr revid: tpa@tinyerp.com-20120719094451-wgk7b5t160gz7vul
---
 openerp/addons/base/ir/ir.xml                     | 10 +++-------
 openerp/addons/base/ir/workflow/workflow_view.xml |  4 ++--
 openerp/addons/base/res/res_company_view.xml      |  4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 857b5dd8d80..eebfa99985a 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -68,9 +68,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Client Actions">
-                    <field name="name"
-                        filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
-                        string="Client Action"/>
+                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]" string="Client Action"/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
@@ -561,9 +559,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wizards">
-                    <field name="name"
-                        filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]"
-                        string="Wizard"/>
+                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]" string="Wizard"/>
                 </search>
             </field>
         </record>
@@ -1416,7 +1412,7 @@
             <field name="arch" type="xml">
                 <search string="Scheduled Actions">
                     <field name="name" string="Scheduled Action"/>
-                    <field name="user_id" widget="selection"/>
+                    <field name="user_id"/>
                     <field name="nextcall"/>
                     <field name="active"/>
                     <group expand="0" string="Group By...">
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index 4a57e71a8f7..9ec977199eb 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -295,7 +295,7 @@
         <field name="arch" type="xml">
             <search string="Workflow Instances">
                 <field name="res_type" string="Resource Object"/>
-                <field name="wkf_id" widget="selection"/>
+                <field name="wkf_id"/>
                 <field name="res_id"/>
                 <field name="state"/>
                 <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
@@ -358,7 +358,7 @@
         <field name="arch" type="xml">
             <search string="Workflow Workitems">
                 <field name="state" string="State"/>
-                <field name="wkf_id" widget="selection"/>
+                <field name="wkf_id"/>
                 <field name="act_id"/>
                 <field name="subflow_id"/>
                 <field name="inst_id"/>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 6e46ce4e073..8637da10f4c 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -178,8 +178,8 @@
             <field name="arch" type="xml">
                 <search string="Multi Company">
                     <field name="name" string="Name"/>
-                    <field name="company_id" widget="selection"/>
-                    <field name="company_dest_id" widget="selection"/>
+                    <field name="company_id"/>
+                    <field name="company_dest_id"/>
                     <field name="object_id"/>
                 </search>
             </field>

From bd88cc7a5ce75b66ff8f931d1bb3b827311307cf Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 15:18:02 +0530
Subject: [PATCH 082/312] [IMP]Improve search view in idea module

bzr revid: tch@tinyerp.com-20120719094802-nj1vw1fbyl83tz3o
---
 addons/idea/idea_view.xml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index ec7f0e6d328..2db044fc9a2 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -110,22 +110,15 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas">
-                <group>
-                    <field name="name" string="Idea"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
-                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
-                    <filter icon="terp-check" string="Accepted"
+                <field name="name" string="Idea"/>
+                <field name="category_ids"/>
+                <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
+                <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
+                <filter icon="terp-check" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
-                    <separator orientation="vertical"/>
-                    <field name="category_ids"/>
-                </group>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-stock_effects-object-colorize" string="Status" help="By States" context="{'group_by':'state'}"/>
                 </group>
             </search>

From 16eaa629df67a87b740ab4b52e1dfbdd1fbc234b Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 15:41:03 +0530
Subject: [PATCH 083/312] [IMP]Improve search view in lunch module

bzr revid: tch@tinyerp.com-20120719101103-pyrmwwuwpr3ag9zm
---
 addons/lunch/lunch_view.xml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 5e870c085c9..40231d6c948 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -76,12 +76,9 @@
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
                     <field name="date"/>
-                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
                     </group>
@@ -192,12 +189,9 @@
                 <search string="Search CashMove">
                     <field name="create_date"/>
                     <field name="user_cashmove"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Box" icon="terp-dolar" domain="[]"  context="{'group_by':'box'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-today" domain="[]"  context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
@@ -375,14 +369,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
-                    <group>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="box"/>
-                        <field name="amount"/>
-                    </group>
-                    <newline/>
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="box"/>
+                    <field name="amount"/>
                     <group expand="0" string="Group By...">
                         <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
                     </group>

From 8cdc899237366ba8c311ea0dbae082e94eb12f42 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 15:57:24 +0530
Subject: [PATCH 084/312] [IMP]Improve search view in share module

bzr revid: tch@tinyerp.com-20120719102724-0h31wws3g62vhltn
---
 addons/share/res_users_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index defbc522340..f70177f5fe3 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -8,7 +8,6 @@
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
-                    <separator orientation="vertical"/>
                     <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
                         domain="[('share','=',False)]"/>
                 </xpath>
@@ -32,11 +31,9 @@
             <field name="arch" type="xml">
                 <search string="Groups">
                     <field name="name" string="Group"/>
-                    <separator orientation="vertical"/>
+                    <field name="share"/>
                     <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
                         domain="[('share','=',False)]"/>
-                    <separator orientation="vertical"/>
-                    <field name="share"/>
                 </search>
             </field>
         </record>

From dae2bed5c72e27757a9fe66bab3c125b89d6bb3f Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 16:03:48 +0530
Subject: [PATCH 085/312] [IMP]Improve search view in multi_company module

bzr revid: tch@tinyerp.com-20120719103348-zi212xlqmwwt2tqb
---
 addons/multi_company/res_company_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index 169f42d640e..5ea323175e6 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -51,9 +51,8 @@
             <field name="arch" type="xml">
                 <search string="Multi Company">
                     <field name="name" string="Multi Company"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" widget="selection"/>
-                    <field name="company_dest_id" widget="selection"/>
+                    <field name="company_id"/>
+                    <field name="company_dest_id"/>
                     <field name="object_id"/>
                 </search>
             </field>

From 0d6d8b7482f7349ff4595878f99da50f794399f0 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 16:16:18 +0530
Subject: [PATCH 086/312] [IMP]Improve search view in subcription module

bzr revid: tch@tinyerp.com-20120719104618-98qn6guw0ngyn232
---
 addons/subscription/subscription_view.xml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 3271096a51a..1bbb10ce19a 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -73,23 +73,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Subscription">
-                    <group>
-                        <field name="name" string="Subscription"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_init"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check"
+                    <field name="name" string="Subscription"/>
+                    <field name="date_init"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <filter icon="terp-check"
                             string="Running"
                             domain="[('state','=','running')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="partner_id"/>
-                    </group>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>

From 2fa5b4c96d1bf9caa4274bdba3973622f43db159 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 16:21:36 +0530
Subject: [PATCH 087/312] [IMP] account:improved all search views

bzr revid: tpa@tinyerp.com-20120719105136-r1y1o5uq7es6mwkj
---
 addons/account/account_invoice_view.xml       |  32 +-
 addons/account/account_view.xml               | 364 +++++++-----------
 addons/account/project/project_view.xml       |  50 +--
 .../account_analytic_entries_report_view.xml  |  22 +-
 .../report/account_entries_report_view.xml    |  51 +--
 .../report/account_invoice_report_view.xml    |  65 +---
 6 files changed, 201 insertions(+), 383 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index c71a7d56aae..ff60f16b75f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -425,32 +425,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                    <group>
-                        <field name="number"
-                            string="Invoice"
-                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
-                        <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
-                        <separator orientation="vertical"/>
-                        <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
-                        <separator orientation="vertical"/>
-                        <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="user_id" widget="selection" string="Salesperson"/>
-                        <field name="journal_id" widget="selection"/>
-                        <field name="period_id" string="Period"/>
-                    </group>
-                    <newline/>
+                    <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="journal_id"/>
+                    <field name="period_id" string="Period"/>
+                    <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                    <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
+                    <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
+                    <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
+                    <separator/>
+                    <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>
                         <filter string="Due Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_due'}"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1e1f7b91851..703b61be301 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -63,15 +63,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Fiscalyear">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
-                        <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
-                        <separator orientation="vertical"/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/>
+                    <field name="state"/>
+                    <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
+                    <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -146,11 +141,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Period">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
-                        <separator orientation="vertical"/>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
-                    </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
+                    <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
                 </search>
             </field>
         </record>
@@ -217,18 +209,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
-                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
+                    <field name="user_type"/>
+                    <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
+                    <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
                         <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
                     </group>
@@ -440,21 +426,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
-                    <group>
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
-                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
                     <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    </group>
-                    <newline/>
                     <group expand="0" string="Group By...">
-                    <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
+                        <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+                        <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
                     </group>
                 </search>
             </field>
@@ -542,22 +522,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                    <group>
-                        <field name="name" string="Bank Statement"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                        <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
-                        <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
-                        <separator orientation="vertical"/>
-                        <field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
-                    </group>
-                    <newline/>
+                    <field name="name" string="Bank Statement"/>
+                    <field name="date"/>
+                    <field name="journal_id" domain="[('type', '=', 'cash')]" />
+                    <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                    <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
+                    <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                     </group>
                 </search>
@@ -587,22 +560,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                    <group>
-                        <field name="name" string="Bank Statement"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                        <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
-                        <separator orientation="vertical"/>
-                        <field name="period_id"/>
-                        <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
-                    </group>
-                    <newline/>
+                    <field name="name" string="Bank Statement"/>
+                    <field name="date"/>
+                    <field name="period_id"/>
+                    <field name="journal_id" domain="[('type', '=', 'bank')]" />
+                    <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                    <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
                     </group>
                 </search>
@@ -833,7 +799,7 @@
                 <search string="Account Tax Code">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Code"/>
                     <field name="parent_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
@@ -916,10 +882,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Taxes">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
@@ -1064,64 +1028,64 @@
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
                     <sheet> 
-	                    <group>
-	                        <group>
-		                        <field name="name"/>
-		                        <field name="ref"/>
-		                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-	                        </group>
-	                        <group>
-		                        <field name="journal_id"/>
-		                        <field name="period_id"/>
-		                        <field name="company_id" required="1" groups="base.group_multi_company"/>
-	                        </group>
-	                    </group>
-	                    <notebook colspan="4">
-	                        <page string="Information">
-	                            <group>
-	                                <group string="Amount">
-	                                    <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="quantity"/>
-	                                </group>
-	                                <group string="Accounting Documents">
-	                                    <field name="invoice" readonly="True"/>
-	                                    <field name="move_id" required="False"/>
-	                                    <field name="statement_id" readonly="True"/>
-	                                </group>
-	                                <group string="Dates">
-	                                    <field name="date"/>
-	                                    <field name="date_maturity"/>
-	                                    <field name="date_created" readonly="True"/>
-	                                </group>
-	                                <group string="Taxes">
-	                                    <field name="tax_code_id"/>
-	                                    <field name="tax_amount"/>
-	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-	                                </group>
-	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
-	                                    <field name="currency_id"/>
-	                                    <field name="amount_currency"/>
-	                                </group>
-	                                <group string="Reconciliation">
-	                                    <field name="reconcile_id"/>
-	                                    <field name="reconcile_partial_id"/>
-	                                </group>
-	                                <group string="States">
-	                                    <field name="state"/>
-	                                    <field name="blocked"/>
-	                                </group>
-	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
-	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
-	                                </group>
-	                            </group>
-	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
-	                        </page>
-	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
-	                        </page>
-	                    </notebook>
+                      <group>
+                          <group>
+                            <field name="name"/>
+                            <field name="ref"/>
+                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                          </group>
+                          <group>
+                            <field name="journal_id"/>
+                            <field name="period_id"/>
+                            <field name="company_id" required="1" groups="base.group_multi_company"/>
+                          </group>
+                      </group>
+                      <notebook colspan="4">
+                          <page string="Information">
+                              <group>
+                                  <group string="Amount">
+                                      <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                                      <field name="debit"/>
+                                      <field name="credit"/>
+                                      <field name="quantity"/>
+                                  </group>
+                                  <group string="Accounting Documents">
+                                      <field name="invoice" readonly="True"/>
+                                      <field name="move_id" required="False"/>
+                                      <field name="statement_id" readonly="True"/>
+                                  </group>
+                                  <group string="Dates">
+                                      <field name="date"/>
+                                      <field name="date_maturity"/>
+                                      <field name="date_created" readonly="True"/>
+                                  </group>
+                                  <group string="Taxes">
+                                      <field name="tax_code_id"/>
+                                      <field name="tax_amount"/>
+                                      <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                  </group>
+                                  <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+                                      <field name="currency_id"/>
+                                      <field name="amount_currency"/>
+                                  </group>
+                                  <group string="Reconciliation">
+                                      <field name="reconcile_id"/>
+                                      <field name="reconcile_partial_id"/>
+                                  </group>
+                                  <group string="States">
+                                      <field name="state"/>
+                                      <field name="blocked"/>
+                                  </group>
+                                  <group groups="analytic.group_analytic_accounting" string="Analytic">
+                                      <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+                                  </group>
+                              </group>
+                              <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
+                          </page>
+                          <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
+                              <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+                          </page>
+                      </notebook>
                     </sheet>
                 </form>
             </field>
@@ -1195,38 +1159,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
-                    <group>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
-                        <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
-                        <separator orientation="vertical"/>
-                        <filter
-                            icon="terp-dolar_ok!"
-                            string="Unreconciled"
-                            domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
-                            name="unreconciled"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="move_id" string="Number (Move)"/>
-                        <field name="account_id"/>
-                        <field name="partner_id"/>
-                        <field name="journal_id" widget="selection" context="{'journal_id':self}"/>
-                        <field name="period_id" context="{'period_id':self}"/>
-                    </group>
-                    <newline/>
+                    <field name="date"/>
+                    <field name="move_id" string="Number (Move)"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id" context="{'journal_id':self}"/>
+                    <field name="period_id" context="{'period_id':self}"/>
+                    <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
+                    <separator/>
+                    <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
+                    <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
+                    <separator/>
+                    <filter icon="terp-dolar_ok!" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" name="unreconciled"/>
+                    <separator/>
+                    <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Account"  icon="terp-folder-green" context="{'group_by':'account_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                     </group>
-                    <newline/>
                 </search>
             </field>
         </record>
@@ -1444,27 +1396,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Move">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="journal_id" widget="selection"/>
-                        <field name="period_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
+                    <separator/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -1673,16 +1617,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
-                    <group>
-                        <field name="name" string="Journal Entry Model"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
-                        <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="journal_id" widget="selection"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Journal Entry Model"/>
+                    <field name="journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
+                    <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
@@ -1852,17 +1791,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
-                    <group>
-                        <field name="name" string="Account Subscription"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_start"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
-                        <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
-                        <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Account Subscription"/>
+                    <field name="date_start"/>
+                    <field name="model_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
+                    <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -2119,17 +2052,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
-                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="parent_id"/>
-                        <field name="user_type"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
+                    <field name="parent_id"/>
+                    <field name="user_type"/>
+                    <field name="type"/>
+                    <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
+                    <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
@@ -2188,20 +2116,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
-                    <group>
-                        <field name="name" string="Account Template"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_root_id"/>
-                        <field name="bank_account_view_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Account Template"/>
+                    <field name="account_root_id"/>
+                    <field name="bank_account_view_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
                         <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
                         <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
                         <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
                     </group>
@@ -2310,14 +2232,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
-                        <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
-                        <separator orientation="vertical"/>
-                        <field name="chart_template_id"/>
-                    </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
+                    <field name="chart_template_id"/>
+                    <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
+                    <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                 </search>
             </field>
         </record>
@@ -2353,11 +2271,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search tax template">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
-                        <field name="parent_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
+                    <field name="parent_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
                     </group>
@@ -2789,16 +2704,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Report">
-                    <group>
-                        <field name="name" string="Account Report"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_report_id"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Account Report"/>
+                    <field name="account_report_id"/>
+                    <field name="type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 5c1542abc29..ba028899506 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -30,22 +30,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Account">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
-                        <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="user_id" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+                    <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
                     </group>
@@ -182,27 +175,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
-                    <group>
-                        <field name="name" string="Analytic Line"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
-                        <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
-                        <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
-                        <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_id"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Analytic Line"/>
+                    <field name="date"/>
+                    <field name="account_id"/>
+                    <field name="user_id"/>
+                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
+                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
+                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                    <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                     <group string="Group By..." expand="0">
                         <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
                         <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                        <separator orientation="vertical"/>
                         <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
-                        <separator orientation="vertical"/>
                         <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
                     </group>
                 </search>
@@ -303,11 +288,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Journals">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
+                    <field name="type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 7c9870ca07e..dd927928600 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -34,31 +34,21 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
-                <group>
-                    <field name="day" string="Day"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
-                    <separator orientation="vertical"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="product_id" />
-                    <field name="user_id"/>
-                </group>
-                <newline/>
+                <field name="day" string="Day"/>
+                <field name="date"/>
+                <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                <field name="product_id" />
+                <field name="user_id"/>
+                <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                     <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 54275f6a4b3..ba2ddf6782d 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -67,54 +67,35 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Entries Analysis">
-                <group>
-                    <field name="date"/>
-                    <field name="date_created"/>
-                    <field name="date_maturity"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-year" string="This F.Year"
-                            name="thisyear"
-                            context="{'year':'current_year'}"
-                            help="Journal Entries with period in current year"/>
-                    <filter icon="terp-go-month" string="This Period"
-                            name="period"
-                            context="{'period':'current_period'}"
-                            help="Journal Entries with period in current period"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
-                    <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
-                    <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
-                    <separator orientation="vertical"/>
-                    <field name="account_id"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="period_id"/>
-                </group>
-                 <newline/>
-                 <group expand="0" string="Extended Filters...">
+                <field name="date"/>
+                <field name="date_created"/>
+                <field name="date_maturity"/>
+                <field name="account_id"/>
+                <field name="journal_id" widget="selection"/>
+                <field name="period_id"/>
+                <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/>
+                <filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/>
+                <separator/>
+                <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
+                <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
+                <separator/>
+                <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
+                <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
+                <group expand="0" string="Extended Filters...">
                     <field name="fiscalyear_id"/>
-                    <separator orientation="vertical"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                 </group>
-                <newline/>
+                </group>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/>
                     <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/>
                     <filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 7d6a4003b53..21d03968d8a 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -55,68 +55,33 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
-                <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Draft"
-                           icon="terp-document-new"
-                           domain="[('state','=','draft')]"
-                           help = "Draft Invoices"/>
-                    <filter string="Pro-forma"
-                           icon="terp-gtk-media-pause"
-                           domain="['|', ('state','=','proforma'),('state','=','proforma2')]"
-                           help = "Pro-forma Invoices"/>
-                    <filter string="Invoiced"
-                           name="current"
-                           icon="terp-check"
-                           domain="[('state','not in', ('draft','cancel'))]"
-                           help = "Open and Paid Invoices"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-personal" string="Customer"
-                           name="customer"
-                           domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
-                           help="Customer Invoices And Refunds"/>
-                    <filter icon="terp-personal"
-                           string="Supplier"
-                           domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
-                           help="Supplier Invoices And Refunds"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-dolar" string="Invoice"
-                           domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
-                           help="Customer And Supplier Invoices"/>
-                    <filter icon="terp-dolar_ok!"
-                           string="Refund"
-                           domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
-                           help="Customer And Supplier Refunds"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" />
-                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
-                </group>
-                <newline/>
+                <field name="date"/>
+                <field name="partner_id"/>
+                <field name="user_id" />
+                <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
+                <filter icon="terp-go-year" string="Year" name="year" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="year"/>
+                <separator/>
+                <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
+                <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="['|', ('state','=','proforma'),('state','=','proforma2')]" help = "Pro-forma Invoices"/>
+                <filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Open and Paid Invoices"/>
+                <separator/>
+                <filter icon="terp-personal" string="Customer" name="customer" domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]" help="Customer Invoices And Refunds"/>
+                <filter icon="terp-personal" string="Supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" help="Supplier Invoices And Refunds"/>
+                <separator/>
+                <filter icon="terp-dolar" string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" help="Customer And Supplier Invoices"/>
+                <filter icon="terp-dolar_ok!" string="Refund" domain="['|', ('type','=','out_refund'),('type','=','in_refund')]" help="Customer And Supplier Refunds"/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
                     <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
                     <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
                     <filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>

From ab213ad2617df8e06f0c291edd6c98ccfb5e43fd Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 16:27:19 +0530
Subject: [PATCH 088/312] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120719105719-x0rvgw3eg4mbjcck
---
 addons/account/report/account_entries_report_view.xml  | 2 +-
 addons/account/report/account_treasury_report_view.xml | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index ba2ddf6782d..fbe44ee8d12 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -71,7 +71,7 @@
                 <field name="date_created"/>
                 <field name="date_maturity"/>
                 <field name="account_id"/>
-                <field name="journal_id" widget="selection"/>
+                <field name="journal_id"/>
                 <field name="period_id"/>
                 <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/>
                 <filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/>
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index 9e07c196f3c..f0096b561bb 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -36,12 +36,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Treasury Analysis">
-                <group>
-                    <field name="fiscalyear_id"/>
-                    <field name="period_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </group>
-                <newline/>
+                <field name="fiscalyear_id"/>
+                <field name="period_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
             </search>
         </field>
     </record>

From 9636f66902bbd48f371979543a82b45b8a61fb82 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 16:39:20 +0530
Subject: [PATCH 089/312] [IMP]Improve search view in survey module

bzr revid: tch@tinyerp.com-20120719110920-17ut2kr7f3tbrjo4
---
 addons/survey/survey_view.xml | 46 ++++++++++++-----------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 20f6f42a929..29114f8c000 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -275,20 +275,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey">
-                   <group>
-                        <field name="title" string="Survey"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
-                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
-                        <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
-                        <separator orientation="vertical"/>
-                        <field name="type" widget="selection"/>
-                        <field name="responsible_id"/>
-                   </group>
-                   <newline/>
+                    <field name="title" string="Survey"/>
+                    <field name="type"/>
+                    <field name="responsible_id"/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
+                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
+                    <separator/>
+                    <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                    <group expand="0" string="Group By...">
                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
-                        <separator orientation="vertical"/>
                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                    </group>
@@ -551,9 +546,7 @@
             <field name="arch" type="xml">
                 <search string="Search Survey Page">
                     <field name="title" string="Page"/>
-                    <separator orientation="vertical"/>
                     <field name="survey_id"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
                     </group>
@@ -757,11 +750,9 @@
             <field name="arch" type="xml">
                 <search string="Search Question">
                     <field name="question" string="Question"/>
-                    <separator orientation="vertical"/>
                     <field name="page_id"/>
-                    <field name="survey" widget="selection"/>
+                    <field name="survey"/>
                     <field name="type"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'page_id'}"/>
                     </group>
@@ -1178,22 +1169,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey">
-                   <group>
-                        <field name="email" string="Survey"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
-                        <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
-                        <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="survey_id" widget="selection"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="email" string="Survey"/>
+                    <field name="survey_id" widget="selection"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
+                    <separator/>
+                    <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                    <separator/>
+                    <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                     </group>
                </search>

From 6de16a5adbf7a131f691cbdf6477467f975bd3b7 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 16:46:22 +0530
Subject: [PATCH 090/312] [IMP] account_analytic_analysis:improved search
 view,.

bzr revid: tpa@tinyerp.com-20120719111622-1mxwu5c9zgs5jexd
---
 .../account_analytic_analysis_menu.xml        | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 8f86e9eeedc..ef9fbcdf130 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -19,32 +19,24 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Account">
-                    <group col="8" colspan="4">
-                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
-                        <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
-                            name="renew"
-                            help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
-                        <separator orientation="vertical"/>
-                        <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
-                        <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
+                    <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
+                    <separator/>
+                    <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" name="renew"
+                        help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
+                    <separator/>
+                    <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                    <separator/>
+                    <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date_start'}" />
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                     </group>

From a1a2b4f16c03ef68ef6a86fe3c400209572df5e3 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 19 Jul 2012 17:08:55 +0530
Subject: [PATCH 091/312] [IMP]Improve search view in membership module

bzr revid: tch@tinyerp.com-20120719113855-ychvggfk9s8teigo
---
 addons/membership/membership_view.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9c566a69bde..d4877e4d290 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -15,14 +15,10 @@
             <field name="arch" type="xml">
                 <search string="Membership Products">
                     <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/>
-                    <separator orientation="vertical"/>
+                    <field name="categ_id" operator="child_of"/>
                     <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
-                    <separator orientation="vertical"/>
-                    <field name="categ_id" widget="selection" operator="child_of"/>
-                    <newline/>
                     <group  expand='0' string='Group by...'>
                         <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
-                        <separator orientation="vertical"/>
                         <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
                     </group>
                 </search>
@@ -173,17 +169,16 @@
                 <search string="Membership Partners">
                     <field name="membership_start" invisible="1"/>
                     <field name="membership_stop" string="End Membership Date"/>
-                    <separator orientation="vertical"/>
                     <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                    <separator/>
                     <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                    <separator/>
                     <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
                     <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
                     <group expand="0" string="Group By..." colspan="10" col="8">
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
                         <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
-                        <separator orientation="vertical"/>
                         <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
                         <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
                     </group>

From 725ab84da9b99bcce1e066741e6a2820cb55413d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 17:24:40 +0530
Subject: [PATCH 092/312] [IMP] remove unnecessary changes.

bzr revid: tpa@tinyerp.com-20120719115440-ccc0whtkrnlv2e9j
---
 addons/account/account_view.xml | 118 ++++++++++++++++----------------
 1 file changed, 60 insertions(+), 58 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 703b61be301..d903b41e6d4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1028,69 +1028,71 @@
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
                     <sheet> 
-                      <group>
-                          <group>
-                            <field name="name"/>
-                            <field name="ref"/>
-                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-                          </group>
-                          <group>
-                            <field name="journal_id"/>
-                            <field name="period_id"/>
-                            <field name="company_id" required="1" groups="base.group_multi_company"/>
-                          </group>
-                      </group>
-                      <notebook colspan="4">
-                          <page string="Information">
-                              <group>
-                                  <group string="Amount">
-                                      <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-                                      <field name="debit"/>
-                                      <field name="credit"/>
-                                      <field name="quantity"/>
-                                  </group>
-                                  <group string="Accounting Documents">
-                                      <field name="invoice" readonly="True"/>
-                                      <field name="move_id" required="False"/>
-                                      <field name="statement_id" readonly="True"/>
-                                  </group>
-                                  <group string="Dates">
-                                      <field name="date"/>
-                                      <field name="date_maturity"/>
-                                      <field name="date_created" readonly="True"/>
-                                  </group>
-                                  <group string="Taxes">
-                                      <field name="tax_code_id"/>
-                                      <field name="tax_amount"/>
-                                      <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-                                  </group>
-                                  <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
-                                      <field name="currency_id"/>
-                                      <field name="amount_currency"/>
-                                  </group>
-                                  <group string="Reconciliation">
-                                      <field name="reconcile_id"/>
-                                      <field name="reconcile_partial_id"/>
-                                  </group>
-                                  <group string="States">
-                                      <field name="state"/>
-                                      <field name="blocked"/>
-                                  </group>
-                                  <group groups="analytic.group_analytic_accounting" string="Analytic">
-                                      <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
-                                  </group>
-                              </group>
-                              <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
-                          </page>
-                          <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-                              <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
-                          </page>
-                      </notebook>
+	                    <group>
+	                        <group>
+		                        <field name="name"/>
+		                        <field name="ref"/>
+		                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+	                        </group>
+	                        <group>
+		                        <field name="journal_id"/>
+		                        <field name="period_id"/>
+		                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+	                        </group>
+	                    </group>
+	                    <notebook colspan="4">
+	                        <page string="Information">
+	                            <group>
+	                                <group string="Amount">
+	                                    <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+	                                    <field name="debit"/>
+	                                    <field name="credit"/>
+	                                    <field name="quantity"/>
+	                                </group>
+	                                <group string="Accounting Documents">
+	                                    <field name="invoice" readonly="True"/>
+	                                    <field name="move_id" required="False"/>
+	                                    <field name="statement_id" readonly="True"/>
+	                                </group>
+	                                <group string="Dates">
+	                                    <field name="date"/>
+	                                    <field name="date_maturity"/>
+	                                    <field name="date_created" readonly="True"/>
+	                                </group>
+	                                <group string="Taxes">
+	                                    <field name="tax_code_id"/>
+	                                    <field name="tax_amount"/>
+	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+	                                </group>
+	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+	                                    <field name="currency_id"/>
+	                                    <field name="amount_currency"/>
+	                                </group>
+	                                <group string="Reconciliation">
+	                                    <field name="reconcile_id"/>
+	                                    <field name="reconcile_partial_id"/>
+	                                </group>
+	                                <group string="States">
+	                                    <field name="state"/>
+	                                    <field name="blocked"/>
+	                                </group>
+	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
+	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+	                                </group>
+	                            </group>
+	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
+	                        </page>
+	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
+	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+	                        </page>
+	                    </notebook>
                     </sheet>
                 </form>
             </field>
         </record>
 
+
+
         <record id="view_move_line_form2" model="ir.ui.view">
             <field name="name">account.move.line.form2</field>
             <field name="model">account.move.line</field>

From a07da0b861c92bb24bbd4e63bf536ab316e944ee Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 18:00:40 +0530
Subject: [PATCH 093/312] [IMP] account_analytic_default: improved search view.

bzr revid: tpa@tinyerp.com-20120719123040-fqnl34ybkxxr3ywf
---
 .../account_analytic_default_view.xml          | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index beb4dcbd34e..3e2ba0fe5f3 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -46,23 +46,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <group>
-                        <field name="date_stop"/>
-                        <separator orientation="vertical"/>
-                        <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="product_id"/>
-                        <field name="partner_id"/>
-                        <field name="user_id"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
-                    <newline/>
+                    <field name="date_stop"/>
+                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
                         <filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
-                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
                         <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
-                         <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}" groups="base.group_multi_company" />
                     </group>
                 </search>

From 7c8e109106c71d3335ac17c85e71a3084e711d34 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 18:14:12 +0530
Subject: [PATCH 094/312] [IMP] account_asset:improved search views.

bzr revid: tpa@tinyerp.com-20120719124412-lt25zu10r7vs5odm
---
 addons/account_asset/account_asset_view.xml   | 18 ++++--------
 .../report/account_asset_report_view.xml      | 28 ++++++-------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index dec5f3714d6..b91fdf7e0c1 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -65,7 +65,6 @@
         <field name="arch" type="xml">
             <search string="Search Asset Category">
                 <field name="name" string="Asset Category"/>
-                <separator orientation="vertical"/>
                 <field name="journal_id"/>
             </search>
         </field>
@@ -231,17 +230,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Account Asset">
-                <group col="10" colspan="12">
-                    <field name="name" string="Asset"/>
-                    <separator orientation="vertical"/>
-                    <field name="purchase_date"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
-                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
-                    <separator orientation="vertical"/>
-                    <field name="category_id"/>
-                    <field name="partner_id"/>
-                </group>
+                <field name="name" string="Asset"/>
+                <field name="purchase_date"/>
+                <field name="category_id"/>
+                <field name="partner_id"/>
+                <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
+                <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index 6cb138b072a..e916b7401df 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -43,34 +43,24 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Assets Analysis">
-                <group col="10" colspan="12">
-                    <field name="purchase_date"/>
-                    <field name="depreciation_date"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
-                    <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines"
-                        context="{'unposted_value_visible': 0}"/>
-                    <separator orientation="vertical"/>
-                    <field name="asset_id"/>
-                    <field name="asset_category_id"/>
-                </group>
-                <newline/>
+                <field name="purchase_date"/>
+                <field name="depreciation_date"/>
+                <field name="asset_id"/>
+                <field name="asset_category_id"/>
+                <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
+                <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
+                <separator/>
+                <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines" context="{'unposted_value_visible': 0}"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Asset" name="asset" context="{'group_by':'asset_id'}"/>
                     <filter string="Asset Category" name="asset_category" icon="terp-stock_symbol-selection" context="{'group_by':'asset_category_id'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical" />
                     <filter string="Purchase Date" icon="terp-go-month"
                             domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/>
-                    <separator orientation="vertical" />
                     <filter string="Depreciation Date" icon="terp-go-today"
                             domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/>
                 </group>

From 2e581cba31211698ac3db1792557edd448c5dc7d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 18:24:02 +0530
Subject: [PATCH 095/312] [IMP] account_bank_statement_extensions: improved
 serach view.

bzr revid: tpa@tinyerp.com-20120719125402-79mbmzfxkyfz6ix0
---
 .../account_bank_statement_view.xml           | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index a3185db2c92..e16e316b6b9 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -123,22 +123,16 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Bank Transactions">
-                <group>
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
-                    <separator orientation="vertical"/>
-                    <field name="val_date"/>
-                    <separator orientation="vertical"/>
-                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-                    <separator orientation="vertical"/>
-                    <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
-                    <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
-                    <separator orientation="vertical"/>
-                    <field name="journal_id"/>
-                    <field name="statement_id"/>
-                    <field name="globalisation_id" string="Glob. Id"/>
-                </group>
-                <newline/>
+                <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
+                <field name="val_date"/>
+                <field name="journal_id"/>
+                <field name="statement_id"/>
+                <field name="globalisation_id" string="Glob. Id"/>
+                <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                <separator/>
+                <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
+                <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
                 <group string="Extended Filters..." expand="0">
                     <field name="account_id"/>
                     <field name="partner_id"/>
@@ -146,7 +140,6 @@
                     <field name="globalisation_amount" string="Glob. Amount"/>
                     <field name="note"/>
                 </group>
-                <newline/>
                 <group string="Group By..." expand="1">
                     <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
                     <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>

From 3891b02ea34498a5282a14c0b7fe09a863e81640 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 18:33:44 +0530
Subject: [PATCH 096/312] [IMP] account_budget: improved search view.

bzr revid: tpa@tinyerp.com-20120719130344-tutghffvxwl7h8yu
---
 addons/account_budget/account_budget_view.xml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index db83df9c07f..1cf9d2b6919 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -19,7 +19,7 @@
             <field name="arch" type="xml">
                 <search string="Budgetary Position">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budgetary Position"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
@@ -201,17 +201,12 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Budget">
-                   <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
-                        <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
-                        <separator orientation="vertical"/>
-                        <field name="state"/>
-                    </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="state"/>
+                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
+                    <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
                 </search>
             </field>
         </record>

From 2bb4dba7453eea2f027b5203cdda854b40e326ea Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 18:44:22 +0530
Subject: [PATCH 097/312] [IMP] account_coda: improved search views.

bzr revid: tpa@tinyerp.com-20120719131422-utn1vqa8sxh61vds
---
 addons/account_coda/account_coda_view.xml | 75 ++++++++---------------
 1 file changed, 25 insertions(+), 50 deletions(-)

diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index bb2e833ce25..5af713a501d 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -12,18 +12,13 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="CODA Bank Account Configuration">
-                <field name="name"
-                    filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]"
-                    string="CODA Bank Account"/>
-                <separator orientation="vertical"/>
-                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
-                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
-                <separator orientation="vertical"/>
+                <field name="name" filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]" string="CODA Bank Account"/>
                 <field name="bank_id"/>
                 <field name="journal"/>
-                <field name="currency" widget="selection"/>
-                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                <newline/>
+                <field name="currency"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
                 <group expand="0" string="Group By...">
                     <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
                     <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
@@ -271,20 +266,15 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Search CODA Files">
-          <group col="10" colspan="4">
             <field name="coda_creation_date"/>
             <field name="date"/>
-            <field name="user_id" widget='selection'/>
-            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Group By...">
-            <filter string="CODA Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'coda_creation_date'}"/>
-            <separator orientation="vertical"/>
-            <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
-            <separator orientation="vertical"/>
-            <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-          </group>
+            <field name="user_id"/>
+            <field name="company_id" groups="base.group_multi_company"/>
+            <group expand="0" string="Group By...">
+                <filter string="CODA Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'coda_creation_date'}"/>
+                <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+            </group>
         </search>
       </field>
     </record>
@@ -389,20 +379,13 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search CODA Bank Statements">
-                <group col="8" colspan="4">
-                    <field name="name"
-                        string="CODA Bank Statement"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
-                    <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
-                    <separator orientation="vertical"/>
-                    <field name="period_id"/>
-                    <field name="coda_bank_account_id"/>
-                    <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
-                </group>
-                <newline/>
+                <field name="name" string="CODA Bank Statement"/>
+                <field name="date"/>
+                <field name="period_id"/>
+                <field name="coda_bank_account_id"/>
+                <field name="journal_id" domain="[('type', '=', 'bank')]"/>
+                <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
                 <group expand="0" string="Group By...">
                     <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                     <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
@@ -481,20 +464,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Bank Transactions">
-                <group col='6' colspan='4'>
-                    <field name="name"
-                        filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]"
-                        string="Bank Transaction"/>
-                    <separator orientation="vertical"/>
-                    <field name="val_date"/>
-                    <separator orientation="vertical"/>
-                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-                    <separator orientation="vertical"/>
-                    <field name="statement_id"/>
-                    <field name="globalisation_id" string="Glob. Id"/>
-                </group>
-                <newline/>
+                <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
+                <field name="val_date"/>
+                <field name="statement_id"/>
+                <field name="globalisation_id" string="Glob. Id"/>
+                <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
                 <group expand="0" string="Extended Filters...">
                     <field name="coda_bank_account_id"/>
                     <field name="account_id"/>

From 8f563574e372eeedacbedbea4c618e6682197094 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 18:57:44 +0530
Subject: [PATCH 098/312] [IMP] account_followup: improved search views.

bzr revid: tpa@tinyerp.com-20120719132744-qhxfacp5tkduqmyb
---
 .../account_followup_view.xml                 |  7 ++---
 .../report/account_followup_report.xml        | 29 ++++++-------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 9c11815e05b..3f6591953de 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -71,11 +71,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Follow-up">
-                    <group>
-                        <field name="name" string="Follow-up"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <field name="name" string="Follow-up"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 2bdf8eb74bf..dbdafdbeb0b 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -40,31 +40,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Follow-ups Sent">
-                    <group>
-                        <field name="date_move"/>
-                        <field name="date_move_last"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Fiscal year"
-                            name="fiscalyear"
-                            domain="[('period_id','in','current_year')]"
-                            help="Follow-up Entries with period in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" string="Not Litigation"
-                            domain="[('blocked','=', False)]"
-                            help = "Including journal entries marked as a litigation"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="balance"/>
-                    </group>
-                    <newline/>
+                    <field name="date_move"/>
+                    <field name="date_move_last"/>
+                    <field name="partner_id"/>
+                    <field name="balance"/>
+                    <filter icon="terp-go-year" string="This Fiscal year" name="fiscalyear" domain="[('period_id','in','current_year')]"
+                        help="Follow-up Entries with period in current year"/>
+                    <separator/>
+                    <filter icon="terp-camera_test" string="Not Litigation" domain="[('blocked','=', False)]"
+                        help = "Including journal entries marked as a litigation"/>
                     <group expand="1" string="Group By...">
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical"/>
                         <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
-                        <separator orientation="vertical"/>
                         <filter string="Follow-up Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
                         <filter string="Latest Follow-up Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
                     </group>
                 </search>

From a966da06ad82ae4a58757fad3eb8594d0964c741 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Jul 2012 19:03:37 +0530
Subject: [PATCH 099/312] [IMP] account_payment:improved search views

bzr revid: tpa@tinyerp.com-20120719133337-uclik6c9zzh4y73n
---
 .../account_payment/account_payment_view.xml  | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 1577d1b86bd..2ac5f8c49e2 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -47,12 +47,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Mode">
-                    <field name="name"
-                        string="Payment Mode"/>
-                    <separator orientation="vertical"/>
-                    <field name="journal" widget='selection'/>
-                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
-                    <newline/>
+                    <field name="name" string="Payment Mode"/>
+                    <field name="journal"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
                     </group>
@@ -216,20 +213,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
-                    <group>
-                        <field name="reference"
-                            string="Payment Order"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_done"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                        <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
-                        <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
-                        <separator orientation="vertical"/>
-                        <field name="mode" widget='selection'/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
+                    <field name="reference" string="Payment Order"/>
+                    <field name="mode" widget='selection'/>
+                    <field name="state"/>
+                    <field name="date_done"/>
+                    <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                    <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
+                    <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                     <group expand="0" string="Group By...">
                         <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>

From 9a7216b7bfab62829bea19b309d4fc0c44d27dac Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 19 Jul 2012 17:59:00 +0200
Subject: [PATCH 100/312] [IMP] add the group_no_one to the Portal's top menu
 item

bzr revid: abo@openerp.com-20120719155900-7cok7gh2b228nacf
---
 addons/portal/portal_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 74bf1711b7e..624dbaa618d 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -24,7 +24,7 @@
         <!-- Top menu item -->
         <menuitem name="Portal"
             id="portal_menu"
-            groups="portal.group_portal_member,anonymous.group_anonymous"
+            groups="base.group_no_one,portal.group_portal_member,anonymous.group_anonymous"
             sequence="20"/>
 
             <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>

From 041a0d7efee89f0e8566d585d19cfe9c3b13bbd3 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 19 Jul 2012 18:12:53 +0200
Subject: [PATCH 101/312] [IMP] we don't need inline actions: rights on
 Create/Edit/... buttons will be managed later

bzr revid: abo@openerp.com-20120719161253-9m5i9n2pjl0uov9o
---
 addons/portal/portal_data.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 624dbaa618d..74e08bc5343 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
 
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
@@ -18,7 +18,6 @@
             <field name="res_model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
             <field name="view_mode">form</field>
-            <field name="target">inline</field>
         </record>
 
         <!-- Top menu item -->

From f33c1dabe3faf2325629e3a7f968948896d0ac63 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 11:03:26 +0530
Subject: [PATCH 102/312] [IMP] account_voucher: improved search vies.

bzr revid: tpa@tinyerp.com-20120720053326-i5ufn19s1hl33w11
---
 .../account_voucher/account_voucher_view.xml  | 23 ++++------
 .../account_voucher_sales_receipt_view.xml    | 36 +++------------
 .../voucher_payment_receipt_view.xml          | 46 +++++++------------
 .../voucher_sales_purchase_view.xml           | 46 +++++++------------
 4 files changed, 47 insertions(+), 104 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index d1912a58d1c..50967f04c40 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -126,21 +126,14 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group>
-                        <field name="number" string="Voucher"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
-                        <field name="period_id"/>
-                    </group>
-                    <newline/>
+                    <field name="number" string="Voucher"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
+                    <field name="period_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 704135ba421..eda8b349943 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -48,48 +48,26 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
-              <group>
-                    <field name="date"/>
-                    <field name="date_due"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Draft"
-                           icon="terp-document-new"
-                           domain="[('state','=','draft')]"
-                           help = "Draft Vouchers"/>
-                    <filter string="Pro-forma"
-                           icon="terp-gtk-media-pause"
-                           domain="[('state','=','proforma')]"
-                           help = "Pro-forma Vouchers"/>
-                    <filter string="Posted"
-                           name="current"
-                           icon="terp-check"
-                           domain="[('state','not in', ('draft','cancel'))]"
-                           help = "Validated Vouchers"/>
-                   <separator orientation="vertical"/>
-                   <field name="partner_id"/>
-                </group>
-                <newline/>
+                <field name="date"/>
+                <field name="date_due"/>
+                <field name="partner_id"/>
+                <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Vouchers"/>
+                <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help = "Pro-forma Vouchers"/>
+                <filter string="Posted" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Validated Vouchers"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="journal_id" widget="selection"/>
                     <field name="account_id"/>
                     <field name="pay_now"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
                     <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 372d8aa1937..74926635679 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -8,21 +8,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group>
-                        <field name="number" string="Voucher"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id" string="Customer"/>
-                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
-                        <field name="period_id"/>
-                    </group>
-                   <newline/>
+                    <field name="number" string="Voucher"/>
+                    <field name="date"/>
+                    <field name="partner_id" string="Customer"/>
+                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
+                    <field name="period_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -40,21 +33,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group>
-                        <field name="number" string="Voucher"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id" string="Supplier"/>
-                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
-                        <field name="period_id"/>
-                    </group>
-                   <newline/>
+                    <field name="number" string="Voucher"/>
+                    <field name="date"/>
+                    <field name="partner_id" string="Supplier"/>
+                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
+                    <field name="period_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index bf1bca54447..902298a02e8 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -7,21 +7,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group>
-                        <field name="number" string="Voucher"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id" string="Supplier"/>
-                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
-                        <field name="period_id"/>
-                    </group>
-                    <newline/>
+                    <field name="number" string="Voucher"/>
+                    <field name="date"/>
+                    <field name="partner_id" string="Supplier"/>
+                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
+                    <field name="period_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -38,21 +31,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group>
-                        <field name="number" string="Voucher"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id" string="Customer"/>
-                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
-                        <field name="period_id"/>
-                    </group>
-                    <newline/>
+                    <field name="number" string="Voucher"/>
+                    <field name="date"/>
+                    <field name="partner_id" string="Customer"/>
+                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
+                    <field name="period_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>

From 3a4489bf07206f19d1f8b3907af4dec6de8ad980 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 11:13:07 +0530
Subject: [PATCH 103/312] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120720054307-fovy42a8urzdg95n
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 2 --
 addons/account_voucher/voucher_sales_purchase_view.xml  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 74926635679..ea62e536b9d 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -15,7 +15,6 @@
                     <field name="period_id"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -40,7 +39,6 @@
                     <field name="period_id"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 902298a02e8..cfc0977ea69 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -14,7 +14,6 @@
                     <field name="period_id"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -38,7 +37,6 @@
                     <field name="period_id"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>

From 49b24edcc7d2b93093cc267e786462b74da69ce3 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 11:27:12 +0530
Subject: [PATCH 104/312] [IMP] base_calendar: improved search views.

bzr revid: tpa@tinyerp.com-20120720055712-uqqaeyrz5o6y91ee
---
 addons/base_calendar/base_calendar_view.xml | 91 ++++++---------------
 addons/base_calendar/crm_meeting_view.xml   | 18 ++--
 2 files changed, 33 insertions(+), 76 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 76bb0c24cb5..5fdc3e89c73 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -84,40 +84,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <field name="email" string="Email"/>
-                   <separator orientation="vertical"/>
-                   <field name="event_date"/>
-                   <separator orientation="vertical"/>
-                   <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
-                       domain="[('state','=', 'needs-action')]"
-                       help="Invitations To Review" />
-                   <filter icon="terp-check" string="Accepted"
-                       domain="[('state','=', 'accepted')]"
-                       help="Accepted Invitations" />
-                   <filter icon="terp-dialog-close" string="Declined"
-                       domain="[('state','=', 'declined')]"
-                       help="Declined Invitations" />
-                   <filter icon="gtk-sort-descending" string="Delegated"
-                       domain="[('state','=', 'delegated')]"
-                       help="Delegated Invitations" />
-                   <separator orientation="vertical"/>
-                   <field name="user_id" string="Responsible"/>
-                   <separator orientation="vertical"/>
-                   <field name="cutype" string="Invitation type"/>
-                   <newline/>
+                    <field name="email" string="Email"/>
+                    <field name="event_date"/>
+                    <field name="user_id" string="Responsible"/>
+                    <field name="cutype" string="Invitation type"/>
+                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" />
+                    <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" />
+                    <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" />
+                    <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" />
                     <group expand="0" string="Group By...">
-                        <filter string="Responsible" icon="terp-personal" domain="[]"
-                            context="{'group_by':'user_id'}" />
-                        <filter string="Contact" icon="terp-personal" domain="[]"
-                            context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
-                            domain="[]" context="{'group_by':'cutype'}" />
-                        <filter string="Role" icon="terp-gtk-select-all"
-                            domain="[]" context="{'group_by':'role'}" />
-                        <filter string="Required Reply" icon="terp-mail-replied"
-                            domain="[]" context="{'group_by':'rsvp'}" />
-                        <separator orientation="vertical" />
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
+                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}" />
+                        <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}" />
+                        <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':'state'}" />
                     </group>
@@ -414,37 +394,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Events">
-                       <group>
-                           <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
-                           <separator orientation="vertical"/>
-                           <filter icon="terp-go-today" string="My Events"
-                               domain="[('user_id','=',uid)]"
-                               help="My Events" />
-                           <separator orientation="vertical"/>
-                           <filter icon="terp-check" string="Confirmed"
-                               domain="[('state','=','confirmed')]"
-                               help="Confirmed Events" />
-                           <separator orientation="vertical"/>
-                           <field name="user_id"/>
-                           <separator orientation="vertical"/>
-                           <field name="show_as"/>
-                           <field name="class" string="Privacy"/>
-                       </group>
-                       <newline/>
-                        <group expand="0" string="Group By...">
-                            <filter string="Responsible" icon="terp-personal" domain="[]"
-                                context="{'group_by':'user_id'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Availability" icon="terp-camera_test"
-                                domain="[]" context="{'group_by':'show_as'}" />
-                            <filter string="Privacy" icon="terp-locked"
-                                domain="[]" context="{'group_by':'class'}" />
-                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Date" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'date'}" />
-                        </group>
+                    <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
+                    <field name="user_id"/>
+                    <field name="show_as"/>
+                    <field name="class" string="Privacy"/>
+                    <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" />
+                    <separator/>
+                    <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" />
+                    <group expand="0" string="Group By...">
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" />
+                        <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index c58c27a9959..38c5235501e 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -302,18 +302,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Meetings">
-                <group>
-                    <field name="name" string="Meeting"
-                        filter_domain="[('name','ilike',self)]"/>
-                    <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new"
-                        name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
-                    <separator orientation="vertical"/>
-                    <filter string="My Meetings" help="My Meetings" icon="terp-personal"
-                        domain="[('user_id','=',uid)]"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    <field name="partner_ids"/>
-                </group>
+                <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
+                <field name="user_id"/>
+                <field name="partner_ids"/>
+                <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <separator/>
+                <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/>
             </search>
         </field>
     </record>

From 51180a1a02b3613f836c5e29f1e7d92f4f3298bb Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 11:37:15 +0530
Subject: [PATCH 105/312] [IMP] caldav: improved search view.

bzr revid: tpa@tinyerp.com-20120720060715-6dzj3576e7i3dwnd
---
 addons/caldav/caldav_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 02025ab5261..5a93fceabeb 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -159,15 +159,15 @@
             <field name="arch" type="xml">
                 <search string="Calendars">
                     <field name="name" string="Calendar"/>
-                    <separator orientation="vertical"/>
-                    <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
-                    <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
-                    <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
-                    <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id" widget="selection"/>
+                    <field name="user_id"/>
                     <field name="collection_id"/>
                     <field name="type"/>
+                    <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
+                    <separator/>
+                    <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
+                    <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
+                    <separator/>
+                    <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
                 </search>
             </field>
         </record>

From 57336b494f6f2492a5ce1875dd51403cdc4ab4e6 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 12:09:39 +0530
Subject: [PATCH 106/312] [IMP] crm:improved search views

bzr revid: tpa@tinyerp.com-20120720063939-37k1l812uxj6ukas
---
 addons/crm/crm_lead_view.xml                  | 107 +++++-------------
 addons/crm/crm_phonecall_view.xml             |  42 +++----
 addons/crm/crm_report_view.xml                |  54 ++++-----
 addons/crm/report/crm_lead_report_view.xml    | 107 +++++-------------
 .../crm/report/crm_phonecall_report_view.xml  |  70 ++++--------
 addons/crm/res_partner_view.xml               |   2 +-
 6 files changed, 115 insertions(+), 267 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f7bd27854f1..d4ea3c27892 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -51,7 +51,6 @@
             <field name="arch" type="xml">
                 <search string="Stage Search">
                     <field name="name" string="Stage Name"/>
-                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="type"/>
                 </search>
@@ -352,65 +351,37 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-mail-message-new"
-                    string="Inbox" help="Unread messages"
-                    name="needaction_pending"
-                    domain="[('needaction_pending','=',True)]"/>
                 <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
-                <field name="subjects"/>     
-                <separator orientation="vertical"/>
+                <field name="subjects"/>
                 <field name="create_date"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-check"
-                    string="New"
-                    name="new" help="New Leads"
-                    domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test"
-                    string="Open"
-                    name="open"
-                    domain="[('state','=','open')]"/>
-                <filter string="Unassigned Leads"
-                        icon="terp-personal-"
-                        domain="[('user_id','=', False)]"
-                        help="Unassigned Leads" />
-                <filter string="Leads Assigned to Me or My Team(s)"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
+                <field name="user_id"/>
+                <field name="section_id" context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
+                <separator/>
+                <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
+                <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
+                <separator/>
+                <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
+                <separator/>
+                <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="Leads that are assigned to one of the sale teams I manage, or to me"/>
-                <separator orientation="vertical"/>
-                <field name="user_id"/>
-                <field name="section_id" widget="selection"
-                    context="{'invisible_section': False}"/>
-                <field name="country_id" context="{'invisible_country': False}"/>
-                <separator orientation="vertical"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
-                        domain="[]" context="{'group_by':'type_id'}" />
-                    <filter string="Channel" icon="terp-call-start"
-                        domain="[]" context="{'group_by':'channel_id'}" />
-                    <separator orientation="vertical"/>
+                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
+                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical" groups="base.group_no_one"/>
-                    <filter string="Creation" help="Create date" icon="terp-go-month"
-                        domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                    <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
-                <separator orientation="vertical"/>
                 <group string="Display">
                     <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
-                    <filter string="Show Sales Team"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
+                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
                 </group>
            </search>
         </field>
@@ -608,57 +579,37 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
-                <filter icon="terp-mail-message-new"
-                    string="Inbox" help="Unread messages"
-                    name="needaction_pending"
-                    domain="[('needaction_pending','=',True)]"/>
                 <field name="name" string="Opportunity / Customer"
                     filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-check"
-                    string="New" help="New Opportunities"
-                    name="new"
-                    domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test"
-                    string="Open" help="Open Opportunities"
-                    name="open"
-                    domain="[('state','=','open')]"/>
-                <filter string="Unassigned Opportunities"
-                        icon="terp-personal-"
-                        domain="[('user_id','=', False)]"
-                        help="Unassigned Opportunities" />
-               <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        context="{'invisible_section': False}"
-                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
-                <separator orientation="vertical"/>
                 <field name="user_id"/>
                 <field name="country_id"/>
                 <field name="partner_id"/>
-                <field name="section_id"
-                    context="{'invisible_section': False, 'default_section_id': self}"/>
-                <newline/>
+                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <separator/>
+                <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
+                <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
+                <separator/>
+                <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
+                <separator/>
+                <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
+                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                     <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical" />
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                     <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                     <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                     <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
                     <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical" />
                     <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
                 <group string="Display">
-                    <filter string="Show Sales Team"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
+                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
                 </group>
             </search>
         </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index e83ad45d851..64b3686c807 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -215,40 +215,24 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-mail-message-new"
-                   string="Inbox" help="Unread messages"
-                   name="needaction_pending"
-                   domain="[('needaction_pending','=',True)]"/>
-               <separator orientation="vertical"/>
                <field name="name" string="Phonecalls"/>
-               <separator orientation="vertical"/>
                <field name="date"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-               <filter string="Unassigned Phonecalls"
-                       icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls"/>
-               <filter string="Phone Calls Assigned to Me or My Team(s)"
-                        icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="Phone Calls that are assigned to me or to my team(s)" />
-               <separator orientation="vertical"/>
                <field name="partner_id"/>
                <field name="user_id"/>
-               <field name="section_id"
-                   widget="selection" string="Sales Team"/>
-               <newline/>
+               <field name="section_id" string="Sales Team"/>
+               <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+               <separator/>
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+               <separator/>
+               <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
+               <separator/>
+               <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       help="Phone Calls that are assigned to me or to my team(s)" />
                <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
+                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
+                   <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                   <filter string="Creation" icon="terp-go-month" help="Creation Date" domain="[]" context="{'group_by':'create_date'}" />
+                   <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Date of Call" />
                </group>
            </search>
         </field>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index c3ccde5360b..f46be9b6dfa 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,15 +69,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                    <group>
-                        <field name="name"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                        <field name="section_id" widget="selection" />
-                        <field name="category2_id"/>
-                        <field name="nbr"/>
-                        <field name="state"/>
-                   </group>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="section_id"/>
+                    <field name="category2_id"/>
+                    <field name="nbr"/>
+                    <field name="state"/>
                </search>
             </field>
         </record>
@@ -157,14 +154,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
-                   <group>
-                        <field name="name"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                        <field name="section_id" widget="selection"/>
-                        <field name="nbr"/>
-                        <field name="state"/>
-                   </group>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="section_id"/>
+                    <field name="nbr"/>
+                    <field name="state"/>
                </search>
             </field>
         </record>
@@ -229,14 +223,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
-                    <group>
-                        <field name="name"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                        <field name="section_id" widget="selection"/>
-                        <field name="nbr"/>
-                        <field name="state"/>
-                    </group>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="section_id"/>
+                    <field name="nbr"/>
+                    <field name="state"/>
                </search>
             </field>
         </record>
@@ -318,14 +309,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
-                    <group>
-                        <field name="name"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                        <field name="section_id" widget="selection"/>
-                        <field name="nbr"/>
-                        <field name="state"/>
-                    </group>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="section_id"/>
+                    <field name="nbr"/>
+                    <field name="state"/>
                </search>
             </field>
     </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 142d44432f0..bffb7a31326 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -71,94 +71,47 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <group>
-                        <filter icon="terp-personal"
-                            name="lead"
-                            string="Lead"
-                            domain="[('type','=', 'lead')]"
-                            help="Show only lead"/>
-                        <filter icon="terp-personal+"
-                            string="Opportunity"
-                            name="opportunity"
-                            domain="[('type','=','opportunity')]"
-                            help="Show only opportunity"/>
-                        <separator orientation="vertical" />
-                        <filter icon="terp-check"
-                            string="New"
-                            domain="[('state','=','draft')]"
-                            help="Leads/Opportunities which are in New state"/>
-                        <filter icon="terp-camera_test"
-                            string="Open"
-                            domain="[('state','=','open')]"
-                            help="Leads/Opportunities which are in open state"/>
-                        <filter icon="gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"
-                            help="Leads/Opportunities which are in pending state"/>
-                        <filter icon="terp-dialog-close"
-                            string="Closed"
-                            domain="[('state','=','done')]"
-                            help="Leads/Opportunities which are in done state"/>
-                        <filter string="My Sales Team(s)" icon="terp-personal+"
-                                context="{'invisible_section': False}"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
-                        <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id"
-                            context="{'invisible_section': False}"/>
-                        <field name="user_id" string="Salesperson"/>
-                    </group>
-                    <newline/>
+                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
+                    <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
+                    <separator/>
+                    <filter icon="terp-check" string="New" domain="[('state','=','draft')]" help="Leads/Opportunities which are in New state"/>
+                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Leads/Opportunities which are in open state"/>
+                    <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Leads/Opportunities which are in pending state"/>
+                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/>
+                    <separator/>
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
+                            help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" />
-                        <field name="categ_id" widget="selection"/>
-                        <field name="type_id" widget="selection"/>
-                        <field name="channel_id" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <newline/>
+                        <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
+                        <field name="categ_id"/>
+                        <field name="type_id"/>
+                        <field name="channel_id"/>
+                        <field name="company_id"groups="base.group_multi_company"/>
                         <field name="create_date"/>
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesperson" name="user" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
+                        <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}"
-                            groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Category" name="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
-                            domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-call-start"
-                            domain="[]" context="{'group_by':'channel_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'creation_year'}"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'creation_month'}"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'creation_day'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Exp. Closing"  icon="terp-go-month"
-                            domain="[]" context="{'group_by':'deadline_month'}"/>
+                        <filter string="Category" name="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'creation_year'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'creation_month'}"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'creation_day'}"/>
+                        <filter string="Exp. Closing"  icon="terp-go-month" domain="[]" context="{'group_by':'deadline_month'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 3f28fb8730e..26db9c1df66 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -51,65 +51,37 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <filter icon="terp-gtk-go-back-rtl"
-                            string="Todo"
-                            domain="[('state','in',('draft','open'))]"
-                            help="Phone calls which are in draft and open state"/>
-                        <filter icon="terp-camera_test"
-                            string="Held"
-                            domain="[('state','=','done')]"
-                            help="Phone calls which are in closed state"/>
-                        <filter icon="gtk-media-pause"
-                            string="Not Held"
-                            domain="[('state','=','pending')]"
-                            help="Phone calls which are in pending state"/>
-                        <filter string="My Sales Team(s)"
-                                icon="terp-personal+"
-                                context="{'invisible_section': False}"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="Phone calls that are assigned to one of the sale teams I manage"/>
-                        <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
-                        <separator orientation="vertical"/>
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}"/>
-                        <field name="user_id" string="Salesperson"/>
-                    </group>
-                    <newline/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="Todo" domain="[('state','in',('draft','open'))]"
+                        help="Phone calls which are in draft and open state"/>
+                    <filter icon="terp-camera_test" string="Held" domain="[('state','=','done')]"
+                        help="Phone calls which are in closed state"/>
+                    <filter icon="gtk-media-pause" string="Not Held" domain="[('state','=','pending')]"
+                        help="Phone calls which are in pending state"/>
+                    <separator/>
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
+                            help="Phone calls that are assigned to one of the sale teams I manage"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
-                        <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>
-                        <newline/>
                         <field name="creation_date"/>
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesperson" name="Salesperson" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
+                        <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Date of call"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Month of call"/>
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" help="Year of call"/>
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of call"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of call"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of call"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 26c74427009..1637f799495 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -37,7 +37,7 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="category_id" position="after">
-                        <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1"/>
                     </field>
                     <xpath expr="//field[@name='user_id']" position="after">
                         <field name="country_id"/>

From 1e640993a7b0605a7dd7f7314f2b73225051bf89 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 12:59:40 +0530
Subject: [PATCH 107/312] [IMP] crm_claim: improved search views.

bzr revid: tpa@tinyerp.com-20120720072940-ec3r1we5bugpzlf0
---
 addons/crm_claim/crm_claim_view.xml           |  56 +++------
 .../report/crm_claim_report_view.xml          | 110 +++++-------------
 2 files changed, 44 insertions(+), 122 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 80e373160be..e16ed3d4029 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -199,50 +199,22 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                     <field name="name" string="Claims"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-check" string="New" name="current"
-                        domain="[('state','=','draft')]"
-                        help="New Claims"/>
-                    <filter icon="terp-camera_test"
-                        string="In Progress"
-                        domain="[('state','=','open')]"
-                        help="In Progress Claims"/>
-                    <filter icon="terp-gtk-media-pause"
-                        string="Pending"
-                        domain="[('state','=','pending')]"/>
-                    <filter string="Unassigned Claims"
-                            icon="terp-personal-"
-                            domain="[('user_id','=', False)]"
-                            help="Unassigned Claims" />
-                    <separator orientation="vertical"/>
                     <field name="partner_id"/>
-                    <field name="user_id" widget="selection"/>
-                    <newline/>
+                    <field name="user_id"/>
+                    <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/>
+                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+                    <separator/>
+                    <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
                     <group expand="0" string="Group By...">
-                        <filter string="Partner" icon="terp-partner"
-                            domain="[]" help="Partner"
-                            context="{'group_by':'partner_id'}"/>
-                        <filter string="Responsible" icon="terp-personal"
-                            domain="[]" help="Responsible User"
-                            context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Stage" icon="terp-stage"
-                            domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}"/>
-                        <filter string="Status"
-                            icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Claim Date" icon="terp-go-month"
-                            domain="[]" help="Claim Date"
-                            context="{'group_by':'date'}"/>
-                        <filter string="Deadline" icon="terp-go-month"
-                            domain="[]"
-                            context="{'group_by':'date_deadline'}"/>
-                        <filter string="Closure" icon="terp-go-month"
-                            domain="[]" help="Date Closed"
-                            context="{'group_by':'date_closed'}"  groups="base.group_no_one"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
+                        <filter string="Claim Date" icon="terp-go-month" domain="[]" help="Claim Date" context="{'group_by':'date'}"/>
+                        <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}"  groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index e92102f889d..e6d1b5a2cfe 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -53,93 +53,43 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <filter icon="terp-document-new"
-                            string="New"
-                            domain="[('state','=','draft')]"/>
-                        <filter icon="terp-camera_test"
-                            string="Open"
-                            domain="[('state','=','open')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"/>
-                        <filter string="My Sales Team(s)"
-                                icon="terp-personal+"
-                                context="{'invisible_section': False}"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        <filter string="My Company"
-                                icon="terp-go-home"
-                                context="{'invisible_section': False}"
-                                domain="[('section_id.user_id.company_id','=',uid)]"
-                                help="My company"/>
-                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        <separator orientation="vertical"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="user_id" string="Salesperson"/>
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}"/>
-                    </group>
-                    <newline/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+                    <separator/>
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+                    <separator/>
+                    <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                     <group  expand="0" string="Extended Filters...">
-                        <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
-                        <filter icon="gtk-cancel"
-                            string="Cancel"
-                            domain="[('state','=','cancel')]"/>
-                        <separator orientation="vertical"/>
                         <field name="partner_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="priority" />
-                        <field name="type_action" />
-                        <newline/>
+                        <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
+                        <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                        <field name="priority"/>
+                        <field name="type_action"/>
                         <field name="create_date" />
                         <field name="date_closed" />
                         <field name="date_deadline" />
+                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
                     </group>
-                    <newline/>
                     <group  expand="1" string="Group By...">
-                        <filter string="Salesperson" name="Salesperson" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <filter string="Partner" name="partner" icon="terp-partner"
-                            domain="[]" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Stage" icon="terp-stage" domain="[]"
-                            context="{'group_by':'stage_id'}" />
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                            context="{'group_by':'priority'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
-                            context="{'group_by':'type_action'}" help="Action Type"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"
-                            help="Date of claim"/>
-
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}"
-                            help="Month of claim"/>
-
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}"
-                            help="Year of claim"/>
+                        <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Partner" name="partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of claim"/>
                     </group>
                 </search>
             </field>

From 3b07f7ac910ca9071373f94e509dfa965f0939cb Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 14:19:15 +0530
Subject: [PATCH 108/312] [IMP] crm_fundraising: improved search views.

bzr revid: tpa@tinyerp.com-20120720084915-av9aye0qzur1lv68
---
 .../crm_fundraising/crm_fundraising_view.xml  | 56 ++++--------
 .../report/crm_fundraising_report_view.xml    | 88 +++++--------------
 2 files changed, 39 insertions(+), 105 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9e67a4001a7..6d7d491bfa3 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -172,50 +172,24 @@
                 <field name="type">search</field>
                 <field name="arch" type="xml">
                     <search string="Search Funds">
-                        <group>
                             <field name="name" string="Fund Description"/>
-                            <separator orientation="vertical" />
-                            <filter icon="terp-check" string="New"
-                                domain="[('state','=','draft')]" name="current"
-                                help="New Funds" />
-                            <filter icon="terp-camera_test" string="Open"
-                                domain="[('state','=','open')]"
-                                help="Open Funds" />
-                            <filter icon="terp-gtk-media-pause"
-                                string="Pending"
-                                domain="[('state','=','pending')]"
-                                help="Pending Funds" />
-                            <separator orientation="vertical" />
-                            <filter string="Unassigned"
-                                    icon="terp-personal-"
-                                    domain="[('user_id','=', False)]"
-                                    help="Unassigned" />
-                            <filter string="Assigned to Me or to My Sales Team(s)" 
-                                    icon="terp-personal+"
-                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
-                            <separator orientation="vertical" />
                             <field name="state"/>
-                            <field name="user_id" 
-                                widget="selection"/>
-                            <field name="section_id" widget="selection" string="Sales Team"/>
-                        </group>
-                        <newline/>
+                            <field name="user_id"/>
+                            <field name="section_id" string="Sales Team"/>
+                            <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
+                            <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
+                            <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
+                            <separator/>
+                            <filter string="Unassigned" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned" />
+                            <separator/>
+                            <filter string="Assigned to Me or to My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
                         <group expand="0" string="Group By...">
-                            <filter string="Partner" icon="terp-partner"
-                                domain="[]"
-                                context="{'group_by':'partner_id'}" />
-                            <filter string="Responsible" icon="terp-personal"
-                                domain="[]"
-                                context="{'group_by':'user_id'}" />
-                            <filter string="Category" help="Fund Category"
-                                icon="terp-stock_symbol-selection" domain="[]"
-                                context="{'group_by':'categ_id'}" />
-                            <filter string="Payment Mode" help="Payment Mode"
-                                icon="terp-dolar" domain="[]"
-                                context="{'group_by':'type_id'}" />
-                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
+                            <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
+                            <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                            <filter string="Category" help="Fund Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                            <filter string="Payment Mode" help="Payment Mode" icon="terp-dolar" domain="[]" context="{'group_by':'type_id'}" />
+                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         </group>
                     </search>
                 </field>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 5a3ed924567..3459495f671 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -77,74 +77,34 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <filter icon="terp-document-new"
-                            string="New"
-                            domain="[('state','=','draft')]"/>
-                        <filter icon="terp-camera_test"
-                            string="Open"
-                            domain="[('state','=','open')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"/>
-                        <filter string="My Sales Team(s)"
-                                icon="terp-personal+"
-                                context="{'invisible_section': False}"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        <filter string="My Company"
-                                icon="terp-go-home"
-                                context="{'invisible_section': False}"
-                                domain="[('section_id.user_id.company_id','=',uid)]"
-                                help="My company"/>
-                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        <separator orientation="vertical"/>
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="user_id" string="Salesperson"/>
-                    </group>
-                    <newline/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+                    <separator/>
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+                    <separator/>
+                    <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                     <group  expand="0" string="Extended Filters...">
-                        <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
-                        <filter icon="gtk-cancel"
-                            string="Cancel"
-                            domain="[('state','=','cancel')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="categ_id" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="create_date"/>
+                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
                     </group>
-                    <newline/>
                     <group  expand="1" string="Group By...">
-                        <filter string="Salesperson" name="Salesperson" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Payment Mode" help="Payment Mode"
-                            icon="terp-dolar" domain="[]"
-                            context="{'group_by':'type_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            groups="base.group_multi_company"
-                            context="{'group_by':'company_id'}" />
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"
-                            help="Date of fundraising"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}"
-                            help="Month of fundraising"/>
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                        <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Payment Mode" help="Payment Mode" icon="terp-dolar" domain="[]" context="{'group_by':'type_id'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" />
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of fundraising"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of fundraising"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" />
                     </group>
                 </search>
             </field>

From eeeca371e8d1ccd92aa790d12429828ac2beb0f1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 14:29:33 +0530
Subject: [PATCH 109/312] [IMP] improved view.

bzr revid: tpa@tinyerp.com-20120720085933-y92kzccb3vf3lpx2
---
 .../crm_fundraising/crm_fundraising_view.xml  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6d7d491bfa3..3abfbe89eab 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -172,18 +172,18 @@
                 <field name="type">search</field>
                 <field name="arch" type="xml">
                     <search string="Search Funds">
-                            <field name="name" string="Fund Description"/>
-                            <field name="state"/>
-                            <field name="user_id"/>
-                            <field name="section_id" string="Sales Team"/>
-                            <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
-                            <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
-                            <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
-                            <separator/>
-                            <filter string="Unassigned" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned" />
-                            <separator/>
-                            <filter string="Assigned to Me or to My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
+                        <field name="name" string="Fund Description"/>
+                        <field name="state"/>
+                        <field name="user_id"/>
+                        <field name="section_id" string="Sales Team"/>
+                        <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
+                        <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
+                        <separator/>
+                        <filter string="Unassigned" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned" />
+                        <separator/>
+                        <filter string="Assigned to Me or to My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
                         <group expand="0" string="Group By...">
                             <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                             <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />

From 7c6a92fe527a29f18575c2c95613fc6b9bf18624 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 14:34:47 +0530
Subject: [PATCH 110/312] [IMP] crm_helpdesk: improved search views.

bzr revid: tpa@tinyerp.com-20120720090447-106h9k49evywj6fl
---
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 60 ++++------------
 .../report/crm_helpdesk_report_view.xml       | 71 ++++++-------------
 2 files changed, 35 insertions(+), 96 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4c2d81f94e3..f9f17781a61 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -152,54 +152,24 @@
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
                     <field name="name" string="Query"/>
-                    <separator orientation="vertical"/>
                     <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-check" string="New"
-                        name="current"
-                        domain="[('state','=','draft')]"
-                        help="New Helpdesk Request" />
-                    <filter icon="terp-camera_test"
-                        string="Open"
-                        domain="[('state','=','open')]"
-                        help="Open Helpdesk Request"
-                    />
-                    <filter icon="terp-gtk-media-pause"
-                        string="Pending"
-                        domain="[('state','=','pending')]"
-                        help="All pending Helpdesk Request"
-                    />
-                    <filter string="Assigned to Me or My Sales Team(s)"
-                            icon="terp-personal+"
-                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
-                    <separator orientation="vertical"/>
                     <field name="partner_id" />
-                    <field name="user_id" widget="selection"/>
-                    <field name="section_id" widget="selection" string="Sales Team"/>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="section_id" string="Sales Team"/>
+                    <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Helpdesk Request" />
+                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Helpdesk Request" />
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="All pending Helpdesk Request" />
+                    <separator/>
+                    <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
                     <group expand="0" string="Group By...">
-                        <filter string="Partner" icon="terp-partner"
-                            domain="[]" help="Partner"
-                            context="{'group_by':'partner_id'}" />
-                        <filter string="Responsible" icon="terp-personal"
-                            domain="[]" help="Responsible User"
-                            context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]" help="Sales Team"
-                            context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical"/>
-                        <filter string="Priority" icon="terp-rating-rated"
-                            domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                            context="{'group_by':'state'}" />
-                        <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-go-month"
-                            domain="[]" help="Request Date"
-                            context="{'group_by':'date'}" />
-                        <filter string="Deadline" icon="terp-go-month"
-                            domain="[]"
-                            context="{'group_by':'date_deadline'}" />
+                        <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
+                        <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" help="Sales Team" context="{'group_by':'section_id'}" />
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Date" icon="terp-go-month" domain="[]" help="Request Date" context="{'group_by':'date'}" />
+                        <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}" />
                     </group>
                 </search>
             </field>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 6060c6c1f90..2c7a9f06654 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -53,65 +53,34 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <group>
-                        <filter string="New" icon="terp-check"
-                        domain="[('state','=','draft')]" />
-                        <filter string="Open" icon="terp-camera_test"
-                        domain="[('state','=','open')]" />
-                        <filter string="Closed" icon="terp-dialog-close"
-                        domain="[('state','=','cancel')]" />
-                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        <filter string="My Sales Team(s)"
-                            icon="terp-personal+"
-                            context="{'invisible_section': False}"
-                            domain="[('section_id.user_id','=',uid)]"
-                            help="My Sales Team(s)" />
-                        <filter string="My Company"
-                            icon="terp-go-home"
-                            context="{'invisible_section': False}"
-                            domain="[('section_id.user_id.company_id','=',uid)]"
-                            help="My company"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id" string="Salesperson"/>
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}"/>   
-                        <field name="company_id" groups="base.group_multi_company"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>   
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <filter string="New" icon="terp-check" domain="[('state','=','draft')]" />
+                    <filter string="Open" icon="terp-camera_test" domain="[('state','=','open')]" />
+                    <filter string="Closed" icon="terp-dialog-close" domain="[('state','=','cancel')]" />
+                    <separator/>
+                    <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                    <separator/>
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+                    <separator/>
+                    <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
-                        <newline/>
                         <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesperson" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <filter string="Partner" icon="terp-partner"
-                            domain="[]"
-                            context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            groups="base.group_multi_company"
-                            context="{'group_by':'company_id'}" />
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" />
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
                     </group>
                 </search>
             </field>

From a2c23b58e9296f699db79b506cf3e816d844dcea Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 14:49:50 +0530
Subject: [PATCH 111/312] [IMP] crm_partner_assign: improved search views.

bzr revid: tpa@tinyerp.com-20120720091950-4lp3v5cao65908ky
---
 addons/crm_partner_assign/crm_lead_view.xml   |  1 -
 .../report/crm_lead_report_view.xml           | 97 ++++++-------------
 .../report/crm_partner_report_view.xml        | 26 ++---
 3 files changed, 40 insertions(+), 84 deletions(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index c45002c085c..258b16cea93 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -62,7 +62,6 @@
                 </filter>
 
                 <field name="user_id" position="after">
-                    <separator orientation="vertical"/>
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index a34a9139c3c..1a012252966 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -9,75 +9,38 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <group>
-                        <filter icon="terp-check"
-                            string="Current"
-                            domain="[('state','in',('draft','open'))]"/>
-                        <filter icon="terp-dialog-close"
-                            string="Closed"
-                            domain="[('state','=','done')]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id"
-                            widget="selection"
-                            context="{'invisible_section': False}"/>
-                        <field name="grade_id"/>
-                        <field name="user_id"/>
-                        <field name="partner_assigned_id"/>
-                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters...">
-                      <field name="partner_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
-                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="creation_date"/>
-                      <field name="opening_date"/>
-                      <field name="date_closed"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                       <filter string="Salesperson" name="user" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
-                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
-                       <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Section" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'grade_id'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical" />
+                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="grade_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_assigned_id"/>
+                    <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
+                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
+                    <group  expand="0" string="Extended Filters...">
+                        <field name="partner_id"/>
+                        <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
+                        <field name="categ_id" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="creation_date"/>
+                        <field name="opening_date"/>
+                        <field name="date_closed"/>
+                    </group>
+                    <group  expand="1" string="Group By...">
+                        <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
+                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
+                        <filter string="Section" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'grade_id'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Assign Date" icon="terp-go-today"
-                            domain="[]"
-                            name="group_partner_date"
-                            context="{'group_by':'date_assign'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'year'}" />
-                  </group>
-
-               </search>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" />
+                        <filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" ontext="{'group_by':'date_assign'}"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" />
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" />
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index d652848f0fe..af811f8f869 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -9,36 +9,30 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Partner assigned Analysis">
-                    <group col="20" colspan="8">
-                        <field name="section_id"/>
-                        <field name="user_id"/>
-                        <field name="grade_id"/>
-                        <field name="activation"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                       <filter string="Salesperson" name="user" icon="terp-personal"
+                    <field name="section_id"/>
+                    <field name="user_id"/>
+                    <field name="grade_id"/>
+                    <field name="activation"/>
+                    <group  expand="1" string="Group By...">
+                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-                       <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
-                        <separator orientation="vertical" />
+                        <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
                         <filter string="Section" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
+                            domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Activation" name="group_activation" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'activation'}" />
                         <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'grade_id'}" />
                         <filter string="Partner" name="" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
                         <filter string="Date Invoice" name="group_period_id" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'period_id'}" />
                         <filter string="Date Partnership" name="group_date_partnership" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'date_partnership'}" />
                         <filter string="Date Review" name="group_date_review" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'date_review'}" />
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 

From 7a82e8b328473038445b1e66ba7e5822e3639c29 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 15:11:48 +0530
Subject: [PATCH 112/312] [IMP] document: improved search views.

bzr revid: tpa@tinyerp.com-20120720094148-cjz8aekkubtwj9g3
---
 addons/document/document_view.xml               | 16 +++-------------
 addons/document/report/document_report_view.xml |  9 ++-------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 1b1864cabe0..fa65d75c875 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -41,7 +41,6 @@
             <field name="arch" type="xml">
                 <search string="Search Document Storage">
                     <field name="name" string="Document Storage"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -172,20 +171,15 @@
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
                     <field name="name" string="Document Directory"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Static" domain="[('type','=','directory')]"/>
-                    <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
-                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
                     <field name="user_id" />
-                    <newline/>
+                    <filter string="Static" domain="[('type','=','directory')]"/>
+                    <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Storage" domain="[]" icon="terp-accessories-archiver" context="{'group_by':'storage_id'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" domain="[]" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                </search>
@@ -269,11 +263,7 @@
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
                 <xpath expr="//filter[@name='my_documents_filter']" position="replace">
-                    <filter name="my_documents_filter" 
-                            string="My Document(s)"
-                            icon="terp-personal"
-                            domain="[('user_id','=',uid)]"
-                            help="Filter on my documents"/>
+                    <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('user_id','=',uid)]" help="Filter on my documents"/>
                 </xpath>
                 <xpath expr="//field[@name='create_uid']" position="replace">
                     <field name="user_id"/>
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 98016d2fee2..6b3708d1a2f 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,13 +41,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                    <group>
-                        <field name="name"
-                            filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]"
-                            string="Users File"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                    </group>
+                    <field name="name" filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" string="Users File"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>

From 39258f40816337b78b1841f8770e21ca021dac31 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 15:18:47 +0530
Subject: [PATCH 113/312] [IMP] document_webdav: improved search views.

bzr revid: tpa@tinyerp.com-20120720094847-qpvfgw6y04978e17
---
 addons/document_webdav/webdav_view.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index 44af9f2af3a..35c37530f4d 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -38,10 +38,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name"
-                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
-                    string="Document property"/>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document property"/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
                         <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>
@@ -140,10 +137,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name"
-                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
-                    string="Document Property"/>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document Property"/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/>
                         <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>

From 29eb035bca501c500f351f684b4a916c439effaa Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 15:22:56 +0530
Subject: [PATCH 114/312] [IMP] email_template: improved search view.

bzr revid: tpa@tinyerp.com-20120720095256-qhjdl6jrtcw2qo1k
---
 addons/email_template/email_template_view.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index c05502cd3a0..dcfbc1bcc6b 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -122,16 +122,11 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Templates">
-                    <group>
-                        <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
-                        <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                        <field name="lang"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
+                    <field name="model_id"/>
+                    <field name="lang"/>
                     <group expand="0" string="Group by...">
                         <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
-                        <separator orientation="vertical"/>
                         <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
                     </group>
                </search>

From 2cc62cebee7335912731c859bb303f377c42386e Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 15:40:46 +0530
Subject: [PATCH 115/312] [IMP] hr: improved search views.

bzr revid: tpa@tinyerp.com-20120720101046-7a2ek2xg4brwmjb8
---
 addons/hr/hr_department_view.xml |  1 -
 addons/hr/hr_view.xml            | 20 +++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index bbf66f0d4c3..fcfbcba2497 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -44,7 +44,6 @@
             <field name="arch" type="xml">
                 <search string="Departments">
                     <field name="name" string="Department"/>
-                    <separator orientation="vertical"/>
                     <field name="manager_id" />
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0706da45c86..87df47eb718 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -109,16 +109,13 @@
             <field name="arch" type="xml">
                 <search string="Employees">
                     <field name="name" string="Employees"/>
-                    <separator orientation="vertical"/>
-                    <field name="department_id" widget="selection"/>
-                    <field name="job_id" widget="selection"/>
+                    <field name="department_id" />
+                    <field name="job_id"/>
                     <field name="parent_id"/>
                     <field name="category_ids"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -418,16 +415,9 @@
             <field name="arch" type="xml">
                 <search string="Jobs">
                     <field name="name" string="Job"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"
-                            domain="[('state','=','open')]"
-                            string="In Position"
-                            help="In Position"/>
-                    <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
-                        help="In Recruitment"/>
-                    <separator orientation="vertical"/>
-                    <field name="department_id" widget="selection"/>
-                    <newline />
+                    <field name="department_id"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','open')]" string="In Position" help="In Position"/>
+                    <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment" help="In Recruitment"/>
                     <group expand="0" string="Group By...">
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>

From 415172010a22843daecfb0d08b10d19bfc16c153 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 15:45:08 +0530
Subject: [PATCH 116/312] [IMP] hr_attendance: improved search views.

bzr revid: tpa@tinyerp.com-20120720101508-4zxvs5wiajfzqs9n
---
 addons/hr_attendance/hr_attendance_view.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 448e6401cbd..843d58b4690 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -55,16 +55,13 @@
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
                     <field name="name" string="Attendance"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
-                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
-                    <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="action"/>
-                    <newline/>
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
+                    <separator/>
+                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
                     </group>
                 </search>

From 4429ce743eb8c63307641b2dc8e0f559cb3e9ddd Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 15:52:10 +0530
Subject: [PATCH 117/312] [IMP] hr_contract: improved search views.

bzr revid: tpa@tinyerp.com-20120720102210-9tjwcd5hc709lrv5
---
 addons/hr_contract/hr_contract_view.xml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index ae6789ea234..2fc04dc3e2f 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -40,22 +40,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract">
-                   <group>
-                       <field name="name" string="Contracts"/>
-                       <separator orientation="vertical"/>
-                       <field name="date_start"/>
-                       <field name="date_end"/>
-                       <separator orientation="vertical"/>
-                       <field name="employee_id"/>
-                       <field name="working_hours"/>
-                   </group>
-                   <newline/>
+                   <field name="name" string="Contracts"/>
+                   <field name="date_start"/>
+                   <field name="date_end"/>
+                   <field name="employee_id"/>
+                   <field name="working_hours"/>
                    <group expand="0" string="Group By...">
                        <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                       <separator orientation="vertical"/>
                        <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                       <separator orientation="vertical"/>
                        <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
                    </group>
                </search>
@@ -174,9 +167,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
-                   <group>
-                       <field name="name" string="Contract Type"/>
-                   </group>
+                    <field name="name" string="Contract Type"/>
                </search>
             </field>
         </record>

From b50e73618980f262bc9c067b584ab8ee6f89aa9c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 15:59:52 +0530
Subject: [PATCH 118/312] [IMP] hr_evaluation: improved search views.

bzr revid: tpa@tinyerp.com-20120720102952-kcikbi0ak8cxsqb8
---
 addons/hr_evaluation/hr_evaluation_view.xml   | 40 +++++--------------
 .../report/hr_evaluation_report_view.xml      | 22 +++-------
 2 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index a5efaf42347..82d090e4533 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -8,12 +8,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Appraisal Plan">
-                   <group>
-                       <field name="name" string="Appraisal Plans"/>
-                       <separator orientation="vertical"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                   </group>
-                   <newline/>
+                   <field name="name" string="Appraisal Plans"/>
+                   <field name="company_id" groups="base.group_multi_company"/>
                    <group expand="0" string="Group By..." groups="base.group_multi_company">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
@@ -234,22 +230,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
-                   <group>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
-                        <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
-                        <separator orientation="vertical"/>
-                        <field name="employee_id" />
-                        <field name="plan_id" widget="selection" />
-                    </group>
-                    <newline/>
+                    <field name="date"/>
+                    <field name="employee_id" />
+                    <field name="plan_id"/>
+                    <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
+                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
                     <group expand='0' string='Group by...'>
                         <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
-                        <separator orientation="vertical"/>
                         <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
                         <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
-                        <separator orientation="vertical"/>
                         <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                    </group>
                </search>
@@ -330,20 +319,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
-                   <group>
-                        <field name="date_deadline"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_to_review_id"/>
-                        <field name="user_id" string="Interviewer"/>
-                   </group>
-                   <newline/>
+                    <field name="date_deadline"/>
+                    <field name="user_to_review_id"/>
+                    <field name="user_id" string="Interviewer"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index d855e02eea7..c08bce9f3a4 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -45,34 +45,22 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
-                <group>
-                    <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
-                        help = "In progress Evaluations"/>
-                       <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]"
-                           help = "Final Validation Evaluations"/>
-                       <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
-                      <separator orientation="vertical"/>
-                    <field name="employee_id"/>
-                    <field name="plan_id" widget="selection"/>
-                </group>
-                <newline/>
+                <field name="employee_id"/>
+                <field name="plan_id"/>
+                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]" help = "In progress Evaluations"/>
+                <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]" help = "Final Validation Evaluations"/>
+                <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="rating"/>
-                    <newline/>
                     <field name="deadline"/>
-                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="create_date"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
                     <filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/>

From 918f386b3865f244c1be0dd604cfc0e4d8aa149d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:07:21 +0530
Subject: [PATCH 119/312] [IMP] hr_expanse: improved search views.

bzr revid: tpa@tinyerp.com-20120720103721-4i424494z5wkmvhj
---
 addons/hr_expense/hr_expense_view.xml         | 34 ++++------
 .../report/hr_expense_report_view.xml         | 65 +++++++------------
 2 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index de19ed74b09..02e09268111 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -136,27 +136,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Expense">
-                    <group>
-                      <field name="name" string="Expenses"/>
-                      <separator orientation="vertical"/>
-                      <field name="date"/>
-                      <separator orientation="vertical"/>
-                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
-                      <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
-                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
-                      <separator orientation="vertical"/>
-                      <field name="employee_id"/>
-                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
-                      <field name="user_id"  string="User"/>
-                </group>
-                <newline />
-                <group expand="0" string="Group By...">
-                    <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                </group>
+                    <field name="name" string="Expenses"/>
+                    <field name="date"/>
+                    <field name="employee_id"/>
+                    <field name="department_id" string="Department" context="{'invisible_department': False}"/>
+                    <field name="user_id"  string="User"/>
+                    <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+                    <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 7877edf4b3a..01d7a9b7bef 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -51,46 +51,31 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
-              <group>
-                    <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
-                      help = "Confirm Expenses"/>
-                    <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
-                      help = "Approved Expenses"/>
-                    <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
-                      help = "Invoiced Expenses"/>
-                    <separator orientation="vertical"/>
-                    <field name="employee_id"/>
-                    <field name="department_id"/>
-            </group>
-            <newline/>
-            <group expand="0" string="Extended Filters...">
-                <field name="product_id"/>
-                <separator orientation="vertical"/>
-                <field name="user_id"/>
-                <separator orientation="vertical"/>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                <newline/>
-                <field name="date" string="Creation Date"/>
-                <field name="date_confirm"/>
-                <field name="date_valid"/>
-            </group>
-            <newline/>
-            <group expand="1" string="Group By...">
-                <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                <separator orientation="vertical"/>
-                <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
-                <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                <separator orientation="vertical"/>
-                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
-                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
-                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
-            </group>
+                <field name="employee_id"/>
+                <field name="department_id"/>
+                <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/>
+                <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" help = "Approved Expenses"/>
+                <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" help = "Invoiced Expenses"/>
+                <group expand="0" string="Extended Filters...">
+                    <field name="product_id"/>
+                    <field name="user_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="date" string="Creation Date"/>
+                    <field name="date_confirm"/>
+                    <field name="date_valid"/>
+                </group>
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
+                </group>
             </search>
         </field>
     </record>

From 88f6e08c2d81c18b651cf109736f3bd03cd80c4a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:12:55 +0530
Subject: [PATCH 120/312] [IMP] hr_holidays: improved search views.

bzr revid: tpa@tinyerp.com-20120720104255-uotefml487n10yyt
---
 addons/hr_holidays/hr_holidays_view.xml | 44 ++++++++++---------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 161ca478f36..399fe416008 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -44,36 +44,28 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
-                    <group>
-                        <field name="date_from"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-mail-message-new"
-                            string="Inbox" help="Unread messages"
-                            name="needaction_pending"
-                            domain="[('needaction_pending','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
-                        <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
-                        <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
-                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
-                        <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
-                        <separator orientation="vertical"/>
-                        <field name="employee_id"/>
-                        <field name="department_id" widget="selection"/>
-                        <field name="holiday_status_id" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="date_from"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
+                    <field name="holiday_status_id"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
+                    <separator/>
+                    <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
+                    <separator/>
+                    <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                    <separator/>
+                    <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_date_from" string="Start Date" icon="terp-personal" domain="[]" context="{'group_by':'date_from'}"/>
-                        <separator orientation="vertical"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
-                        <separator orientation="vertical"/>
                         <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
@@ -408,8 +400,7 @@
             <field name="arch" type="xml">
                 <search string="Search Leave Type">
                     <field name="name" string="Leave Types"/>
-                    <separator orientation="vertical"/>
-                    <field name="categ_id" widget="selection"/>
+                    <field name="categ_id"/>
                 </search>
             </field>
         </record>
@@ -475,8 +466,7 @@
             <field name="arch" type="xml">
                 <search string="Leave Type">
                     <field name="name" string="Leave Types"/>
-                    <separator orientation="vertical"/>
-                    <field name="categ_id" widget="selection"/>
+                    <field name="categ_id"/>
                 </search>
             </field>
         </record>

From b49a782375ed0de6c819abcf9df1806d30750039 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:20:39 +0530
Subject: [PATCH 121/312] [IMP] hr_payroll: improved search views.

bzr revid: tpa@tinyerp.com-20120720105039-49zv86s2a3mncbg7
---
 addons/hr_payroll/hr_payroll_view.xml | 53 +++++++--------------------
 1 file changed, 14 insertions(+), 39 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index bae89ed215b..787875a0bec 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -61,10 +61,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payroll Structures">
-                    <group col="8" colspan="4">
-                        <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                 </search>
             </field>
         </record>
@@ -179,19 +176,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
-                    <group col="8" colspan="4">
-                        <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="slip_id"/>
-                        <field name="amount_select"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <field name="slip_id"/>
+                    <field name="amount_select"/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
                         <filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
                         <filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Employees" name="employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     </group>
                 </search>
@@ -367,25 +358,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslips">
-                    <group>
-                        <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_from"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
-                        <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
-                        <separator orientation="vertical"/>
-                        <field name="employee_id"/>
-                        <field name="payslip_run_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
+                    <field name="date_from"/>
+                    <field name="employee_id"/>
+                    <field name="payslip_run_id"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
+                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     </group>
                 </search>
@@ -526,8 +508,7 @@
             <field name="arch" type="xml">
                 <search string="Contribution Registers">
                     <field name="name" string="Contribution Registers"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
@@ -655,13 +636,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Salary Rule">
-                    <group col="8">
-                        <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="category_id"/>
-                        <field name="condition_range_min"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <field name="category_id"/>
+                    <field name="condition_range_min"/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
                         <filter string="Category" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
                     </group>
@@ -698,10 +675,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Batches">
                     <field name="name" string="Payslip Batches"/>
-                    <separator orientation="vertical"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
                     <filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
                 </search>

From 7d13fa9fb222cda641ae72c27fdd844ea479f6cf Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:33:40 +0530
Subject: [PATCH 122/312] [IMP] hr_recruitment: improved search views.

bzr revid: tpa@tinyerp.com-20120720110340-myatecdvgrk8xlbt
---
 addons/hr_recruitment/hr_recruitment_view.xml | 42 ++++++-----------
 .../report/hr_recruitment_report_view.xml     | 46 +++++--------------
 2 files changed, 25 insertions(+), 63 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 7881d6f1e37..aa76193f257 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -216,45 +216,29 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-mail-message-new"
-                   string="Inbox" help="Unread messages"
-                   name="needaction_pending"
-                   domain="[('needaction_pending','=',True)]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-document-new" string="New" name="filter_new"/>
-               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-document-new" string="New" 
-                   domain="[('state','=','draft')]"
-                   help="All Initial Jobs"/>
-               <filter icon="terp-camera_test" string="In Progress" 
-                   domain="[('state','=','open')]"
-                   help="Open Jobs"/>
-               <filter icon="terp-gtk-media-pause" string="Pending"
-                   domain="[('state','=','pending')]"
-                   help="Pending Jobs"/>
-               <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
-               <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
-                    context="{'invisible_next_action':False, 'invisible_next_date':False}"
-                    domain="[('date_action','&lt;&gt;',False)]"
-                    help="Filter and view on next actions and date"/>
-               <separator orientation="vertical"/>
-               <field name="job_id" widget="selection"/>
-               <field name="user_id"/>
-               <newline/>
+                <field name="job_id"/>
+                <field name="user_id"/>
+                <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <separator/>
+                <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
+                <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
+                <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
+                <separator/>
+                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
+                <separator/>
+                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
+                    domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                     <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
                     <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
-                    <separator orientation="vertical" groups="base.group_no_one"/>
                     <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
            </search>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 9d81d39f240..d7df225e4b0 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -49,38 +49,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
-                <group>
-                    <filter string="New"
-                        icon="terp-document-new"
-                        domain="[('state','=','draft')]"
-                        help = "Draft recruitment"/>
-                    <filter string="In progress"
-                        icon="terp-camera_test"
-                        domain="[('state', '=' ,'open')]"
-                        help = "In progress recruitment"/>
-                    <filter string="Pending"
-                        icon="terp-gtk-media-pause"
-                        domain="[('state','=','pending')]"
-                        help = "Pending recruitment"/>
-                    <filter string="Hired"
-                        icon="terp-camera_test"
-                        domain="[('state','=','done')]"
-                        help = "Hired employees"/>
-                    <filter icon="terp-personal"
-                        string="My Recruitment"
-                        help="My Recruitment"
-                        domain="[('user_id','=',uid)]"/>
-                    <separator orientation="vertical"/>
-                    <field name="job_id"/>
-                    <field name="department_id" widget="selection"/>
-                    <field name="user_id" string="Responsible"/>
-                </group>
-                <newline/>
+                <field name="job_id"/>
+                <field name="department_id"/>
+                <field name="user_id" string="Responsible"/>
+                <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
+                <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
+                <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
+                <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
+                <separator/>
+                <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
                 <group expand="0" string="Extended Filters...">
                     <!--field name="job_id"/-->
                     <field name="priority"/>
-                    <field name="stage_id" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="stage_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>
@@ -89,15 +71,11 @@
                    <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
-                   <separator orientation="vertical"/>
-                    <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                   <separator orientation="vertical"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-                   <separator orientation="vertical"/>
                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                   <separator orientation="vertical"/>
                    <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                    <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>

From 9c72f19e40868275ebff9b89c39d234c2a04a3ae Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:34:42 +0530
Subject: [PATCH 123/312] [IMP] hr_payroll_account: improved search view.

bzr revid: tpa@tinyerp.com-20120720110442-7zqx1u9eek4dgo0d
---
 addons/hr_payroll_account/hr_payroll_account_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 9e3aab3ecb6..d481ae3cdde 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -62,8 +62,7 @@
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
             <field name="arch" type="xml">
                 <filter name='done_filter' position="after">
-                    <separator orientation="vertical"/>
-                    <field name="journal_id" widget="selection"/>
+                    <field name="journal_id"/>
                 </filter>
             </field>
         </record>

From 3a20bd55f1c593120e029bea679164fd99949724 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:40:39 +0530
Subject: [PATCH 124/312] [IMP] hr_timesheet: improved search views.

bzr revid: tpa@tinyerp.com-20120720111039-1c28gi7y70hqrkho
---
 addons/hr_timesheet/hr_timesheet_view.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 7875aff12a0..77dbc643a08 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -68,24 +68,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="account_id"/>
-                    </group>
-                    <newline/>
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="account_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Analytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
-
         </record>
         
         <record id="account_analytic_account_timesheet_form" model="ir.ui.view">

From b2d728f7ce170aa45df98aa6cd04cac98564d16b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:56:27 +0530
Subject: [PATCH 125/312] [IMP] hr_timesheet_invoice: improved search views.

bzr revid: tpa@tinyerp.com-20120720112627-43b2e5tnmtvtfaln
---
 .../hr_timesheet_invoice_view.xml             |  8 ++-
 .../hr_timesheet_invoice_report_view.xml      | 52 ++++++-------------
 .../report/report_analytic_view.xml           | 11 ++--
 3 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 81dc1e3c9cf..631fa566bce 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -89,10 +89,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                <field name="date" position="before">
+                <field name="others" position="after">
+                    <separator/>
                     <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
                     <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> 
-                    <separator orientation="vertical"/>
                 </field>
             </field>
         </record>
@@ -144,9 +144,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Type of invoicing">
-                    <group>
-                        <field name="name" string="Type of invoicing"/>
-                    </group>
+                    <field name="name" string="Type of invoicing"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 59b4ceb67a3..1fad5f92b2e 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -46,29 +46,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <group>
-                      <filter icon="terp-personal"
-                              string="Non Assigned timesheets to users"
-                              help="Non Assigned timesheets to users"
-                              domain="[('user_id','=',False)]"/>
-                      <separator orientation="vertical"/>
-                      <field name="user_id" widget="selection"/>
-                      <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                      <field name="product_id"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="product_id"/>
+                    <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <field name="invoice_id" widget="selection"/>
+                        <field name="invoice_id"/>
                     </group>
                     <group expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
@@ -149,12 +139,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <group>
-                        <field name="name" string="Timesheet by users"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="month"/>
-                    </group>
+                    <field name="name" string="Timesheet by users"/>
+                    <field name="user_id"/>
+                    <field name="month"/>
                 </search>
             </field>
         </record>
@@ -201,7 +188,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
-                    <separator orientation="vertical"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id"/>
                     <field name="user_id"/>
@@ -282,13 +268,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
-                    <group>
-                        <field name="name" string="Timesheet by account"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id"/>
-                        <field name="month"/>
-                    </group>
+                    <field name="name" string="Timesheet by account"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="user_id"/>
+                    <field name="month"/>
                 </search>
             </field>
         </record>
@@ -351,13 +334,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
-                    <group>
-                        <field name="name" string="Timesheet by account"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id"/>
-                        <field name="month"/>
-                    </group>
+                    <field name="name" string="Timesheet by account"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="user_id"/>
+                    <field name="month"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index c7d0c6b7c25..05319b075e8 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -113,13 +113,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
-                   <group>
-                        <field name="name" string="Analytic Lines"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="month"/>
-                   </group>
+                    <field name="name" string="Analytic Lines"/>
+                    <field name="product_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>

From 579a41ab12d4ce94efc1ecc973261433a323827b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 17:03:33 +0530
Subject: [PATCH 126/312] [IMP] hr_timesheet_sheet: improved search views.

bzr revid: tpa@tinyerp.com-20120720113333-4qou6upyblvy617h
---
 .../hr_timesheet_sheet_view.xml               | 23 ++++--------
 .../report/hr_timesheet_report_view.xml       | 14 ++-----
 .../report/timesheet_report_view.xml          | 37 ++++---------------
 3 files changed, 19 insertions(+), 55 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index dbc9e1d6dac..0c1e2e0771b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -23,11 +23,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account">
-                    <group>
-                        <field name="sheet_id" />
-                        <field name="name" groups="analytic.group_analytic_accounting"/>
-                        <field name="invoice_rate"/>
-                    </group>
+                    <field name="sheet_id" />
+                    <field name="name" groups="analytic.group_analytic_accounting"/>
+                    <field name="invoice_rate"/>
                 </search>
             </field>
         </record>
@@ -158,16 +156,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
-                    <group>
-                        <field name="date_from"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                        <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
-                        <separator orientation="vertical"/>
-                        <field name="employee_id"/>
-                        <field name="department_id" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="date_from"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
+                    <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+                    <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index fd5d6b0b6d1..7492d94cba2 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -40,29 +40,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group>
-                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="general_account_id"/>
                         <field name="product_id"/>
                         <field name="journal_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <newline/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                         <field name="date" />
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                         <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 613f92d3cf6..1e061b12d36 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -48,51 +48,30 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group>
-                        <filter icon="terp-document-new"
-                                string="Draft"
-                                domain="[('state','=','draft')]"/>
-                        <filter icon="terp-camera_test"
-                                string="Confirmed"
-                                domain="[('state','=','confirm')]"/>
-                        <filter icon="terp-dialog-close"
-                                string="Done"
-                                domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_id"/>
-                        <field name="user_id" />
-                    </group>
-                    <newline/>
+                    <field name="account_id"/>
+                    <field name="user_id" />
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="general_account_id"/>
-                        <field name="to_invoice" widget="selection"/>
-                        <separator orientation="vertical"/>
+                        <field name="to_invoice"/>
                         <field name="product_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="department_id" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <newline/>
+                        <field name="department_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                         <field name="date_current"/>
                         <field name="date_to"/>
                         <field name="date_from"/>
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>

From dd59995fe073e76ebc5bea2d3aa73adc742ea3ae Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 17:11:32 +0530
Subject: [PATCH 127/312] [IMP] mail: improved search views.

bzr revid: tpa@tinyerp.com-20120720114132-p7nt51yq347tcrwt
---
 addons/mail/mail_group_view.xml   | 1 -
 addons/mail/mail_message_view.xml | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 97210b8c179..1a88669d632 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -103,7 +103,6 @@
             <field name="arch" type="xml">
                 <search string="Search Groups">
                     <field name="name" string="Group"/>
-                    <separator orientation="vertical"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 34ba6db1477..93f899ec148 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -55,9 +55,7 @@
             <field name="arch" type="xml">
                 <search string="Messages Search">
                     <field name="model" string="Message"/>
-                    <separator orientation="vertical"/>
                     <field name="date"/>
-                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>
@@ -172,31 +170,26 @@
             <field name="arch" type="xml">
                 <search string="Email Search">
                     <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
-                    <separator orientation="vertical"/>
                     <field name="date"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
                     <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
                     <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
+                    <separator/>
                     <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
                     <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="user_id" string="User"/>
                         <field name="partner_id" string="Partner Name"/>
                         <field name="model"/>
                         <field name="res_id"/>
                     </group>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>

From c43c411bf900264ed29ef3e1eb11f7e59d265e42 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 17:32:42 +0530
Subject: [PATCH 128/312] [IMP] marketing_campaign: improved search views.

bzr revid: tpa@tinyerp.com-20120720120242-1v1v4xr34f5rs35d
---
 .../marketing_campaign_view.xml               | 46 ++++++-------------
 .../report/campaign_analysis_view.xml         | 31 ++++---------
 2 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 6a06cb33f1d..a3d8af6c048 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -114,19 +114,15 @@
         <field name="arch" type="xml">
             <search string="Campaigns">
                 <field name="name" string="Campaign"/>
-                <separator orientation="vertical"/>
+                <field name="object_id" string="Resource"/>
                 <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
+                <separator/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
-                <separator orientation="vertical"/>
-                <field name="object_id" string="Resource"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
             </search>
@@ -214,23 +210,18 @@
         <field name="arch" type="xml">
             <search string="Segments">
                 <field name="name" string="Segment"/>
-                <separator orientation="vertical"/>
                 <field name="date_run"/>
-                <separator orientation="vertical"/>
+                <field name="campaign_id"/>
+                <field name="object_id"/>
                 <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
                 <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <separator/>
                 <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
                 <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
                 <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
-                <separator orientation="vertical"/>
-                <field name="campaign_id"/>
-                <field name="object_id"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/>
                 </group>
             </search>
@@ -414,31 +405,22 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Marketing Campaign Activities">
-                <group>
-                    <field name="res_name" string="Marketing Campaign Activity"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-                    <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="campaign_id"/>
-                    <field name="segment_id"/>
-                    <field name="object_id"/>
-                    <field name="partner_id"/>
-                    <field name="res_id"/>
-                </group>
-                <newline/>
+                <field name="res_name" string="Marketing Campaign Activity"/>
+                <field name="date"/>
+                <field name="campaign_id"/>
+                <field name="segment_id"/>
+                <field name="object_id"/>
+                <field name="partner_id"/>
+                <field name="res_id"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
                     <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
                     <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
                     <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                 </group>
             </search>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 7b3d848cc8b..04b91a268b0 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -31,35 +31,22 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
-                <group>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl"
-                            string="To Do"
-                            domain="[('state','=','todo')]"/>
-                    <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
-                    <filter icon="terp-emblem-important"
-                            string="Exceptions"
-                            domain="[('state','=','exception')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="campaign_id"/>
-                    <field name="activity_id"/>
-                    <field name="segment_id"/>
-                    <field name="partner_id"/>
-                    <field name="country_id"/>
-                </group>
-                <newline/>
+                <field name="date"/>
+                <field name="campaign_id"/>
+                <field name="activity_id"/>
+                <field name="segment_id"/>
+                <field name="partner_id"/>
+                <field name="country_id"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','todo')]"/>
+                <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]"/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                     <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
                     <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>

From 8abb1113f978cb59598ece939de1a737ce860e15 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 17:43:49 +0530
Subject: [PATCH 129/312] [IMP] mrp: improved search views.

bzr revid: tpa@tinyerp.com-20120720121349-b63t3xan09un5qe6
---
 addons/mrp/mrp_view.xml               | 80 +++++++++------------------
 addons/mrp/report/mrp_report_view.xml |  3 +-
 2 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2d3e90c341a..819db0d23fa 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -87,14 +87,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                   <group>
-                       <field name="name" string="Name"/>
-                       <separator orientation="vertical"/>
-                       <field name="group_id"  widget="selection"/>
-                       <field name="composition"/>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Group By...">
+                    <field name="name" string="Name"/>
+                    <field name="group_id" />
+                    <field name="composition"/>
+                    <group expand="0" string="Group By...">
                         <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
                     </group>
                </search>
@@ -206,20 +202,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
-                   <group>
-                        <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="resource_type"/>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Group By...">
+                    <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <field name="resource_type"/>
+                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
+                    <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -311,11 +301,9 @@
             <field name="arch" type="xml">
                 <search string="Routing">
                     <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
-                    <separator orientation="vertical"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
@@ -419,20 +407,14 @@
            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
-                    <group>
-                         <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                         <separator orientation="vertical"/>
-                         <field name="product_id"/>
-                         <field name="company_id" groups="base.group_multi_company"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <field name="product_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
                         <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Starting Date"/>
                    </group>
                 </search>
@@ -837,32 +819,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Production">
-                   <group>
-                       <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
-                           domain="[('state','=','confirmed')]"
-                           help="Manufacturing Orders which are waiting for raw materials."/>
-                       <filter icon="terp-camera_test" string="Ready" name="ready"
-                           domain="[('state','=','ready')]"
-                           help="Manufacturing Orders which are ready to start production."/>
-                       <filter icon="terp-check" string="In Production" name="inprogress"
-                           domain="[('state','=','in_production')]"
-                           help="Manufacturing Orders which are currently in production."/>
-                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                           domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
-                           help="Production started late"/>
-                       <separator orientation="vertical"/>
-                       <field name="product_id"/>
-                       <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                    <field name="product_id"/>
+                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" name="pending" domain="[('state','=','confirmed')]"
+                        help="Manufacturing Orders which are waiting for raw materials."/>
+                    <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','ready')]"
+                        help="Manufacturing Orders which are ready to start production."/>
+                    <filter icon="terp-check" string="In Production" name="inprogress" domain="[('state','=','in_production')]"
+                        help="Manufacturing Orders which are currently in production."/>
+                    <separator/>
+                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                        help="Production started late"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" help="Scheduled Date"/>
                     </group>
                </search>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index eef6c89f702..fd4333d997b 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -37,8 +37,7 @@
             <field name="arch" type="xml">
                 <search string="Work Center load">
                     <field name="name" string="Week"/>
-                    <separator orientation="vertical"/>
-                    <field name="workcenter_id" widget="selection"/>
+                    <field name="workcenter_id""/>
                 </search>
             </field>
         </record>

From 0e1fe0e39aee726741c802a60aeb9387fd1a250c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 17:52:00 +0530
Subject: [PATCH 130/312] [IMP] mrp_operations: improved search views.

bzr revid: tpa@tinyerp.com-20120720122200-50kzd3ej03pv32np
---
 addons/mrp_operations/mrp_operations_view.xml | 58 ++++++++-----------
 .../report/mrp_workorder_analysis_view.xml    | 28 +++------
 2 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 2dccc92a51e..0aea493494f 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -118,41 +118,29 @@
     </record>
 
     <record id="view_mrp_production_workcenter_form_view_filter" model="ir.ui.view">
-            <field name="name">mrp.production.workcenter.line.select</field>
-            <field name="model">mrp.production.workcenter.line</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Work Orders">
-                    <group>
-                        <field name="name" string="Work Orders"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_planned"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft"
-                            domain="[('state','=','draft')]"/>
-                        <filter icon="terp-check" string="In Progress" name="Current"
-                            domain="[('state','=','startworking')]"/>
-                        <filter icon="terp-gtk-media-pause" string="Pending"
-                            domain="[('state','=','pause')]"/>
-                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
-                            help="Production started late"/>
-                        <separator orientation="vertical"/>
-                        <field name="workcenter_id" widget="selection"/>
-                        <field name="production_id"/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
-                        <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
-                    </group>
-               </search>
-            </field>
+        <field name="name">mrp.production.workcenter.line.select</field>
+        <field name="model">mrp.production.workcenter.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Work Orders">
+                <field name="name" string="Work Orders"/>
+                <field name="date_planned"/>
+                <field name="workcenter_id"/>
+                <field name="production_id"/>
+                <field name="state"/>
+                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-check" string="In Progress" name="Current" domain="[('state','=','startworking')]"/>
+                <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pause')]"/>
+                <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                    help="Production started late"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
+                    <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
+                </group>
+             </search>
+        </field>
     </record>
 
     <record id="workcenter_line_calendar" model="ir.ui.view">
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index c84de780ee0..c2ae1be9cd9 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -46,32 +46,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
-                        <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
-                        <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id" />
-                        <field name="workcenter_id"/>
-                   </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
+                    <field name="date"/>
+                    <field name="product_id" />
+                    <field name="workcenter_id"/>
+                    <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
+                    <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
+                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
+                    <group expand="1" string="Group By...">
                         <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" />
                         <filter string="Work Center" name="Workcenter" icon="terp-go-home" context="{'group_by':'workcenter_id'}" />
-                        <separator orientation="vertical"/>
                         <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Planned Day"/>
-                        <separator orientation="vertical"/>
                         <filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}" help="Planned Month"/>
-                        <separator orientation="vertical"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Planned Year"/>
-                   </group>
-                  </search>
+                    </group>
+                </search>
             </field>
         </record>
         <record id="action_report_mrp_workorder" model="ir.actions.act_window">

From 104b9cae5c9a6e0d29b0c65eb09773a027668137 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 17:59:14 +0530
Subject: [PATCH 131/312] [IMP] mrp_repair: improved search views.

bzr revid: tpa@tinyerp.com-20120720122914-xr10c287884xjvlu
---
 addons/mrp_repair/mrp_repair_view.xml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 34d3ec0482b..5cf3e3c7cff 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -189,30 +189,22 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
-                  <group>
-                       <field name="name" string="Reair Orders"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
-                       <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
-                       <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
-                       <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
-                       <separator orientation="vertical"/>
-                       <field name="product_id"/>
-                       <field name="partner_id"/>
-                       <field name="state"/>
-                  </group>
-                  <newline/>
+                  <field name="name" string="Reair Orders"/>
+                  <field name="product_id"/>
+                  <field name="partner_id"/>
+                  <field name="state"/>
+                  <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                  <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
+                  <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
+                  <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                   <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                      <separator orientation="vertical"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                       <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                      <separator orientation="vertical"/>
                       <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}" help="Guarantee limit"/>
-                      <separator orientation="vertical" groups="base.group_multi_company"/>
                       <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                   </group>
-             </search>
+              </search>
           </field>
     </record>
 

From 6e178d51ec4b40a685e5c619342cbcd7b467a1c9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 18:16:29 +0530
Subject: [PATCH 132/312] [IMP] point_of_sale: improved search views.

bzr revid: tpa@tinyerp.com-20120720124629-4eau5t3r09x7b5y2
---
 .../point_of_sale/account_statement_view.xml  | 34 ++++----------
 addons/point_of_sale/point_of_sale_view.xml   | 39 +++++-----------
 .../report/pos_order_report_view.xml          | 44 ++++++-------------
 3 files changed, 34 insertions(+), 83 deletions(-)

diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index 3b3542bb777..b690e8d9ba7 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -27,21 +27,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
-                    <group>
-                        <field name="name" string="Cash Statement"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
-                        <separator orientation="vertical"/>
-                        <field name="journal_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Cash Statement"/>
+                    <field name="date"/>
+                    <field name="journal_id"/>
+                    <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
@@ -54,22 +46,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
-                    <group>
-                        <field name="name" string="Cash Statement"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
-                        <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
-                        <separator orientation="vertical"/>
-                        <field name="journal_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Cash Statement"/>
+                    <field name="date"/>
+                    <field name="journal_id"/>
+                    <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                    <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 6b1b9132344..57dce86afcb 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -139,24 +139,19 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order"/>
-                    <separator orientation="vertical"/>
                     <field name="date_order"/>
-                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator string="" orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator string="" orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
-               </search>
+                </search>
             </field>
         </record>
 
@@ -835,12 +830,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Config">
-                    <filter string="Active" domain="[('state', '=', 'active')]" />
-                    <filter string="Inactive" domain="[('state', '=', 'inactive')]" />
-                    <separator orientation="vertical"/>
                     <field name="name" />
                     <field name="shop_id" />
-
+                    <filter string="Active" domain="[('state', '=', 'active')]" />
+                    <filter string="Inactive" domain="[('state', '=', 'inactive')]" />
                 </search>
             </field>
         </record>
@@ -985,15 +978,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Session">
-                    <filter string="Open" domain="[('state', '=', 'opened')]" />
-                    <separator orientation="vertical"/>
-                    <filter string="Today" domain="[('start_at', '>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" />
-                    <separator orientation="vertical"/>
                     <field name="config_id" />
                     <field name="name" />
                     <field name="user_id" />
-
-                    <newline />
+                    <filter string="Open" domain="[('state', '=', 'opened')]" />
+                    <separator/>
+                    <filter string="Today" domain="[('start_at', '>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" />
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
                         <filter string="Point of Sales" domain="[]" context="{'group_by': 'user_id'}" />
@@ -1032,27 +1022,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
-                    <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
-                    <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
-                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="date_order"/>
                     <field name="session_id"/>
-                    <newline/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
+                    <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
+                    <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
+                    <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
-                        <separator string="" orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator string="" orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
-               </search>
+                </search>
             </field>
         </record>
 
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 00e0eb91f2f..11057b3b133 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -34,41 +34,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
-                    <group>
-                        <filter icon="terp-go-year" string="Year" name="year"
-                            domain="[('year','=',time.strftime('%%Y'))]"
-                            help="POS ordered created during current year"/>
-                        <filter icon="terp-go-today"
-                             string="Today"
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created by today"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-dolar"
-                            string="Invoiced"
-                            domain="[('state','=',('invoiced'))]"/>
-                        <filter icon="terp-dolar"
-                            string="Not Invoiced"
-                            domain="[('state','=',('paid'))]"/>
-			            <separator orientation="vertical"/>
-			            <field name="partner_id"/>
-			            <field name="date"/>
-			            <field name="user_id" widget="selection" /> 
-                        <filter icon="terp-personal"
-                            string="My Sales"
-                            help="My Sales"
-                            domain="[('user_id','=',uid)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="user_id" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="partner_id"/>
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-dolar" string="Invoiced" domain="[('state','=',('invoiced'))]"/>
+                    <filter icon="terp-dolar" string="Not Invoiced" domain="[('state','=',('paid'))]"/>
+                    <separator/>
+                    <filter icon="terp-go-year" string="Year" name="year" domain="[('year','=',time.strftime('%%Y'))]" help="POS ordered created during current year"/>
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
+                         help="POS ordered created by today"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of order date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of order date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of order date"/>

From 05c8cee6aba54eb8b9c09a3ae49efa0d9294244a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 18:23:04 +0530
Subject: [PATCH 133/312] [IMP] process: improved search views.

bzr revid: tpa@tinyerp.com-20120720125304-01qad15f3vu1yo8j
---
 addons/process/process_view.xml | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index c5c152f9930..a2d60f9bd0a 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -113,12 +113,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Process">
-                    <group>
-                        <field name="name" string="Process"/>
-                        <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Process"/>
+                    <field name="model_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
@@ -217,13 +213,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
-                <group>
-                    <field name="name" string="Process Node"/>
-                    <separator orientation="vertical"/>
-                    <field name="model_id"/>
-                    <field name="kind" />
-                </group>
-                <newline/>
+                <field name="name" string="Process Node"/>
+                <field name="model_id"/>
+                <field name="kind" />
                 <group expand="0" string="Group By...">
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/>
@@ -310,12 +302,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Process Transition">
-                <group>
-                    <field name="name" string="Process Transition"/>
-                    <separator orientation="vertical"/>
-                    <field name="source_node_id"/>
-                    <field name="target_node_id"/>
-                </group>
+                <field name="name" string="Process Transition"/>
+                <field name="source_node_id"/>
+                <field name="target_node_id"/>
 <!--
                 <newline/>
                 <group expand="0" string="Group By..." colspan="4" col="4">

From 800bf3b3c61e6108ff67c8c329e243afade46339 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 20 Jul 2012 18:39:36 +0200
Subject: [PATCH 134/312] [FIX] portal_sale view_mode

bzr revid: abo@openerp.com-20120720163936-rkj1uztpd6jc0w5n
---
 addons/portal_sale/portal_sale_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index a644be7be61..b868d89b920 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -7,7 +7,7 @@
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'default_type': 'out', 'contact_display': 'partner_address'}</field>
             <field name="search_view_id" ref="stock.view_picking_out_search"/>
@@ -25,18 +25,18 @@
             <field name="help">You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on.</field>
         </record>
 
-        <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders" 
+        <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"
             action="sale.action_order_tree5" sequence="10"/>
-        <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_orders" 
+        <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_orders"
             action="sale.action_order_form" sequence="20"/>
-        <menuitem name="Delivery Orders" id="portal_delivery" parent="portal.portal_orders" 
+        <menuitem name="Delivery Orders" id="portal_delivery" parent="portal.portal_orders"
             action="action_picking_tree" sequence="30"/>
-        <menuitem name="Products" id="portal_products" parent="portal.portal_orders" 
+        <menuitem name="Products" id="portal_products" parent="portal.portal_orders"
             action="product_normal_action" sequence="40"/>
 
-        <menuitem name="Invoice" id="portal_invoices" parent="portal.portal_invoices_payements" 
+        <menuitem name="Invoice" id="portal_invoices" parent="portal.portal_invoices_payements"
             action="account.action_invoice_tree1" sequence="10"/>
-        <menuitem name="Refund/Payments" id="portal_payments" parent="portal.portal_invoices_payements" 
+        <menuitem name="Refund/Payments" id="portal_payments" parent="portal.portal_invoices_payements"
             action="account_voucher.action_vendor_receipt" sequence="20"/>
 
     </data>

From a6e85cfd5a533e5d9ff83121ae901978029bc0b5 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 21 Jul 2012 22:12:53 +0200
Subject: [PATCH 135/312] [REM] setValue, event namespacing

bzr revid: al@openerp.com-20120721201253-z35xjhao0r1mv6l1
---
 addons/web/static/src/js/corelib.js | 35 ++++++++---------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 5ecd6dbb07d..dcaaa864fc8 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -237,20 +237,6 @@ instance.web.ParentedMixin = {
     }
 };
 
-/**
- * Utility function for APIs which can take either a value or a function which
- * returns a value
- *
- * @param {Object} object
- * @param {String} property
- * @returns {Object}
- */
-var getValue = function (object, property) {
-    if (object == null) { return null; }
-    var value = object[property];
-    return _.isFunction(value) ? value.call(object) : value;
-};
-
 /**
  * Backbone's events. Do not ever use it directly, use EventDispatcherMixin instead.
  *
@@ -677,6 +663,12 @@ instance.web.CallbackEnabled = instance.web.Class.extend(instance.web.CallbackEn
  * That will kill the widget in a clean way and erase its content from the dom.
  */
 instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
+    // Backbone-ish API
+    tagName: 'div',
+    id: null,
+    className: null,
+    attributes: {},
+    events: {},
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -695,7 +687,6 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      * destroyed too. Can be null.
      */
     init: function(parent) {
-        this._uid = _.uniqueId('-widget-');
         instance.web.WidgetMixin.init.call(this,parent);
         this.session = instance.connection;
     },
@@ -746,12 +737,6 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
 
         return this;
     },
-
-    // Backbone-ish API
-    tagName: 'div',
-    id: null,
-    className: null,
-    attributes: {},
     /**
      * Utility function to build small DOM elements.
      *
@@ -770,9 +755,8 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
         }
         return el;
     },
-    events: {},
     delegateEvents: function () {
-        var events = getValue(this, 'events');
+        var events = this.events;
         if (_.isEmpty(events)) { return; }
 
         for(var key in events) {
@@ -784,8 +768,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
             var event = match[1];
             var selector = match[3];
 
-            // add namespace for easy un-delegation
-            event += '.delegated-events' + this._uid;
+            event += '.delegated-events';
             if (!selector) {
                 this.$el.on(event, method);
             } else {
@@ -794,7 +777,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
         }
     },
     undelegateEvents: function () {
-        this.$el.off('.delegated-events' + this._uid);
+        this.$el.off('.delegated-events');
     },
     /**
      * Shortcut for ``this.$el.find(selector)``

From 512b41ee8f3060c29d72595994d081aa1df092d8 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 10:43:03 +0530
Subject: [PATCH 136/312] [IMP]Improvning search view in wiki module

bzr revid: tch@tinyerp.com-20120723051303-em81ch9d8qufzpd3
---
 addons/wiki/wiki_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index b0f0ab0198e..d39b986e04e 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -176,14 +176,10 @@
                     <field name="name"
                         filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
                         string="Wiki"/>
-                    <separator orientation="vertical"/>
                     <field name="write_date" groups="base.group_no_one"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
-                    <separator orientation="vertical"/>
                     <field name="group_id"/>
                     <field name="write_uid"/>
-                    <newline/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>

From 9b1f6c19f6e54f4f8bee4468618a6db082175652 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 10:46:07 +0530
Subject: [PATCH 137/312] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120723051607-n26lh410ri9j5eev
---
 addons/mrp/report/mrp_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index fd4333d997b..99571903dde 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -37,7 +37,7 @@
             <field name="arch" type="xml">
                 <search string="Work Center load">
                     <field name="name" string="Week"/>
-                    <field name="workcenter_id""/>
+                    <field name="workcenter_id"/>
                 </search>
             </field>
         </record>

From 8a81855312d64b244b1f8030394df6ac044a1f0d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 11:01:23 +0530
Subject: [PATCH 138/312] [IMP] Improved code.

bzr revid: tpa@tinyerp.com-20120723053123-rrb3qo66dbdd5lqb
---
 addons/crm_partner_assign/report/crm_lead_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 1a012252966..2a6e2978a1c 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -35,7 +35,7 @@
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" />
-                        <filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" ontext="{'group_by':'date_assign'}"/>
+                        <filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" context="{'group_by':'date_assign'}"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" />
                         <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" />

From 3a3fe4cfd04eed9c5b8d39b7ef8cabd97470366f Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 11:06:55 +0530
Subject: [PATCH 139/312] [IMP]Improvning search view in stock_planning module

bzr revid: tch@tinyerp.com-20120723053655-tldfwyuqmfgmovae
---
 addons/stock_planning/stock_planning_view.xml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index a2fdc9788e1..bb6cd7e3515 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -51,10 +51,8 @@
             <field name="arch" type="xml">
                 <search string="Stock Periods">
                     <field name="name" string="Stock Periods"/>
-                    <separator orientation="vertical"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
-                    <separator orientation="vertical"/>
                     <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
                     <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
                 </search>
@@ -198,19 +196,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
-                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
-                    <separator orientation="vertical"/>
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
                     <field name="product_id"/>
                     <field name="create_uid"/>
-                    <newline/>
+                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
                     <group expand="0" string="Group By...">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
-                       <separator orientation="vertical"/>
                        <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
                     </group>
               </search>
@@ -307,18 +302,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
-                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
-                    <separator orientation="vertical"/>
-                    <field name="company_id" widget="selection"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
+                    <field name="company_id"/>
+                    <field name="warehouse_id"/>
+                    <field name="period_id"/>
                     <field name="product_id"/>
-                    <newline/>
+                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
                     <group expand="0" string="Group By...">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
-                       <separator orientation="vertical"/>
                     </group>
               </search>
             </field>

From 3d97bce85dcbdfa503afadec1157bb53b9e689d2 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 11:22:20 +0530
Subject: [PATCH 140/312] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120723055220-ftirkyj0crbg2tfu
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 631fa566bce..f4e849d29d5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -89,11 +89,11 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                <field name="others" position="after">
+                <filter name="others" position="after">
                     <separator/>
                     <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
                     <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> 
-                </field>
+                </filter>
             </field>
         </record>
 

From 6ede86cf54e4ba787c9c6e736de1ccf85a528617 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 11:24:23 +0530
Subject: [PATCH 141/312] [IMP] procurement: improved search views.

bzr revid: tpa@tinyerp.com-20120723055423-ud4u1e38x0xtii8a
---
 addons/procurement/procurement_view.xml | 39 +++++++++----------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 3085eb6d672..3a21ebb8a9c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -117,22 +117,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Procurement">
-                    <group>
-                       <field name="origin" string="Procurement"/>
-                       <separator orientation="vertical"/>
-                       <field name="date_planned"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
-                       <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
-                       <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
-                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                           domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
-                           help="Procurement started late" />
-                       <separator orientation="vertical"/>
-                       <field name="product_id" />
-                       <field name="state" />
-                    </group>
-                    <newline/>
+                    <field name="origin" string="Procurement"/>
+                    <field name="date_planned"/>
+                    <field name="product_id" />
+                    <field name="state" />
+                    <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
+                    <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
+                    <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
+                    <separator/>
+                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]" help="Procurement started late" />
                     <group expand="0" string="Group By">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
@@ -198,15 +191,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Reordering Rules Search">
-                    <group>
-                        <field name="name" string="Reordering Rules"/>
-                        <separator orientation="vertical"/>
-                        <field name="warehouse_id" widget="selection"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="product_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Reordering Rules"/>
+                    <field name="warehouse_id"/>
+                    <field name="location_id" groups="stock.group_locations"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="product_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Warehouse" icon="terp-go-home" domain="[]"  context="{'group_by':'warehouse_id'}"/>
                         <filter string="Location" icon="terp-go-home" domain="[]" context="{'group_by':'location_id'}"/>

From 330932bb5d2dd7eb0da209ae8f9a6e3d0fcdce5b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 11:43:22 +0530
Subject: [PATCH 142/312] [IMP] product: improved search views.

bzr revid: tpa@tinyerp.com-20120723061322-c3dcywvjfc8tlp4t
---
 addons/product/pricelist_view.xml |  1 -
 addons/product/product_view.xml   | 16 ++++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 0492881d9bd..f832a6d46c6 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -113,7 +113,6 @@
             <field name="arch" type="xml">
                 <search string="Products Price Search">
                     <field name="name" string="Products Price"/>
-                    <separator orientation="vertical"/>
                     <field name="currency_id"/>
                     <field name="type"/>
                     <field name="active" />
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 4fe51dc67f6..6bffec464b0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,29 +10,22 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/>
-                   <separator orientation="vertical"/>
+                   <field name="categ_id" operator="child_of"/>
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
+                   <separator/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
-                   <separator orientation="vertical"/>
-                   <field name="categ_id" widget="selection" operator="child_of"/>
                    <group expand="0" string="Context...">
-                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
-                       <separator orientation="vertical" groups="base.group_multi_company"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
+                       <field name="company_id" groups="base.group_multi_company"/>
                    </group>
-                   <newline/>
                    <group  expand='0' string='Group by...'>
                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/>
-                       <separator orientation="vertical"/>
                        <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}"/>
-                       <separator orientation="vertical"/>
                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
-                       <separator orientation="vertical" groups="base.group_multi_company"/>
                        <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
                    </group>
-
                 </search>
             </field>
         </record>
@@ -301,7 +294,6 @@
             <field name="arch" type="xml">
                 <search string="Product Categories">
                     <field name="name" string="Product Categories"/>
-                    <separator orientation="vertical"/>
                     <field name="parent_id"/>
                 </search>
             </field>

From dd29fbd57a8f92865748d0aaadbad85d2811ac97 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:04:24 +0530
Subject: [PATCH 143/312] [IMP] project: improved search view.

bzr revid: tpa@tinyerp.com-20120723063424-40x845p64en9aoto
---
 addons/project/project_view.xml               | 79 +++++++------------
 addons/project/report/project_cumulative.xml  | 29 ++++---
 addons/project/report/project_report_view.xml | 60 ++++----------
 3 files changed, 60 insertions(+), 108 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cc6f5b05ad8..62665109ec1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -155,28 +155,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                    <group>
-                        <field name="complete_name" string="Project Name"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-mail-message-new"
-                           string="Inbox" help="Unread messages"
-                           name="needaction_pending"
-                           domain="[('needaction_pending','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
-                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
-                        <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
-                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
-                        <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id" string="Project Manager"/>
-                        <field name="partner_id" string="Partner"/>
-                    </group>
-                    <newline/>
+                    <field name="complete_name" string="Project Name"/>
+                    <field name="user_id" string="Project Manager"/>
+                    <field name="partner_id" string="Partner"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
+                    <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
+                    <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
+                    <separator/>
+                    <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                    <separator/>
+                    <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
                 </search>
@@ -633,37 +626,28 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                <search string="Tasks">
-                    <group>
-                        <field name="name" string="Tasks"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-mail-message-new"
-                            string="Inbox" help="Unread messages"
-                            name="needaction_pending"
-                            domain="[('needaction_pending','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
-                        <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
-                        <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal"/>
-                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-"/>
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
-                            help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
-                        <separator orientation="vertical"/>
-                        <field name="project_id"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Tasks"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
+                    <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
+                    <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
+                    <separator/>
+                    <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                    <separator/>
+                    <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal"/>
+                    <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-"/>
+                    <separator/>
+                    <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
+                        help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <separator orientation="vertical" groups="base.group_no_one"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
                     </group>
@@ -745,11 +729,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Stages">
-                    <group>
-                       <field name="name" string="Tasks Stages"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
-                    </group>
+                   <field name="name" string="Tasks Stages"/>
+                   <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 3f7f3b26d96..f9a377246b9 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -53,21 +53,20 @@
             <field name="model">project.task.history.cumulative</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-               <search string="Task's Analysis">
-                    <group>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
-                        <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
-                        <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
-                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
-                        <separator orientation="vertical"/>
-                        <field name="project_id"/>
-                        <field name="user_id"/>
-                    </group>
+                <search string="Task's Analysis">
+                    <field name="date"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
+                    <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
+                    <separator/>
+                    <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
+                    <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
+                    <separator/>
+                    <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
+                    <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                    <separator/>
+                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 40235ad03b7..352834e17cb 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -58,60 +58,32 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
-                    <group>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="date_deadline"/>
-                        <separator orientation="vertical"/>
-                        <filter string="New"
-                                icon="terp-document-new"
-                                domain="[('state','=','draft')]"
-                                help = "New tasks"/>
-                        <filter string="In progress"
-                                icon="terp-check"
-                                domain="[('state', '=' ,'open')]"
-                                help = "In progress tasks"/>
-                        <filter string="Pending"
-                                icon="terp-gtk-media-pause"
-                                domain="[('state','=','pending')]"
-                                help = "Pending tasks"/>
-                        <filter string="Done"
-                                icon="terp-dialog-close"
-                                name="done"
-                                domain="[('state','=','done')]"/>
-                        <filter icon="terp-folder-violet"
-                                string="My Projects"
-                                help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
-                        <filter icon="terp-personal"
-                                string="My Task"
-                                help = "My tasks"
-                                domain="[('user_id','=',uid)]" />
-                        <filter icon="terp-personal-"
-                                string="Non Assigned Tasks to users"
-                                help="Non Assigned Tasks to users"
-                                domain="[('user_id','=',False)]"/>
-                         <separator orientation="vertical"/>
-                         <field name="project_id"/>
-                         <field name="user_id" widget="selection"/>
-                         <field name="partner_id" />
-                    </group>
-                    <newline/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="date_deadline"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id" />
+                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "New tasks"/>
+                    <filter string="In progress" icon="terp-check" domain="[('state', '=' ,'open')]" help = "In progress tasks"/>
+                    <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending tasks"/>
+                    <filter string="Done" icon="terp-dialog-close" name="done" domain="[('state','=','done')]"/>
+                    <separator/>
+                    <filter icon="terp-folder-violet" string="My Projects" help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" />
+                    <filter icon="terp-personal-" string="Non Assigned Tasks to users help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/>
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
-                        <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>

From 1fa1a0792967ae0cebad56550665444a95879300 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:08:09 +0530
Subject: [PATCH 144/312] [IMP] project_gtd: improved search view.

bzr revid: tpa@tinyerp.com-20120723063809-lq0k3fayfb3gv9t2
---
 addons/project_gtd/project_gtd_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 5b48f6b4648..cce02ab329d 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -112,9 +112,9 @@
         <field name="arch" type="xml">
            <search string="My Tasks">
                 <field name="name" string="My Tasks"/>
-                <separator orientation="vertical"/>
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
+                <separator/>
                 <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
                 <group expand="0" string="Display">
                     <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>

From 329518efbeb72e487179b148161662377ed2ce3e Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:15:37 +0530
Subject: [PATCH 145/312] [IMP] project_issue: improved search view.

bzr revid: tpa@tinyerp.com-20120723064537-yfxt2pjhrwx4ma6h
---
 addons/project_issue/project_issue_view.xml   | 78 +++++++------------
 .../report/project_issue_report_view.xml      | 67 +++++-----------
 2 files changed, 44 insertions(+), 101 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e730805fb46..e96d416e51f 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -48,7 +48,6 @@
             <field name="arch" type="xml">
                 <search string="Issue Version">
                     <field name="name" string="Issue Version"/>
-                    <separator orientation="vertical"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -206,46 +205,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
-                    <group>
-                        <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-mail-message-new"
-                            string="Inbox" help="Unread messages"
-                            name="needaction_pending"
-                            domain="[('needaction_pending','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
-                        <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
-                        <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="project_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    <field name="user_id"/>
+                    <field name="project_id"/>
+                    <field name="id"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
+                    <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
+                    <separator/>
+                    <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                     <group expand="0" string="Group By..." >
-                        <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]"
-                            context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Project"  icon="terp-folder-violet" domain="[]"
-                            context="{'group_by':'project_id'}"/>
-                        <filter string="Version" icon="terp-gtk-jump-to-rtl"
-                            domain="[]" context="{'group_by':'version_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
-                            context="{'group_by':'categ_id'}"/>
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                            context="{'group_by':'priority'}"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]"
-                            context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                            context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Project"  icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Version" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'version_id'}"/>
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
                 </search>
             </field>
@@ -363,18 +342,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <group>
-                        <field name="name" string="Feature description"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
-                        <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="project_id" string="Project"/>
-                        <field name="state" groups="base.group_no_one"/>
-                    </group>
+                    <field name="name" string="Feature description"/>
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="project_id" string="Project"/>
+                    <field name="state" groups="base.group_no_one"/>
+                    <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 862f52b1931..634e40a7d56 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -52,61 +52,30 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                   <group>
-                        <field name="creation_date"/>
-                        <separator orientation="vertical" />
-                        <filter  icon="terp-camera_test"
-                            string="New"
-                            domain="[('state','=','draft')]"/>
-                        <filter  icon="terp-check"
-                            string="To Do"
-                            domain="[('state','=','open')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"/>
-                        <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
-                          <separator orientation="vertical" />
-                          <field name="project_id"/>
-                          <field name="user_id" widget="selection"/>
-                          <field name="partner_id"/>
-                          <field name="version_id" widget="selection" />
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="Assigned to" name="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
+                    <field name="creation_date"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="version_id"/>
+                    <filter  icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/>
+                    <filter  icon="terp-check" string="To Do" domain="[('state','=','open')]"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                    <group  expand="1" string="Group By...">
+                        <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Sale Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical" />
+                        <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Project"  name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
-                        <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical"/>
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
-
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
-
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
                    </group>
                </search>
             </field>

From 04dad22dcfd019e903820d2805affb6710dcb9a1 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 12:21:43 +0530
Subject: [PATCH 146/312] [IMP]Improved search view in Stock module

bzr revid: tch@tinyerp.com-20120723065143-z0er1nrxf6vrga0m
---
 addons/stock/stock_view.xml | 185 +++++++++++++-----------------------
 1 file changed, 64 insertions(+), 121 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e90a2bb8162..863f1af147d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -79,14 +79,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Inventory">
-                    <group>
-                        <field name="name" string="Inventory Reference"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Inventory Reference"/>
+                    <field name="date"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
@@ -290,13 +285,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Pack Search">
-                    <group>
-                        <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <field name="active"/>
-                    </group>
+                    <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
+                    <field name="date"/>
+                    <field name="active"/>
                 </search>
             </field>
         </record>
@@ -405,16 +396,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
-                    <group>
-                        <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
+                    <field name="date"/>
+                    <field name="product_id"/>
+                    <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
@@ -569,15 +554,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Locations">
                     <field name="name" string="Stock Locations"/>
-                    <separator orientation="vertical"/>
+                    <field name="location_id" string="Parent Location"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
                     <filter icon="terp-personal" name="customer"
                         string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
                     <filter icon="terp-personal" name="supplier"
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/>
-                    <separator orientation="vertical"/>
-                    <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
         </record>
@@ -890,26 +873,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
-                    <group>
-                        <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
-                        <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="product_id"/>
-                        <field name="stock_journal_id" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="stock_journal_id"/>
+                    <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
+                    <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
+                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                     <group expand="0" string="Group By...">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
                     </group>
                 </search>
@@ -1003,26 +978,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking list">
-                    <group>
-                        <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
-                        <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
-                        <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
-                        <separator orientation="vertical"/>
-                        <field name="stock_journal_id" widget="selection"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                   </group>
-                    <newline/>
+                    <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
+                    <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
+                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
+                    <separator/>
+                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
+                    <separator/>
+                    <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                     <group expand="0" string="Group By...">
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
                     </group>
                 </search>
@@ -1115,25 +1084,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
-                    <group>
-                        <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
-                        <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="stock_journal_id" widget="selection"/>
-                        <field name="product_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="product_id"/>
+                    <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
+                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
+                    <separator/>
+                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
+                    <separator/>
+                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
                     <group expand="0" string="Group By...">
-                        <separator orientation="vertical"/>
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
                     </group>
                 </search>
@@ -1304,33 +1267,25 @@
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group>
-                        <field name="origin" string="Stock Moves"/>
-                        <separator orientation="vertical" groups="base.group_no_one"/>
-                        <field name="date" groups="base.group_no_one"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
-                        <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
-                        <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                        <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                        <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                        <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
-                        <field name="prodlot_id"/>
-                    </group>
-                    <newline/>
+                    <field name="origin" string="Stock Moves"/>
+                    <field name="date" groups="base.group_no_one"/>
+                    <field name="product_id"/>
+                    <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
+                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
+                    <field name="prodlot_id"/>
+                    <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
+                    <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
+                    <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
+                    <separator/>
+                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
                         <filter string="Lot" name="groupby_prodlot_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'prodlot_id'}"/>
                         <filter string="Pack" name="groupby_tracking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'tracking_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Source" name="groupby_location_id" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'location_id'}"/>
                         <filter string="Destination" name="groupby_dest_location_id" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'location_dest_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-stock_effects-object-colorize" string="Status" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                         <filter string="Expected" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -1417,24 +1372,18 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group>
-                        <field name="origin" string="Stock Moves"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
-                        <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                        <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                        <field name="prodlot_id"/>
-                    </group>
-                    <newline/>
+                    <field name="origin" string="Stock Moves"/>
+                    <field name="product_id"/>
+                    <field name="prodlot_id"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
+                    <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
+                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
+                    <separator/>
+                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical" groups="base.group_no_one"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
                     </group>
                 </search>
@@ -1448,24 +1397,18 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group>
-                        <field name="origin" string="Stock Moves"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
-                        <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                        <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                        <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                        <field name="prodlot_id"/>
-                    </group>
-                    <newline/>
+                    <field name="origin" string="Stock Moves"/>
+                    <field name="product_id"/>
+                    <field name="prodlot_id"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
+                    <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
+                    <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
+                    <separator/>
+                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                     <group expand="0" string="Group By...">
-                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical" groups="base.group_no_one"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
                     </group>
                 </search>

From 7cf71677a982529301d5c87227ee4bb203826365 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 12:24:28 +0530
Subject: [PATCH 147/312] [IMP]Improve search view in membership module

bzr revid: tch@tinyerp.com-20120723065428-ndr2wtjp29o4o2k4
---
 addons/stock/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 04a0959739a..b4d026bba75 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -9,8 +9,8 @@
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
                 <field name="pricelist_id" position="before">
-                    <field name="location_id" widget="selection" context="{'location': self}"/>
-                    <field name="warehouse_id" widget="selection" context="{'warehouse': self}"/>
+                    <field name="location_id" context="{'location': self}"/>
+                    <field name="warehouse_id" context="{'warehouse': self}"/>
                 </field>
             </field>
         </record>

From 07ff3d4eaa318078ae2c297879a4cf3fd814e4f2 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:25:00 +0530
Subject: [PATCH 148/312] [IMP] project_long_term: improved search view.

bzr revid: tpa@tinyerp.com-20120723065500-xzqgj4k9atke6d62
---
 .../project_long_term_view.xml                | 41 +++++++------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7d7310465d6..d60ffb88b21 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -69,17 +69,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning of Users">
-                    <group>
-                       <field name="user_id"/>
-                       <field name="phase_id"/>
-                       <field name="project_id"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="phase_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
-                       <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                       <separator orientation="vertical"/>
-                       <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                       <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+                        <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
             </field>
@@ -272,25 +268,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
-                    <group>
-                        <field name="name" string="Project Phases"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <separator orientation="vertical"/>
-                        <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
-                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
-                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        <separator orientation="vertical"/>
-                        <field name="project_id"/>
-                    </group>
-                    <newline/> 
+                    <field name="name" string="Project Phases"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="project_id"/>
+                    <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
+                    <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
+                    <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                    <separator/>
+                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
                     </group>
                 </search>

From a95e3ad66e9934ae24d6e84c738894aa7d85e4d1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:40:03 +0530
Subject: [PATCH 149/312] [IMP] project_timesheet: improved search view.

bzr revid: tpa@tinyerp.com-20120723071003-snkgc4qt068ap9z2
---
 addons/project_timesheet/project_timesheet_view.xml  | 5 +++--
 addons/project_timesheet/report/task_report_view.xml | 9 ++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 7208885748c..3e627eaf01d 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -47,8 +47,9 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
-                <xpath expr='//filter[@string="Member"]' position='after'>
-                   <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
+                <xpath expr='//filter[@string="Project(s) Manager"]' position='after'>
+                    <separator/>
+                    <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 7e79b3793b7..32f8719e9a3 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -30,15 +30,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks by User">
-                    <group>
-                        <field name="name" string="Date"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Date"/>
+                    <field name="user_id"/>
                     <group expand="1" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>

From 25ab7f32dc6d4205676ae2e749bb10f65285a4e9 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 12:42:02 +0530
Subject: [PATCH 150/312] [IMP]improved search view

bzr revid: tch@tinyerp.com-20120723071202-yxnk98ir6mwtrh3g
---
 addons/sale_crm/sale_crm_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 0c46f0ae704..d3437fb5973 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -42,7 +42,7 @@
                         help="My Sales Team(s)"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="section_id" widget="selection" string="Sales Team"/>
+                    <field name="section_id" string="Sales Team"/>
                 </xpath>
             </field>
         </record>

From a2bf21176f38363794e4fb31653f9a0e3239eded Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:52:37 +0530
Subject: [PATCH 151/312] [IMP] purchase: improved search view.

bzr revid: tpa@tinyerp.com-20120723072237-8rkk2z0d69983vci
---
 addons/purchase/purchase_view.xml             | 84 +++++++------------
 .../purchase/report/purchase_report_view.xml  | 27 ++----
 addons/purchase/stock_view.xml                | 42 ++++------
 3 files changed, 51 insertions(+), 102 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ebc7df729b5..bf91715f1c0 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -268,29 +268,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                 <group>
                     <field name="name" string="Reference"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
-                    <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-                </group>
-              </search>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
+                    <separator/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -300,34 +294,25 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                 <group>
                     <field name="name" string="Reference"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-mail-message-new"
-                        string="Inbox" help="Unread messages"
-                        name="needaction_pending"
-                        domain="[('needaction_pending','=',True)]"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
-                    <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-                </group>
-              </search>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
+                    <separator/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -492,21 +477,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                    <group>
-                        <field name="order_id"/>
-                        <field name="product_id"/>
-                        <field name="partner_id" string="Supplier"/>
-                    </group>
-                    <newline/>
+                    <field name="order_id"/>
+                    <field name="product_id"/>
+                    <field name="partner_id" string="Supplier"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
-                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                     </group>
-               </search>
+                </search>
             </field>
         </record>
 
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 4cf91053666..b0d386e667e 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,29 +53,16 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-                <group>
-                    <filter icon="terp-document-new"
-                            string="Quotations"
-                            name="quotes"
-                            domain="[('state','=','draft')]"/>
-                    <filter icon="terp-gtk-jump-to-rtl"
-                            string="Orders"
-                            name="orders"
-                            domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                </group>
-                <newline/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <filter icon="terp-document-new" string="Quotations" name="quotes" domain="[('state','=','draft')]"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Orders" name="orders" domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="user_id"/>
                     <field name="validator"/>
-                    <separator orientation="vertical"/>
                     <field name="location_id"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <separator orientation="vertical"/>
+                    <field name="warehouse_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
                     <field name="date"/>
                     <field name="date_approve"/>
                     <field name="expected_date"/>
@@ -85,7 +72,6 @@
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                     <filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
@@ -93,11 +79,8 @@
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Order of Day"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Order of Month"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}" help="Order of Year"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 27318adc0f5..7d1a6ea895f 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -46,35 +46,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
-                    <group col="8" colspan="4">
-                        <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" name="available" string="Available"
-                            domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
-                        <filter icon="terp-dialog-close" name="done" string="Received"
-                            domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
-                        <filter icon="terp-accessories-archiver-minus" string="Back Orders"
-                            domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <filter string="To Invoice" name="to_invoice" icon="terp-dolar"
-                            domain="[('invoice_state', '=', '2binvoiced')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="stock_journal_id" widget="selection"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="purchase_id" />
-                    </group>
-                    <newline/>
+                    <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="purchase_id" />
+                    <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
+                    <filter icon="terp-dialog-close" name="done" string="Received" domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
+                    <separator/>
+                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
+                    <separator/>
+                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status"
-                            domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-go-month"
-                            domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Scheduled Date" icon="terp-go-month"
-                            domain="[]"  context="{'group_by':'min_date'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Journal" icon="terp-folder-orange"
-                            domain="[]" context="{'group_by':'stock_journal_id'}"/>
+                        <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
                     </group>
                 </search>
             </field>

From ad3f062692c3b5f679d52c71073602f237f7c64a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:58:02 +0530
Subject: [PATCH 152/312] [IMP] purchase_requisition: improved search view.

bzr revid: tpa@tinyerp.com-20120723072802-vjl6ujcgcoxm03ok
---
 .../purchase_requisition_view.xml             | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c1fc14c29bf..af2106d5466 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -134,28 +134,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
-                <group>
                     <field name="name" string="Purchase Requisition"/>
-                    <separator orientation="vertical"/>
+                    <field name="user_id" />
+                    <field name="exclusive" />
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="Sent to Suppliers" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Purchase Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
-                    <separator orientation="vertical"/>
+                    <separator/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id" />
-                    <field name="exclusive" />
-                </group>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
-                    <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
-                </group>
+                    <group expand="0" string="Group By...">
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
+                    </group>
                 </search>
             </field>
         </record>

From df64dfa6d84d72d0fe5f9ff5ae9167c3233e9d2b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 13:04:14 +0530
Subject: [PATCH 153/312] [IMP] report_intrastat,resource: improved search
 view.

bzr revid: tpa@tinyerp.com-20120723073414-dfqh6tz6x9w49jby
---
 .../report_intrastat_view.xml                 | 10 ++---
 addons/resource/resource_view.xml             | 43 ++++++-------------
 2 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index c481296196c..71dab48dd03 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -99,12 +99,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
-                    <group>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
-                        <field name="intrastat_id"/>
-                        <field name="month"/>
-                        <field name="type"/>
-                    </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
+                    <field name="intrastat_id"/>
+                    <field name="month"/>
+                    <field name="type"/>
                 </search>
             </field>
         </record>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 8a0823a8c15..ddb31744e65 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -10,23 +10,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Resource">
-                   <group>
-                       <field name="name" string="Resource"/>
-                       <separator orientation="vertical"/>
-                       <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
-                       <separator orientation="vertical"/>
-                       <field name="user_id" string="User"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       <field name="resource_type"/>
-                   </group>
-                   <newline/>
+                   <field name="name" string="Resource"/>
+                   <field name="user_id" string="User"/>
+                   <field name="company_id" groups="base.group_multi_company"/>
+                   <field name="resource_type"/>
+                   <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
                         <filter string="Working Period" icon="terp-go-today" domain="[]" context="{'group_by':'calendar_id'}"/>
                     </group>
                </search>
@@ -39,12 +31,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Working Time">
-                   <group>
-                       <field name="name" string="Working Time"/>
-                       <separator orientation="vertical"/>
-                       <field name="manager"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                   </group>
+                   <field name="name" string="Working Time"/>
+                   <field name="manager"/>
+                   <field name="company_id" groups="base.group_multi_company"/>
                </search>
             </field>
         </record>
@@ -55,19 +44,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Working Period Leaves">
-                   <group>
-                       <field name="name" string="Reason"/>
-                       <separator orientation="vertical"/>
-                       <field name="resource_id" string="Resource"/>
-                       <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
-                       <field name="calendar_id" string="Working Period" widget="selection"/>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Group By...">
+                    <field name="name" string="Reason"/>
+                    <field name="resource_id" string="Resource"/>
+                    <field name="company_id" string="Company" groups="base.group_multi_company"/>
+                    <field name="calendar_id" string="Working Period"/>
+                    <group expand="0" string="Group By...">
                         <filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_from'}" help="Starting Date of Leave"/>
                     </group>
                </search>

From e9e8d02f55855124b65c05cb9b9e9b5597dd2186 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 13:58:45 +0530
Subject: [PATCH 154/312] [IMP]improved search view of sale module

bzr revid: tch@tinyerp.com-20120723082845-5bvbhq5q93ql1vx2
---
 addons/sale/sale_view.xml | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 03a2f35cbbe..c339d48a20c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -339,26 +339,22 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
-                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new"
                         string="Inbox" help="Unread messages"
                         name="needaction_pending"
                         domain="[('needaction_pending','=',True)]"/>
-                    <separator orientation="vertical"/>
+                    <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
+                    <separator/>
                     <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
                </search>
@@ -510,14 +506,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
-                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
-                    <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
-                    <newline/>
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
+                    <separator/>
+                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
@@ -534,21 +529,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
-                    <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
-                    <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
-                    <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
-                    <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
-                    <newline/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
+                    <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
+                    <separator/>
+                    <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
+                    <separator/>
+                    <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>

From afc7040fd7eebd9a1b6adadd28df4d1710753cad Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 23 Jul 2012 13:55:00 +0200
Subject: [PATCH 155/312] [FIX] Event and Association top menu items shouldn't
 be visible for portal members

bzr revid: abo@openerp.com-20120723115500-s0z2zvt4tb3bye7s
---
 addons/association/profile_association.xml | 1 +
 addons/event/event_view.xml                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 099a6f1ac97..0627d3dba51 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -5,6 +5,7 @@
         <!-- Top menu item -->
         <menuitem name="Association"
             id="base.menu_association"
+            groups="base.group_user"
             sequence="70"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
         <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 890cb1be9e6..e51d4692edb 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -13,6 +13,7 @@
         <!-- Top menu item -->
         <menuitem name="Events"
             id="event_main_menu"
+            groups="base.group_user"
             sequence="80"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
 

From c00bd741ed90fc9af2379e42ffeeffc49a15a7da Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 23 Jul 2012 14:37:55 +0200
Subject: [PATCH 156/312] [IMP] hide buttons in the event form view

bzr revid: abo@openerp.com-20120723123755-g3n5mtqlvrczc9s4
---
 addons/event/event_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e51d4692edb..32352744fa8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -103,10 +103,12 @@
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                     <header>
-                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
-                        <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
-                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
+                        <span groups="base.user_group">
+                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
+                            <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
+                            <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
+                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
+                        </span>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>

From 8423b4a8d405d8d2522dc14a2e1274b51b0a4ae8 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 18:29:47 +0530
Subject: [PATCH 157/312] [IMP]improved search view of sale module

bzr revid: tch@tinyerp.com-20120723125947-3cmelgf50eqjizhj
---
 addons/sale/report/sale_report_view.xml | 36 ++++++++++---------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 8eb4fc85ce6..4d981cd4a8c 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -50,50 +50,42 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Analysis">
-                <group>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new"
+                <field name="date"/>
+                <field name="date_confirm"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <field name="user_id"/>
+                <filter icon="terp-document-new"
                         string="Quotations"
                         domain="[('state','=','draft')]"/>
-                    <filter icon="terp-check"
+                <filter icon="terp-check"
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
-                    <filter icon="terp-accessories-archiver"
+                <separator/>
+                <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
-                    <filter icon="terp-personal"
+                <separator/>
+                <filter icon="terp-personal"
                         string="My Sales"
                         help="My Sales"
                         domain="[('user_id','=',uid)]"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="shop_id" widget="selection"/>
-                    <field name="categ_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="shop_id"/>
+                    <field name="categ_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
-                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
-                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                    <separator orientation="vertical"/>
                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>

From 8e4d39fd9df4858598c6a6828523758023eae6bc Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 18:35:32 +0530
Subject: [PATCH 158/312] [IMP]improved search view

bzr revid: tch@tinyerp.com-20120723130532-rmssjxi03ke5qlvv
---
 addons/sale_crm/sale_crm_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index d3437fb5973..049fd764384 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -36,6 +36,7 @@
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
                 <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
+                    <separator/>
                     <filter string="My Sales Team(s)"
                         icon="terp-personal+"
                         domain="[('section_id.user_id','=',uid)]"

From 40a2edeea83a9e2f6101335fc2100a320af529ea Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 18:36:24 +0530
Subject: [PATCH 159/312] [IMP]improved search view

bzr revid: tch@tinyerp.com-20120723130624-5mwikpde82bdp9si
---
 .../report/report_membership_view.xml         | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 51e1f2499b7..bb66aca3f94 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -35,31 +35,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership">
-                    <group>
-                        <field name="date_from"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                        <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="membership_id"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="date_from"/>
+                    <field name="partner_id"/>
+                    <field name="membership_id"/>
+                    <field name="user_id"/>
+                    <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
+                    <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" name="salesman"
                             domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" name="associate_member_id"
                             domain="[]" context="{'group_by':'associate_member_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Membership Product" icon="terp-accessories-archiver" name="product"
                             domain="[]" context="{'group_by':'membership_id'}"/>
                         <filter string="Current Membership State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'membership_state'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home"
                             domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
                         <filter string="Year" name="year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}"/>
                         <filter string="Month" name="month" icon="terp-go-month"

From 2a2e51dc40754f8559b6d9eb8686cafe02a0a596 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 23 Jul 2012 15:11:02 +0200
Subject: [PATCH 160/312] [IMP] hide the Scrap button in stock view

NOTE: this view (stock/stock_view.xml) contains several commented lines (733, 1209) but also pretty weird comments, not formated following XML std (439, 1342, 1491) -- okay to remove/reformat it ?

bzr revid: abo@openerp.com-20120723131102-5rqegkdld9xylw0m
---
 addons/stock/stock_view.xml | 40 ++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e90a2bb8162..821a7136375 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -683,14 +683,9 @@
         <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" groups="stock.group_locations"
             parent="menu_stock_configuration" sequence="1"/>
 
-<!--
-              STOCK PICKING
--->
-
         <!--
-        #
-        # Defaults and Internal Pickings
-        #
+            Stock picking
+            Defaults and Internal Pickings
         -->
 
         <record model="ir.ui.view" id="stock_picking_calendar">
@@ -800,9 +795,11 @@
                                 </tree>
                                 <form string="Stock Moves" version="7.0">
                                     <header>
-                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                        <span groups="base.group_user">
+                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                            <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                        </span>
                                         <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
                                     </header>
                                     <group>
@@ -816,7 +813,8 @@
                                                 <button name="%(stock.move_scrap)d"
                                                         string="Scrap" type="action"
                                                         icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned"/>
+                                                        states="draft,waiting,confirmed,assigned"
+                                                        groups="base.group_user"/>
                                             </div>
                                             <label for="product_uos_qty" groups="product.group_uos"/>
                                             <div groups="product.group_uos">
@@ -941,11 +939,7 @@
             <field name="act_window_id" ref="action_picking_tree6"/>
         </record>
 
-        <!--
-        #
-        # Sending Products
-        #
-        -->
+        <!-- Sending Products -->
         <record id="view_picking_out_tree" model="ir.ui.view">
             <field name="name">stock.picking.out.tree</field>
             <field name="model">stock.picking</field>
@@ -1059,11 +1053,7 @@
         </record>
         <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="3"/>
 
-        <!--
-        #
-        # Incomming Shipments
-        #
-        -->
+        <!-- Incomming Shipments -->
         <record id="view_picking_in_tree" model="ir.ui.view">
             <field name="name">stock.picking.in.tree</field>
             <field name="model">stock.picking.in</field>
@@ -1191,8 +1181,7 @@
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
                         icon="gtk-convert" context="{'scrap': True}"
-                        states="draft,waiting,confirmed,assigned"
-                      />
+                        states="draft,waiting,confirmed,assigned"/>
                     <field name="prodlot_id" groups="stock.group_production_lot"/>
                     <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
@@ -1217,7 +1206,7 @@
             </field>
         </record>
 
-<!--        <menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/> -->
+        <!-- <menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/> -->
 
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
@@ -1393,8 +1382,9 @@
                 </tree>
             </field>
         </record>
+
         <!-- test -->
-          <record id="view_move_tree_reception_picking_board" model="ir.ui.view">
+        <record id="view_move_tree_reception_picking_board" model="ir.ui.view">
             <field name="name">stock.move.tree3</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>

From 15c6900ae1fd54d59ec94a7591182de98c70c10d Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Mon, 23 Jul 2012 18:46:23 +0530
Subject: [PATCH 161/312] [IMP]improved search view

bzr revid: tch@tinyerp.com-20120723131623-1gyjj818kzpofk2d
---
 .../stock/report/report_stock_move_view.xml   | 47 +++++++------------
 addons/stock/report/report_stock_view.xml     |  5 +-
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 89cbd9c1340..1631d486a1b 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -56,22 +56,22 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Moves Analysis">
-                <group>
-                    <filter string="Done"
+                <field name="product_id" default_focus="1"/>
+                <field name="partner_id" context="{'contact_display':'partner'}"/>
+                <filter string="Done"
                         name="done"
                         icon="terp-dialog-close"
                         domain="[('state','=','done')]"
                         help = "Completed Stock-Moves"/>
-                    <filter string="Todo"
+                <filter string="Todo"
                         icon="terp-gtk-go-back-rtl"
                         domain="[('state','in',('assigned','waiting','confirmed'))]"
                         help = "Future Stock-Moves"/>
-                    <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
-                    <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
-                    <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id" default_focus="1"/>
-                    <field name="partner_id" context="{'contact_display':'partner'}"/>
+                <separator/>
+                <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
+                <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
+                <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
+                    
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -79,29 +79,22 @@
                     <field name="location_dest_id" />
                     <field name="categ_id"/>
                     <field name="stock_journal"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company" widget = "selection"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter name="group_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter name="group_picking" string="Shipment" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
                     <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Type" name="group_type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}" help="Shipping type specify, goods coming in or going out"/>
                     <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Company" name="group_state" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day Planned"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}" help="Month Planned"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"  help="Year Planned"/>
@@ -163,23 +156,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
-                <group>
-                    <filter string="Real"
+                <field name="product_id" default_focus="1"/>
+                <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+                <filter string="Real"
                         name="real"
                         icon="terp-check"
                         domain="[('state','=','done')]"
                         help="Analysis of current inventory (only moves that have already been processed)"/>
-                    <filter string="Future"
+                <filter string="Future"
                         icon="terp-stock"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                         help = "Analysis including future moves (similar to virtual stock)"/>
-                    <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id" default_focus="1"/>
-                    <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </group>
-                <newline/>
+                <separator/>
+                <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id" context="{'contact_display':'partner'}"/>
                     <field name="product_categ_id" />
@@ -192,14 +182,11 @@
                 <newline/>
                 <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                      <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter name="group_company" string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 69a7829f565..fb6f21e8a42 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -35,15 +35,14 @@
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
                     <field name="date"/>
-                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable"
                         domain="[('product_id.type','=', 'consu')]"/>
+                    <separator/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id"/>
                 </search>
             </field>
         </record>

From c89219e121a27d2fe1f988bdddf1bba961ac7d54 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 23 Jul 2012 18:59:28 +0530
Subject: [PATCH 162/312] [FIX] typo

bzr revid: jam@tinyerp.com-20120723132928-dbf3uwv3963yk3o1
---
 addons/crm/report/crm_lead_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index bffb7a31326..00142821c01 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -91,7 +91,7 @@
                         <field name="categ_id"/>
                         <field name="type_id"/>
                         <field name="channel_id"/>
-                        <field name="company_id"groups="base.group_multi_company"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                         <field name="create_date"/>
                         <field name="opening_date"/>
                         <field name="date_closed"/>

From cc9b72c5ed2d6bd2011b1140c772cbbf2763d0a6 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 23 Jul 2012 16:20:57 +0200
Subject: [PATCH 163/312] [IMP] hide header's buttons in
 stock.view_picking_out_form

bzr revid: abo@openerp.com-20120723142057-9iqwxjij09o2jkww
---
 addons/delivery/delivery_view.xml |  6 ++---
 addons/stock/stock_view.xml       | 45 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 457b2d38c90..3df167d63d2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -15,7 +15,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_delivery_carrier_form" model="ir.ui.view">
             <field name="name">delivery.carrier.form</field>
             <field name="model">delivery.carrier</field>
@@ -90,7 +90,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
             <field name="name">Delivery Method</field>
             <field name="type">ir.actions.act_window</field>
@@ -299,7 +299,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/header/button[@string='Create Invoice']" position="after">
+                <xpath expr="/form/header//button[@string='Create Invoice']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 821a7136375..9568f578b76 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -728,14 +728,15 @@
             <field name="arch" type="xml">
                 <form string="Internal Picking List" version="7.0">
                 <header>
-                    <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight"/>
-                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight"/>
-                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
-                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
-                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
-                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
+                    <span groups="base.group_user">
+                        <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight"/>
+                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
+                        <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
+                        <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
+                        <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
+                        <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
+                    </span>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
@@ -771,7 +772,8 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
+                                        states="draft,waiting,confirmed,assigned"
+                                        groups="base.group_user"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="prodlot_id" groups="stock.group_production_lot"/>
                                     <button
@@ -965,18 +967,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_highlight"/>
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
                     </xpath>
-                    <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
+                    <xpath expr="/form/header//button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_highlight"/>
                         <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                     </xpath>
-                    <xpath expr="/form/header/button[@name='action_process']" position="replace">
+                    <xpath expr="/form/header//button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </xpath>
-                    <xpath expr="/form/header/field[@name='state']" position="replace">
+                    <xpath expr="/form/header//field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </xpath>
                     <xpath expr="//field[@name='partner_id']" position="replace">
@@ -1079,7 +1081,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
                     </xpath>
                     <xpath expr="//button[@name='draft_validate']" position="replace">
@@ -1206,8 +1208,6 @@
             </field>
         </record>
 
-        <!-- <menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/> -->
-
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
@@ -1339,13 +1339,10 @@
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
 
-        ====================================
-        Reception Picking (By Stock Move)
-        ====================================
-            <!--  from stock_partial_move_view -->
-
-
-
+        <!--
+            Reception Picking (By Stock Move)
+            From stock_partial_move_view
+        -->
         <record id="view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.tree2</field>
             <field name="model">stock.move</field>
@@ -1365,7 +1362,7 @@
                     <field name="prodlot_id" groups="stock.group_production_lot"/>
                     <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                       states="draft,waiting,confirmed,assigned,done"
+                        states="draft,waiting,confirmed,assigned,done"
                         groups="stock.group_tracking_lot"/>
                     <field name="tracking_id" groups="stock.group_tracking_lot"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"

From 76df099fe029764e5b7bc9dba3dfc7904f7fdd6f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 23 Jul 2012 17:45:29 +0200
Subject: [PATCH 164/312] [IMP] hide the member price in products view

bzr revid: abo@openerp.com-20120723154529-blsb2i0ouneo2uhj
---
 addons/membership/membership.py       | 2 +-
 addons/membership/membership_view.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 06b84ec80c5..b75a813f285 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -146,7 +146,7 @@ class membership_line(osv.osv):
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date', help="Date on which member has joined the membership"),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True,  help='Amount for the membership'),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True, help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
         'state': fields.function(_state,
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 5eea7170367..26fc7883ef1 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -19,9 +19,9 @@
                     <field name="categ_id" widget="selection" operator="child_of"/>
                     <newline/>
                     <group  expand='0' string='Group by...'>
-                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
+                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
+                        <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}"/>
                     </group>
                 </search>
             </field>
@@ -177,7 +177,7 @@
                     <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
                     <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
                     <group expand="0" string="Group By..." colspan="10" col="8">
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}"/>
                         <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
                         <separator orientation="vertical"/>
                         <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
@@ -288,7 +288,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="list_price" position="after">
-                    <field name="member_price"/>
+                    <field name="member_price" groups="base.group_user"/>
                 </field>
             </field>
         </record>

From 16b3bedd6a20f311d223e159b270f2e66c61e66a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 23 Jul 2012 18:15:38 +0200
Subject: [PATCH 165/312] [FIX] a right problem in portal_project_issue also
 fix a css glitch

bzr revid: abo@openerp.com-20120723161538-sd53bczjbb7je1q6
---
 addons/portal_project_issue/security/ir.model.access.csv      | 3 ++-
 .../static/src/css/portal_project_issue.css                   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/portal_project_issue/security/ir.model.access.csv b/addons/portal_project_issue/security/ir.model.access.csv
index 8ddfff0f398..5257f9b6d02 100644
--- a/addons/portal_project_issue/security/ir.model.access.csv
+++ b/addons/portal_project_issue/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_issues,project_issue,project_issue.model_project_issue,portal.group_portal_member,1,0,1,0
+access_issues,project_issue,project_issue.model_project_issue,portal.group_portal_member,1,0,0,0
+access_case_section,crm_case_section,crm.model_crm_case_section,portal.group_portal_member,1,0,0,0
diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/portal_project_issue/static/src/css/portal_project_issue.css
index 3ad30208d6d..39c12c6076d 100644
--- a/addons/portal_project_issue/static/src/css/portal_project_issue.css
+++ b/addons/portal_project_issue/static/src/css/portal_project_issue.css
@@ -3,6 +3,10 @@
     margin: 0 auto;
 }
 
+.oe_portal_project_issue .oe_kanban_groups {
+    width: 100%;
+}
+
 .oe_portal_project_issue .oe_fold_column.oe_kanban_record {
     float: none;
     display: block;

From 141489082778bb1e990637d43c1fab26fbcb252b Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 24 Jul 2012 09:32:42 +0530
Subject: [PATCH 166/312] [FIX] project typo

bzr revid: jam@tinyerp.com-20120724040242-5ydj706e9a49d5zc
---
 addons/project/report/project_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 352834e17cb..45c813bb596 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -72,7 +72,7 @@
                     <filter icon="terp-folder-violet" string="My Projects" help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" />
-                    <filter icon="terp-personal-" string="Non Assigned Tasks to users help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
+                    <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company"/>

From b3226b30a30ddd245fe43b561b50b2ed851fe621 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 24 Jul 2012 10:31:16 +0530
Subject: [PATCH 167/312] [FIX] Stock TYPO

bzr revid: jam@tinyerp.com-20120724050116-yz1i63wdtqwt165m
---
 addons/stock/report/report_stock_move_view.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 1631d486a1b..42748930b5f 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -71,19 +71,14 @@
                 <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
                 <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
                 <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
-                    
-                </group>
-                <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="location_id" />
                     <field name="location_dest_id" />
                     <field name="categ_id"/>
                     <field name="stock_journal"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
                     <field name="date"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <filter name="group_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>

From 38ef32691ba0f0343823ab37d5aef529697d5221 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 24 Jul 2012 11:20:28 +0530
Subject: [PATCH 168/312] [IMP] remove selection widget.

bzr revid: tpa@tinyerp.com-20120724055028-ychb5p0ulmcveidu
---
 addons/account_payment/account_payment_view.xml                 | 2 +-
 .../report/account_voucher_sales_receipt_view.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 2ac5f8c49e2..147bb31d78e 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -214,7 +214,7 @@
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <field name="reference" string="Payment Order"/>
-                    <field name="mode" widget='selection'/>
+                    <field name="mode"/>
                     <field name="state"/>
                     <field name="date_done"/>
                     <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index eda8b349943..b94164af1a4 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -55,7 +55,7 @@
                 <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help = "Pro-forma Vouchers"/>
                 <filter string="Posted" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Validated Vouchers"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="journal_id" widget="selection"/>
+                    <field name="journal_id"/>
                     <field name="account_id"/>
                     <field name="pay_now"/>
                     <field name="company_id" groups="base.group_multi_company"/>

From 82c72fe0dc6872cddeff24d419fef12be9e039d8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 24 Jul 2012 11:27:24 +0530
Subject: [PATCH 169/312] [IMP] event: improved search views.

bzr revid: tpa@tinyerp.com-20120724055724-0d2udznviv0jga29
---
 addons/event/event_view.xml                   | 31 ++++----------
 .../report/report_event_registration_view.xml | 42 +++++--------------
 2 files changed, 17 insertions(+), 56 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0dc40c7f64d..77c06d8c389 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -331,29 +331,19 @@
                     <field name="name" string="Events"/>
                     <field name="type"/>
                     <field name="user_id"/>
-                    <filter icon="terp-mail-message-new"
-                        string="Inbox" help="Unread messages"
-                        name="needaction_pending"
-                        domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                     <separator/>
-                    <filter icon="terp-personal"
-                              string="My Events"
-                                help="My Events"
-                              domain="[('user_id','=',uid)]"/>
+                    <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <separator/>
-                    <filter icon="terp-go-today" string="Upcoming"
-                                name="upcoming"
-                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                                help="Upcoming events from today" />
+                    <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" />
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <filter string="Starting Date" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'date_begin'}"/>
+                        <filter string="Starting Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
                 </search>
             </field>
@@ -524,22 +514,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
-                    <field name="name" string="Participant"
-                            filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
+                    <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
                     <field name="event_id"/>
                     <field name="user_id"/>
-                    <filter icon="terp-mail-message-new"
-                            string="Inbox" help="Unread messages"
-                            name="needaction_pending"
-                            domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                     <separator/>
-                    <filter icon="terp-personal"
-                              string="My Registrations"
-                                help="My Registrations"
-                              domain="[('user_id','=',uid)]"/>
+                    <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 7ae6c0fae2e..22df2268efc 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -52,24 +52,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event on Registration">
-                    <group>
-                        <filter icon="terp-document-new"
-                            string="New"
-                            domain="[('event_state','=','draft')]"
-                            help="Events which are in New state"/>
-                        <filter icon="terp-check"
-                            string="Confirm"
-                            domain="[('event_state','=','confirm')]"
-                            help="Events which are in confirm state"/>
-                        <filter icon="terp-personal"
-                            string="My Events"
-                            help="My Events"
-                            domain="[('user_id','=',uid)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="event_id" string="Event"/>
-                        <field name="user_id" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="event_id" string="Event"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-document-new" string="New" domain="[('event_state','=','draft')]" help="Events which are in New state"/>
+                    <filter icon="terp-check" string="Confirm" domain="[('event_state','=','confirm')]" help="Events which are in confirm state"/>
+                    <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="event_type" widget="selection"/>
                         <field name="event_date"/>
@@ -80,27 +67,18 @@
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
                         <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.extended"/>
                         <filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'event_type'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Event State" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}"/>
                         <filter string="Registration State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
+                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
                     </group>
                     <group expand="0" string="Display">
-                        <filter icon="terp-camera_test"
-                              string="Show Confirmed Registrations"
-                              help="Registrations in confirmed or done state"
-                              context="{'no_of_draft_invisible':1}"/>
+                        <filter icon="terp-camera_test" string="Show Confirmed Registrations"
+                              help="Registrations in confirmed or done state" context="{'no_of_draft_invisible':1}"/>
                     </group>
                 </search>
             </field>

From 8c9f39e52d909c6acffdde52eb425f2e661a0ae8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 24 Jul 2012 11:36:38 +0530
Subject: [PATCH 170/312] [IMP] improved search view of lunch module.

bzr revid: tpa@tinyerp.com-20120724060638-zqfw9dzfqrbofa7e
---
 .../hr_recruitment/report/hr_recruitment_report_view.xml   | 1 -
 addons/idea/idea_view.xml                                  | 3 +--
 addons/lunch/report/report_lunch_order_view.xml            | 7 +------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index d7df225e4b0..4c8d967845b 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -66,7 +66,6 @@
                     <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By ...">
                    <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 2db044fc9a2..8e1e4b50a5f 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -114,8 +114,7 @@
                 <field name="category_ids"/>
                 <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
                 <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
-                <filter icon="terp-check" string="Accepted"
-                        domain="[('state','=','close')]" help="Accepted Ideas" />
+                <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" />
                 <group expand="0" string="Group By...">
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index 01de4be1354..717573687df 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -25,19 +25,14 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Lunch Order Analysis">
-                <group>
-                    <field name="date"/>
-                </group>
-                <newline/>
+                <field name="date"/>
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
             </search>
         </field>
     </record>

From 77f3bdb32157b24c88242562a06ec882002d77aa Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 24 Jul 2012 11:46:15 +0530
Subject: [PATCH 171/312] [IMP] improved view in sale.

bzr revid: tpa@tinyerp.com-20120724061615-jk6gi4fe91vhs51l
---
 addons/sale/report/sale_report_view.xml | 24 +++++++-----------------
 addons/sale/sale_view.xml               |  5 +----
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 4d981cd4a8c..88c15e38d20 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -55,27 +55,17 @@
                 <field name="partner_id"/>
                 <field name="product_id"/>
                 <field name="user_id"/>
-                <filter icon="terp-document-new"
-                        string="Quotations"
-                        domain="[('state','=','draft')]"/>
-                <filter icon="terp-check"
-                        string="Sales"
-                        domain="[('state','not in',('draft','done','cancel'))]"/>
+                <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                <filter icon="terp-check" string="Sales" domain="[('state','not in',('draft','done','cancel'))]"/>
                 <separator/>
-                <filter icon="terp-accessories-archiver"
-                        string="Picked"
-                        domain="[('shipped','=',True)]"/>
+                <filter icon="terp-accessories-archiver" string="Picked" domain="[('shipped','=',True)]"/>
                 <separator/>
-                <filter icon="terp-personal"
-                        string="My Sales"
-                        help="My Sales"
-                        domain="[('user_id','=',uid)]"/>
+                <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="shop_id"/>
                     <field name="categ_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
@@ -86,9 +76,9 @@
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
-                   <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
-                   <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
+                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
                 </group>
             </search>
         </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c339d48a20c..4c2b1866881 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -341,10 +341,7 @@
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <filter icon="terp-mail-message-new"
-                        string="Inbox" help="Unread messages"
-                        name="needaction_pending"
-                        domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>

From 95c16f11f3b775353a1c91ba6c9ce706e5fbd743 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 24 Jul 2012 11:52:16 +0530
Subject: [PATCH 172/312] [IMP] improved search views of stock

bzr revid: tpa@tinyerp.com-20120724062216-ebb65mu1d2fgv4ei
---
 .../stock/report/report_stock_move_view.xml   | 27 +++++--------------
 addons/stock/report/report_stock_view.xml     |  9 +++----
 addons/stock/stock_view.xml                   |  9 +++----
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 42748930b5f..69f26dbb374 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -58,15 +58,8 @@
             <search string="Moves Analysis">
                 <field name="product_id" default_focus="1"/>
                 <field name="partner_id" context="{'contact_display':'partner'}"/>
-                <filter string="Done"
-                        name="done"
-                        icon="terp-dialog-close"
-                        domain="[('state','=','done')]"
-                        help = "Completed Stock-Moves"/>
-                <filter string="Todo"
-                        icon="terp-gtk-go-back-rtl"
-                        domain="[('state','in',('assigned','waiting','confirmed'))]"
-                        help = "Future Stock-Moves"/>
+                <filter string="Done" name="done" icon="terp-dialog-close" domain="[('state','=','done')]" help = "Completed Stock-Moves"/>
+                <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('assigned','waiting','confirmed'))]" help = "Future Stock-Moves"/>
                 <separator/>
                 <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
                 <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
@@ -154,15 +147,10 @@
                 <field name="product_id" default_focus="1"/>
                 <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
                 <field name="company_id" groups="base.group_multi_company"/>
-                <filter string="Real"
-                        name="real"
-                        icon="terp-check"
-                        domain="[('state','=','done')]"
-                        help="Analysis of current inventory (only moves that have already been processed)"/>
-                <filter string="Future"
-                        icon="terp-stock"
-                        domain="[('state','in',('assigned','done','waiting','confirmed'))]"
-                        help = "Analysis including future moves (similar to virtual stock)"/>
+                <filter string="Real" name="real" icon="terp-check" domain="[('state','=','done')]"
+                    help="Analysis of current inventory (only moves that have already been processed)"/>
+                <filter string="Future" icon="terp-stock" domain="[('state','in',('assigned','done','waiting','confirmed'))]"
+                    help = "Analysis including future moves (similar to virtual stock)"/>
                 <separator/>
                 <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                 <group expand="0" string="Extended Filters...">
@@ -174,12 +162,11 @@
                     <field name="date"/>
                     <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                     <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/>
+                    <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/>
                     <filter name="group_company" string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index fb6f21e8a42..bcd5d903251 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -36,13 +36,10 @@
                 <search string="Dates of Inventories">
                     <field name="date"/>
                     <field name="product_id"/>
-                    <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
-                        domain="[('product_id.type','=', 'product')]"/>
-                    <filter icon="terp-accessories-archiver" string="Consumable"
-                        domain="[('product_id.type','=', 'consu')]"/>
+                    <filter icon="terp-accessories-archiver" name="stockable" string="Stockable" domain="[('product_id.type','=', 'product')]"/>
+                    <filter icon="terp-accessories-archiver" string="Consumable" domain="[('product_id.type','=', 'consu')]"/>
                     <separator/>
-                    <filter icon="terp-accessories-archiver-minus" string="Non Inv"
-                        domain="[('date','=', False)]"/>
+                    <filter icon="terp-accessories-archiver-minus" string="Non Inv" domain="[('date','=', False)]"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 863f1af147d..a51770fffc1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -555,12 +555,9 @@
                 <search string="Stock Locations">
                     <field name="name" string="Stock Locations"/>
                     <field name="location_id" string="Parent Location"/>
-                    <filter icon="terp-go-home" name="in_location"
-                        string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
-                    <filter icon="terp-personal" name="customer"
-                        string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
-                    <filter icon="terp-personal" name="supplier"
-                        string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/>
+                    <filter icon="terp-go-home" name="in_location" string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
+                    <filter icon="terp-personal" name="customer" string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
+                    <filter icon="terp-personal" name="supplier" string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/>
                 </search>
             </field>
         </record>

From a4efa58a1aeb9a967d5da6183a6c8f03855de206 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 24 Jul 2012 11:55:49 +0530
Subject: [PATCH 173/312] [IMP] Improved serch view in share.

bzr revid: tpa@tinyerp.com-20120724062549-zb12vt1c6y3vqlpx
---
 addons/share/res_users_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index f70177f5fe3..3af69bb025b 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -7,7 +7,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='name']" position="after">
+                <xpath expr="//field[@name='company_ids']" position="after">
                     <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
                         domain="[('share','=',False)]"/>
                 </xpath>
@@ -32,8 +32,7 @@
                 <search string="Groups">
                     <field name="name" string="Group"/>
                     <field name="share"/>
-                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
-                        domain="[('share','=',False)]"/>
+                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner" domain="[('share','=',False)]"/>
                 </search>
             </field>
         </record>

From 4e3cc2fbf41c643cde7d3129a4034b0de3cc2f46 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 24 Jul 2012 18:21:25 +0200
Subject: [PATCH 174/312] [IMP] portal module description

bzr revid: abo@openerp.com-20120724162125-cx1a8n2q9yjopf2a
---
 addons/portal/__openerp__.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 72be8edb4b8..24ad7beb0b8 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -26,14 +26,15 @@
     'author' : "OpenERP SA",
     'category': 'Portal',
     'description': """
-This module defines 'portals' to customize the access to your OpenERP database
-for external users.
+Customize acces to your OpenERP database to external users by creating portals.
 
-A portal defines customized user menu and access rights for a group of users
-(the ones associated to that portal).  It also associates user groups to the
-portal users (adding a group in the portal automatically adds it to the portal
-users, etc).  That feature is very handy when used in combination with the
-module 'share'.
+A portal defines a specific user menu and access rights for its members.  This
+menu can ben seen by portal members, anonymous users and any other user that
+have the access to technical features (e.g. the administrator).
+
+It also associates user groups to the portal users (adding a group in the
+portal automatically adds it to the portal users, etc).  That feature is very
+handy when used in combination with the module 'share'.
     """,
     'website': 'http://www.openerp.com',
     'data': [

From 32b2da30e41f069f46158a6d2bb8562b7140c7af Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 24 Jul 2012 18:33:06 +0200
Subject: [PATCH 175/312] [IMP] portal module description also
 portal_hr_employees css

bzr revid: abo@openerp.com-20120724163306-oa1nmk54888u9m17
---
 addons/portal/__openerp__.py                                | 6 +++---
 addons/portal_crm/wizard/contact_view.xml                   | 1 -
 .../static/src/css/portal_hr_employees.css                  | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 24ad7beb0b8..173e4422536 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -32,9 +32,9 @@ A portal defines a specific user menu and access rights for its members.  This
 menu can ben seen by portal members, anonymous users and any other user that
 have the access to technical features (e.g. the administrator).
 
-It also associates user groups to the portal users (adding a group in the
-portal automatically adds it to the portal users, etc).  That feature is very
-handy when used in combination with the module 'share'.
+The module also associates user groups to the portal users (adding a group in
+the portal automatically adds it to the portal users, etc).  That feature is
+very handy when used in combination with the module 'share'.
     """,
     'website': 'http://www.openerp.com',
     'data': [
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 4f1a776fe91..4a388dca275 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -38,7 +38,6 @@
                                             <field name="state_id"/>
                                             <templates>
                                                 <t t-name="kanban-box">
-                                                    <!-- <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/> -->
                                                     <h4><field name="name"/></h4>
                                                     <ul class="oe_portal_crm_address">
                                                         <li t-if="record.street"><field name="street"/></li>
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
index d153f8c52fb..351fd442f20 100644
--- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -1,4 +1,7 @@
 /* Employees list section */
+.openerp .oe_portal_crm_contact .oe_kanban_groups {
+    width: 100%;
+}
 .openerp .oe_portal_crm_contact .oe_portal_crm_team {
     padding: 8px 0 0 0;
 }

From 974d4f4f106762dafb82b6d6f7a7a43fd6cdacdb Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 25 Jul 2012 10:24:46 +0200
Subject: [PATCH 176/312] rename widget event namespace

bzr revid: al@openerp.com-20120725082446-eahrub8qigektert
---
 addons/web/static/src/js/corelib.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index dcaaa864fc8..6c7fd539b38 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -768,7 +768,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
             var event = match[1];
             var selector = match[3];
 
-            event += '.delegated-events';
+            event += '.widget_events';
             if (!selector) {
                 this.$el.on(event, method);
             } else {
@@ -777,7 +777,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
         }
     },
     undelegateEvents: function () {
-        this.$el.off('.delegated-events');
+        this.$el.off('.widget_events');
     },
     /**
      * Shortcut for ``this.$el.find(selector)``

From 0310d5ae73b34ded9c67c3a4b7423afabccd5630 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 25 Jul 2012 11:13:31 +0200
Subject: [PATCH 177/312] [REM] #events can't be a function anymore

bzr revid: xmo@openerp.com-20120725091331-jvhgyf427cuxbwl4
---
 addons/web/static/test/Widget.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index b50dd233a13..99bae019ae4 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -197,17 +197,6 @@ $(document).ready(function () {
             ok(a[i], "should pass test " + i);
         }
     });
-    test('delegate(Function)', function () {
-        var clicked = false, fn = function () {
-            return { 'click li': function () { clicked = true; } }; };
-        var w = new (instance.web.Widget.extend({
-            template: 'test.widget.template',
-            events: fn
-        }));
-        w.renderElement();
-        w.$('li:first').click();
-        ok(clicked, "should accept #events to be a function");
-    });
     test('undelegate', function () {
         var clicked = false, newclicked = false;
         var w = new (instance.web.Widget.extend({

From 9cc2f4fb2553e7c327cbe97e49ab693813500c4b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 25 Jul 2012 11:19:16 +0200
Subject: [PATCH 178/312] [IMP] extract 'set element as new widget root and
 replace old one in DOM' in its own method

also fix OldWidget to use it, as it had not been fixed when #replaceWith was extracted out of setElement

bzr revid: xmo@openerp.com-20120725091916-g9t5qmaeeqcceuk1
---
 addons/web/static/src/js/corelib.js   | 15 +++++++++++++--
 addons/web/static/src/js/coresetup.js |  3 +--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 6c7fd539b38..42e549b5ca1 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -706,13 +706,24 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
             if (this.className) { attrs['class'] = this.className; }
             $el = $(this.make(this.tagName, attrs));
         }
+        this.replaceElement($el);
+    },
+
+    /**
+     * Re-sets the widget's root element and replaces the old root element
+     * (if any) by the new one in the DOM.
+     *
+     * @param {HTMLElement | jQuery} $el
+     * @returns {*} this
+     */
+    replaceElement: function ($el) {
         var $oldel = this.$el;
         this.setElement($el);
         if ($oldel && !$oldel.is(this.$el)) {
             $oldel.replaceWith(this.$el);
         }
+        return this;
     },
-
     /**
      * Re-sets the widget's root element (el/$el/$element).
      *
@@ -723,7 +734,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      *   element in the DOM
      *
      * @param {HTMLElement | jQuery} element new root element for the widget
-     * @return {*}
+     * @return {*} this
      */
     setElement: function (element) {
         if (this.$el) {
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index c9015220ba7..b86b0534e3b 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -26,8 +26,7 @@ instance.web.OldWidget = instance.web.Widget.extend({
     renderElement: function() {
         var rendered = this.render();
         if (rendered) {
-            var $el = $(rendered);
-            this.setElement($el);
+            this.replaceElement($(rendered));
         }
         return this;
     },

From 0924a29e7aa8d673bbeb2b57237187b4a24d63ed Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 25 Jul 2012 11:34:37 +0200
Subject: [PATCH 179/312] [FIX] backbonify Client

bzr revid: chs@openerp.com-20120725093437-hig5jtkdol9uagca
---
 addons/web/static/src/js/chrome.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b5c69f5c82f..6b3f5eecdb8 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -58,7 +58,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         var self = this;
         this._super(parent);
         if (content) {
-            this.$element = content instanceof $ ? content : $(content);
+            this.setElement(content);
         }
         this.dialog_options = {
             modal: true,
@@ -879,8 +879,7 @@ instance.web.Client = instance.web.Widget.extend({
         var self = this;
         return instance.connection.session_bind(this.origin).then(function() {
             var $e = $(QWeb.render(self._template, {}));
-            self.$element.replaceWith($e);
-            self.$element = $e;
+            self.replaceElement($e);
             self.bind_events();
             self.show_common();
         });

From 0b6fc4f28066437ebec2356019981d31e0d34977 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 11:46:45 +0200
Subject: [PATCH 180/312] [IMP] portal demo data and some of the module's
 comments

bzr revid: abo@openerp.com-20120725094645-89dxrmdy4t684219
---
 addons/portal/__openerp__.py               |  3 ++-
 addons/portal/portal.py                    | 30 +++++++++++-----------
 addons/portal/portal_demo.xml              |  9 ++++---
 addons/portal/security/portal_security.xml |  4 +--
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 173e4422536..6dd22a46ca2 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -26,11 +26,12 @@
     'author' : "OpenERP SA",
     'category': 'Portal',
     'description': """
-Customize acces to your OpenERP database to external users by creating portals.
+Customize access to your OpenERP database to external users by creating portals.
 
 A portal defines a specific user menu and access rights for its members.  This
 menu can ben seen by portal members, anonymous users and any other user that
 have the access to technical features (e.g. the administrator).
+Also, each portal member is linked to a specific partner.
 
 The module also associates user groups to the portal users (adding a group in
 the portal automatically adds it to the portal users, etc).  That feature is
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 399377e8ccc..2c8b2db587d 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -32,7 +32,7 @@ class portal(osv.osv):
     _name = 'res.portal'
     _description = 'Portal'
     _inherits = {'res.groups': 'group_id'}
-    
+
     _columns = {
         'group_id': fields.many2one('res.groups', required=True, ondelete='cascade',
             string='Group',
@@ -53,40 +53,40 @@ class portal(osv.osv):
             string='Widgets',
             help='Widgets assigned to portal users'),
     }
-    
+
     def copy(self, cr, uid, id, values, context=None):
         """ override copy(): menu_action_id must be different """
         values['menu_action_id'] = None
         return super(portal, self).copy(cr, uid, id, values, context)
-    
+
     def create(self, cr, uid, values, context=None):
         """ extend create() to assign the portal menu to users """
         if context is None:
             context = {}
-        
+
         # create portal (admin should not be included)
         context['noadmin'] = True
         portal_id = super(portal, self).create(cr, uid, values, context)
-        
+
         # assign menu action and widgets to users
         if values.get('users') or values.get('menu_action_id'):
             self._assign_menu(cr, uid, [portal_id], context)
         if values.get('users') or values.get('widget_ids'):
             self._assign_widgets(cr, uid, [portal_id], context)
-        
+
         return portal_id
-    
+
     def write(self, cr, uid, ids, values, context=None):
         """ extend write() to reflect changes on users """
         # first apply portal changes
         super(portal, self).write(cr, uid, ids, values, context)
-        
+
         # assign menu action and widgets to users
         if values.get('users') or values.get('menu_action_id'):
             self._assign_menu(cr, uid, ids, context)
         if values.get('users') or values.get('widget_ids'):
             self._assign_widgets(cr, uid, ids, context)
-        
+
         # if parent_menu_id has changed, apply the change on menu_action_id
         if 'parent_menu_id' in values:
             act_window_obj = self.pool.get('ir.actions.act_window')
@@ -95,7 +95,7 @@ class portal(osv.osv):
             if action_ids:
                 action_values = {'domain': [('parent_id', '=', values['parent_menu_id'])]}
                 act_window_obj.write(cr, uid, action_ids, action_values, context)
-        
+
         return True
 
     def _assign_menu(self, cr, uid, ids, context=None):
@@ -131,26 +131,26 @@ portal()
 
 class portal_override_menu(osv.osv):
     """
-        extend res.portal with a boolean field 'Override Users Menu', that
+        Extend res.portal with a boolean field 'Override Users Menu', that
         triggers the creation or removal of menu_action_id
     """
     _name = 'res.portal'
     _inherit = 'res.portal'
-    
+
     def _get_override_menu(self, cr, uid, ids, field_name, arg, context=None):
         assert field_name == 'override_menu'
         result = {}
         for p in self.browse(cr, uid, ids, context):
             result[p.id] = bool(p.menu_action_id)
         return result
-    
+
     def _set_override_menu(self, cr, uid, id, field_name, field_value, arg, context=None):
         assert field_name == 'override_menu'
         if field_value:
             self.create_menu_action(cr, uid, id, context)
         else:
             self.write(cr, uid, [id], {'menu_action_id': False}, context)
-    
+
     def create_menu_action(self, cr, uid, id, context=None):
         """ create, if necessary, a menu action that opens the menu items below
             parent_menu_id """
@@ -169,7 +169,7 @@ class portal_override_menu(osv.osv):
             }
             action_id = actions_obj.create(cr, uid, action_values, context)
             self.write(cr, uid, [id], {'menu_action_id': action_id}, context)
-    
+
     _columns = {
         'override_menu': fields.function(
             _get_override_menu, fnct_inv=_set_override_menu,
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index a0fb515eea2..da3ab53e1bc 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -2,19 +2,20 @@
 <openerp>
     <data>
 
-        <record id="portal_demo_user" model="res.users">
+        <!-- Create a portal member attached to a partner -->
+        <record id="demo_user0" model="res.users">
             <field name="name">Demo Portal User</field>
             <field name="login">portal</field>
             <field name="password">portal</field>
             <field name="avatar">/9j/4AAQSkZJRgABAQEASABIAAD/4RJ/RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAMAAAAcgEyAAIAAAAUAAAAfodpAAQAAAABAAAAkgAAANQAAABIAAAAAQAAAEgAAAABR0lNUCAyLjYuMTIAMjAxMjowNToyOSAxMjoxMjoyNgAABZAAAAcAAAAEMDIxMKAAAAcAAAAEMDEwMKABAAMAAAABAAEAAKACAAQAAAABAAAAlqADAAQAAAABAAAAlgAAAAAABgEDAAMAAAABAAYAAAEaAAUAAAABAAABIgEbAAUAAAABAAABKgEoAAMAAAABAAIAAAIBAAQAAAABAAABMgICAAQAAAABAAARRQAAAAAAAABIAAAAAQAAAEgAAAAB/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCACWAJYDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwCp9tT/AJ9lpftUROfs6j8BVEkggAZzXN+JtXeAmyiO3gGQ9zntXOlc2LGt+IlmLW2nW6LyQ85Ayf8Ad/xrlXTc5LyAtnLHr/OqjSlzy7Y9zShGznIxjuau1hXuXAQowkig46VXYgMffqaQDy17EnvinpGXDYXJCknHakMhDlicD6CnfcA+XFdf4I8Ow6v9rnm5WLau33OTn9K7FPCOnxEbYR05JwSaynWjF2ZrChKaujx7d6/qKsW975LLvBKKe3avUL/wRpV0rYjMbnowPINeda74futDuNkvzwv9yQdD7expwqxnognRlDUsrL55LLkgdqnsVR3PmDjNYum3fkvsY9Tge4rSSXYj4+8TV9TI2/Jsdy43deOa9fb7x+teH2ZJnijkkOXcAE9smvbyeTUTEx1A5pM8UqH+dZiJF4OPUUpOTmmKQGPrTu/FUgFD7Rk0UjEA4opiPNWU7cDrXmWsXZutSuJt2QznHbgcD9BXpsZDY9a8juQ3mtwSFJA/CtYFS2HpIoONuSenrU0Qd5ACAoHOAar26HfuatGBQASABVMSEK9T6Vu+GrQXtrrEITdL9iZ4/wDgDoxH5VkzQMtlFPg7ZHYfXGK3vB0hstQllP3fs8gI9cqT/wCy1nN+7oawXvJM3fhfOqrqsG4Bj5TAeo+YH+n5135IIryfwjLLpPipLeQECfMTD68j9cV6r0UCuOuvfudlB+5Yjk71ha5p8Wp2EtrKMBh8rd1bsa3D19ap3KrtLMwCjqT2rKLs7o2aurM8LuYZLO7khlXbJG5Vh7g1rQN5yCTHXk1d8b21t9tjvLSWORZQVl2MDhh0J+o/lWTo04dXtnbB/h969KL5o3PLnHlk0bVuUkvbQjAxKn8xXtp5NeJ2Vk5vrUZ585MD8RXtneokQHSlUkGk70Z54rMBwJ3/AI1JnmowpLufQZp8BBlwRnIqkDF6mik6Eiii4jzKKAQAnex57mvMb1JYr+eIRk7JXXdj0YivUQ28EVwWtJ5eq3Azwzlh+PNbR0LZkIkhPOEHp1JrVsbWS7mSCJSzMQOKzywBznjtXe+A7aPM1w4+ZRgE9hU1JcquVThzSsVNY09IoooI2UpasIgo/icqCx/M4/A1Qglm3tFZoSW6tnG5cFcD67sVcvrmO4SParOgLEKuSXdySf5kfifSq1lLdQaiLa2tzNqkpysZYBYxz1PT/JqVexo9zS1PQ9ditkvdtuZ4G879wDvXpx7gYHHtW9oPia+1Qobm3jVHHEiHv9Kxpp9Vt7j7OdRtnugceUqNjIbb97I/i4/XFR6FO8d0yiIx+ZIf3eOEkHVfy/lWdSL5feNac4uXunoEkyrGWrkdTs5NXuybq8ZLRTxEp6/h61015FI2lsU++FzXGXVrPdStGxdbZEEjYBxKcj5M/TNYUtzeo7Iq60fD/wDZk1haxQJOqbkZWBfcOefriuMsUJvAynBUhvwzg/zrtJrCO+09bRoofOWSNonhgK7MMdxyegK7eO5GfeuXubMad4jmtuQkb8f7pGR+hFdsbL3bnBNuS5mrG9pd3u1SzD9fPjA/76Fez5OTXjWnRRvfWDIMYuYz/wCPCvZCfmNKZkLSg9aTPNKCd341kMQkl8etTQ584D0qF1xJTlY7simIex+c+lFNH0opDPMGkYMF2nHrTP7I0a7ZJ7+zurmVkK4jkKoqg9cKQSev59KlfcnJGc1b0XUQI5/MhbfGjBffOP8A69VUbSujooKMpWkchr/hiws0S+0u5d7dn2tE5BK/Q/nwea29IhlstOKtuQHLNjqQKr6qklxeW8kwVUmcCOJVCgcjnjvyefet64yJDj7pI/LNQ5PlVzdU0puxqaHodlaWdu0kQN0EG5jztOOQPSlvtCtriYTwBobhekkZ2n86gS/IxzWhBeB8e9YOTvc2UFaxhtolyLnzZLqZzu3gAADd64A68DmtXTdNjtdrsgO05BPJz61qLIr9ajuJkiQbjtBIGfTNS6kpbgqcY7I0ktftNs0mAFx0J61zRtCs8kBxlTke4NT3viOxs0S2jnyOp3Nzj1+lUF1eK41a3jiy7tkNjnApuLWwJ9y4tiqDkAY9K4HxPbwp4tD4HMClj74I/kK9GupdqV5r4kIm18licCNRwf8Ae/xrXD35jHEq0CTSbmN9Y05BjBuoh7ffFeykZ+teGaQg/wCEh00g8fa4eP8AgYr3INk101EeeLjBNKx5FA5zTWrMBW+/7UJ1NIfvD3py9CaXUB2cDiikzkUUAeYfaVfKqckHnilhufKuFdecHnHpTBGquWHeo1i2E7epNatX0LTtqjodRnhvtEWGIxyygbgRCsbDBB28cZyo/wAmqihbiEOpyDyP8/XNZYfBwCQw9DSaJOzS3qu/76KXEgz95Typx69R/OsZ07I64VlJ2e5ohWjbB6VaglxiopMEgigDHIrBnQma8E+cc1adY54mjcAqwwQaxYZCD1ovdUmtYwILZ5XboR0B9z2FTy3ZbZof2XplnbsHZVD8FnPzH8aqltLsRAsU0auOQFOQM+9YMEV9qUplup4UPQB2yfoAOPzNPvtLaK28z7ZDkDBURk/1FacndjUFY2by7zEcnmvPNXJl1OZyTg42/gAP5g109pFJFpWZJvMOTgYxtHp1rm7ho5L5st8qELz9P8a1oqz0OLEO6sS6Rahdb0lhkFryEHJz/Gtez7gDzXkukyIdd0wZBP2uH/0MV6yRk1tM4iUdM0jE8e9N3HbQx4BrIY7kkU/imA8ZpwoEKSBRR+FFOwHkE9+QV8vBBFJb3U5yWUsp5zStarNHlOMcVPxCiRjGTWpRFHd+bKVC4amwyfYPEVrPnMd0PIk/3v4T/SrDR5dWAHFUNVEkkIjiBEoIeNh/Cw5Boeug07O5uzzeRLj+HtUkdyrjrTZFW9s4pwABLGrgD3Gf61jyLNbP8pyK5bJnbdo6FGyetXUClNvr1rl4dVMfDgj61q22sQtjLCpcWUpl+fS2uMYlMY9VHNVW0KBCGaaZyP7z5q8upQlcl1qtc6rbIjEyqPqaFcbaKGqSJaWrkH5QOlcSSHZmb7xOc+9aWsal9umCocRL09z61mooZhuPBrqpxsrnDVnzOyNLw4pOvaeQM4u4T/4+K9nA4rx/w5GU8R2WPu/aE/nXr6mie5kOOQOlHVaU9OPSmjmoYIcQOPenjtTCeQKdnmgBCeaKQmigDyzeiZ/hFJsVpA5bJxxSSoJDt6il8pQPfFalCs2DjNMYgEcZoTHJbrU1pZ3OoXIgtoy7n8h7k9hQxo0LOORNGtPNQo+04BOfl3HafxXB/GongE3bmtzVIVjkEcZOyMBFz6AYqjCnzc1xXu7nelZWMo6ej/KwqJ9AJOUcjNbhiHmdKkwR2p8zDlTMAaOIIy0ssjnoFDECoNStVi050RBk46dzmuglTc659azdRj8y3fjPNUpO+pLirHGOSX5BGPWmjcrDb09a65tCh1KNZA5ikIG5lGc/UVc0r4em+uzBFqkSu0bGISwkBmAztJBOOO/P0rojVi3bqck6Uopy6HPeHbrPiHTYyPma5jGf+BCvYwhzXnVr4Yv9D8Saabu0HltcLtljIdDzxyOnTvjpXpLxyQtskRkbGcMMGnNGN09hnPzfSkGSwNBPTHpSK1ZsaHMDuFO5yKQnLCn9xQAzoeaKG+9RTCx5foeh+IPEnm/2RYG4EJAkcyIgUnpyxGfwzXSXnwy1620yO5W7tZ71pNptI2wFHr5jEDPtj6EnivSbee301UhsbOK1tlYEpEgXPufU47mtOaJJUeMcpIv8+h/z7VdOUZp2Kqc0HqcbafDjSNN0qX+0S2pXzp/rA7RpGf8AZAIzzjk9cdBkiqkDW9pbmG1hjhjJyQgxk+/rXYtIzwBZDzjY31HBrg5sx3EqHgq7KcexqMXGyTQ8DUcpSjLcqagN7596oqNrc960ZkLjiqU0ZTtXKegNI5BNDcClAqGYkcChbldAbmoDF5sTjvVkL8nuabbr+9K+tAmNsEMfy4roNLU/2lbBTg78j8OazRb7GBArb0JN2pbv7iE/0qoLmqIxrS5aUn5DvEnmJoN9LG7I0a+ajKeQVYkVIklxdadoxEjbngVnJ5z8oz+pqPxnL9n8L3QBwZgsP4Hj+prVtbcLaWS4x5dqB+i/4V3T+I8qjpD5mbHKG+U8OGKke44qRfvGo71FTUbhB2bP5gH+tEe8dQSK4nWtJpnf7C8VKJYHIB9KUnBGKQEYyDxSZ5rVSTWhjKLjuBOTjvRQvPXrRTEW5L5mTY4zWppd01zZxNn5lZomz27j9QK5bzwWya2NDuA8E6j+CRWP5/8A1q58LJ89jqxcFyXNacATtg8OA4H6H+lcfq9uI9alx0kCyAemRj+Y/WutuOXRh1V2T8M5/oKwtdh23UFx/DsKN+B4/ma7qyvTZ5+Hly115lCK1BXpVbULddvFXEul7cVXuX83vXnHsIxmTbiqznmtKWHg1RK5JpovcauSAKt2kGZc4pkEG4Z960YFCGhiZKYBtrS0K32faZec8IP5/wBRWc0uK39HUDTw+fvuT/T+lb4ZXqHDjZWpNdznPHrf6BYxdnuufwVj/QV1Cj5EA/hgx/KuW8aAy3OmQry3mFgPc8f+zV1eMHA9Y1/8erpl8bOOC/dx+ZiXrA6tdEc/MB+goW4cDAqvdHGo3PP/AC0P86Fcd68ufxs9imvcXoiVpXDA9ifypJXkjw6DPqvr9KN4I6Ch/mWkm07ocoqSsyS3uY51LRtnHBU8FfqKKxLkSLLvjdo26bl64orpVZW1OSWHd9C990E1veF1ElnO2BzMB/Kiipw3xmmL/h/M0r5iiSEfwzx/kxUH+ZrP1UebpcmeoXdn6DP9KKK9H7LPJ2qRaOVSYt2p5cmiivMPcQMcrzUHlDIooqS0SRqEBAqYcAmiimSyJ3bBrq9OyulQ+uzP6UUV14X4mefj/hRzmoL9q8cafC33YlL/AFx0/lXYBQvPrIf0BH9BRRW32mc0fgj6fqzjJJN08sn952P607NFFeW9z2o7IlQ9BUmTj3ooqRlK5XkE/pRRRVok/9n/4Ql7aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49J++7vycgaWQ9J1c1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCc/Pgo8eDp4bXBtZXRhIHhtbG5zOng9J2Fkb2JlOm5zOm1ldGEvJz4KPHJkZjpSREYgeG1sbnM6cmRmPSdodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjJz4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnhtcD0naHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyc+CiAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBQaG90b3Nob3AgQ1M0IFdpbmRvd3M8L3htcDpDcmVhdG9yVG9vbD4KICA8eG1wOk1ldGFkYXRhRGF0ZT4yMDExLTA1LTExVDAxOjMxOjI1KzAyOjAwPC94bXA6TWV0YWRhdGFEYXRlPgogIDx4bXA6TW9kaWZ5RGF0ZT4yMDExLTA1LTExVDAxOjMxOjI1KzAyOjAwPC94bXA6TW9kaWZ5RGF0ZT4KICA8eG1wOkNyZWF0ZURhdGU+MjAxMS0wNC0yN1QwMTozNzo0OCswMjowMDwveG1wOkNyZWF0ZURhdGU+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnhtcE1NPSdodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vJz4KICA8eG1wTU06SW5zdGFuY2VJRD54bXAuaWlkOjlGNDk1OTlGNUQ3QkUwMTE4M0E2RkQ1MjM3ODdBREI1PC94bXBNTTpJbnN0YW5jZUlEPgogIDx4bXBNTTpEb2N1bWVudElEIHJkZjpyZXNvdXJjZT0neG1wLmRpZDoyMTUxMUFDRjU4NzBFMDExQjE4OEJBMDcwREM1NDg5MicgLz4KICA8eG1wTU06T3JpZ2luYWxEb2N1bWVudElEPnhtcC5kaWQ6MjE1MTFBQ0Y1ODcwRTAxMUIxODhCQTA3MERDNTQ4OTI8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICA8eG1wTU06SGlzdG9yeT4KICAgPHJkZjpTZXE+CiAgIDwvcmRmOlNlcT4KICA8L3htcE1NOkhpc3Rvcnk+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOmRjPSdodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyc+CiAgPGRjOmZvcm1hdD5pbWFnZS9qcGVnPC9kYzpmb3JtYXQ+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnBob3Rvc2hvcD0naHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyc+CiAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICA8cGhvdG9zaG9wOklDQ1Byb2ZpbGU+c1JHQiBJRUM2MTk2Ni0yLjE8L3Bob3Rvc2hvcDpJQ0NQcm9maWxlPgogPC9yZGY6RGVzY3JpcHRpb24+CgogPHJkZjpEZXNjcmlwdGlvbiB4bWxuczp0aWZmPSdodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyc+CiAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICA8dGlmZjpYUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgPHRpZmY6WVJlc29sdXRpb24+NzIwMDAwLzEwMDAwPC90aWZmOllSZXNvbHV0aW9uPgogIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgPHRpZmY6TmF0aXZlRGlnZXN0PjI1NiwyNTcsMjU4LDI1OSwyNjIsMjc0LDI3NywyODQsNTMwLDUzMSwyODIsMjgzLDI5NiwzMDEsMzE4LDMxOSw1MjksNTMyLDMwNiwyNzAsMjcxLDI3MiwzMDUsMzE1LDMzNDMyO0Q1MDVBNEM2MDlBQzIyNUVGMzcwM0UwMTE0NkQ4RTYzPC90aWZmOk5hdGl2ZURpZ2VzdD4KIDwvcmRmOkRlc2NyaXB0aW9uPgoKIDxyZGY6RGVzY3JpcHRpb24geG1sbnM6ZXhpZj0naHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8nPgogIDxleGlmOlBpeGVsWERpbWVuc2lvbj4yNTA8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogIDxleGlmOlBpeGVsWURpbWVuc2lvbj4zNzA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogIDxleGlmOk5hdGl2ZURpZ2VzdD4zNjg2NCw0MDk2MCw0MDk2MSwzNzEyMSwzNzEyMiw0MDk2Miw0MDk2MywzNzUxMCw0MDk2NCwzNjg2NywzNjg2OCwzMzQzNCwzMzQzNywzNDg1MCwzNDg1MiwzNDg1NSwzNDg1NiwzNzM3NywzNzM3OCwzNzM3OSwzNzM4MCwzNzM4MSwzNzM4MiwzNzM4MywzNzM4NCwzNzM4NSwzNzM4NiwzNzM5Niw0MTQ4Myw0MTQ4NCw0MTQ4Niw0MTQ4Nyw0MTQ4OCw0MTQ5Miw0MTQ5Myw0MTQ5NSw0MTcyOCw0MTcyOSw0MTczMCw0MTk4NSw0MTk4Niw0MTk4Nyw0MTk4OCw0MTk4OSw0MTk5MCw0MTk5MSw0MTk5Miw0MTk5Myw0MTk5NCw0MTk5NSw0MTk5Niw0MjAxNiwwLDIsNCw1LDYsNyw4LDksMTAsMTEsMTIsMTMsMTQsMTUsMTYsMTcsMTgsMjAsMjIsMjMsMjQsMjUsMjYsMjcsMjgsMzA7MTM3NUU3MDc1MjVBMTE0RjBBRkNBNzg4RTM2QzAyN0I8L2V4aWY6TmF0aXZlRGlnZXN0PgogPC9yZGY6RGVzY3JpcHRpb24+Cgo8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSdyJz8+Cv/iDFhJQ0NfUFJPRklMRQABAQAADEhMaW5vAhAAAG1udHJSR0IgWFlaIAfOAAIACQAGADEAAGFjc3BNU0ZUAAAAAElFQyBzUkdCAAAAAAAAAAAAAAABAAD21gABAAAAANMtSFAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEWNwcnQAAAFQAAAAM2Rlc2MAAAGEAAAAbHd0cHQAAAHwAAAAFGJrcHQAAAIEAAAAFHJYWVoAAAIYAAAAFGdYWVoAAAIsAAAAFGJYWVoAAAJAAAAAFGRtbmQAAAJUAAAAcGRtZGQAAALEAAAAiHZ1ZWQAAANMAAAAhnZpZXcAAAPUAAAAJGx1bWkAAAP4AAAAFG1lYXMAAAQMAAAAJHRlY2gAAAQwAAAADHJUUkMAAAQ8AAAIDGdUUkMAAAQ8AAAIDGJUUkMAAAQ8AAAIDHRleHQAAAAAQ29weXJpZ2h0IChjKSAxOTk4IEhld2xldHQtUGFja2FyZCBDb21wYW55AABkZXNjAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA81EAAQAAAAEWzFhZWiAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAG+iAAA49QAAA5BYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAkoAAAD4QAALbPZGVzYwAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdmlldwAAAAAAE6T+ABRfLgAQzxQAA+3MAAQTCwADXJ4AAAABWFlaIAAAAAAATAlWAFAAAABXH+dtZWFzAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAACjwAAAAJzaWcgAAAAAENSVCBjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23////bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAJYAlgMBEQACEQEDEQH/xAAeAAAABwEBAQEAAAAAAAAAAAAEBQYHCAkKAwIBAP/EADQQAAICAgIBAwMCBQQBBQEAAAECAwQFEQYSIQcTMQAIIhRBCRUjMlEWQmFxMxgkQ1KRcv/EAB0BAAEFAQEBAQAAAAAAAAAAAAQCAwUGBwgBAAn/xABBEQACAgEDAwMCBQEGAgoBBQABAgMRIQQSMQAFQRMiUQZhBxQycYFCFSNSkaGxJMEIFjNDcoLR4fDxF1NiY5LC/9oADAMBAAIRAxEAPwBpl9TsR2bvwLGOQdkD9H8f481CAQD8gqCAAQRs/WYxwspJMrLigy3ZNk5ojNc8jxWB1cfTJ4d7yGJNcfJHnji/4rruOfcZndZX4LjYmQeGMGO2uyQ39QVYyqlWbZ+Co8ka6lbxSNe2Zq20TbfqJFHkkkDHFfvyHoQIwd6iTKkFzubBJxWcVkHkUOK6qt+6H7yqnIpLvAvQbhWBxMZnuY3kXqRbo0Hv30i92F6fDkhjCQY6K0Gn/n8xn/mnVDj6sGPLXsg/p9IFctOwdhwmZL+7bmLvQOEZgi1fIUdeVMXdo3YAfpQu6IgPjaBuYf8A7azglrUXVpksWbN2eTMZ+rdyT2ZbOSmlMeQmmsSS+/KblzIyzkTq7+57U0Lk+4ZC3bsjyvrSbBsjKjaQtAxjNIDSAchaCK1ZvLEkj+jGxAllQuLuzbcGxZY7BRAA2n25JWzQyvJDRRocbmsfFLHW96GvIa3eWLr2JWGSvai6KfasQTQJCyzFBAsccxkZDgmi6F1BBuyQprdW725NcEkjOFPRQZUG1WU4BsFTtHAJGWIBrgH7XmkDclrR27B7fjZlVrVjbIolRHjdKik/0WMS2JbE5Kyujg+51KIPmcsbHA27Q15DsCSSBxaoeAdoahYy06i2VRd1uNEKCcWoxtokbj/WBQBGSQx5Ge29ha0DP7T9akMatplEjpIxK/1CzddovZezL2UsAe3t0QCbJNudx/Tiqsg0psHyCR00ypYpSKW2YDz8Ei7wCbBqqySSFG9hj4o1FE1UkVA4EQrv7hHUDTOzAMxI0Z3CJvxINsPXDvncSSDjcNu0HAObo3uFih/UR5bt46XaqAk4yCxNY9wUk/IFk5q6HQZ75Ud5HVVIKqLFeNVkOiYxsO6skqA+04kQF42Idu3REKKwQWJDAjPtzkgUT480CTQvNPUQAKY7qLEMeBd1YH70t+POOnG4b6mf6bs41crBLNhqE6shrntPVjaEwqldhIq/pYCQ705w6x9A0AjYmGx4yh9yhqamC7r+OVNGifm75sdPRSRxMrbbAItTfg5zVC75F4s11J6lnRyeSfI45p7MVcL2ru0paBWjLxH5Oz0O4HClJWH4E6/EDZJF7JArYJBINXySKF8cA0P2s9PTOJpGkVnVMbUUgqATXPJqhubk4JF9Lj0tp4jJZC2mZhEleO52lYkJKo89lDkNIGUsRpf7SfP76+07KFkFqhJY0QMsQRd3WV5sg+AOmVBUMdoJuxuyciwQaI+9efGcdSZbjXo81uj7JvmSO1X/AE6tZufhJ+pUqV7b12dtEa6ks2jrx9LtixoKQENkDdkquQbFAV8gDnk30wu8Kd9CxbVf7Z+Pi7q6HGetfNpmFq5tgdWJGiI3sKrygkAb3+XXyCfG/C9SfqmSggMBgCgrEGsngkXm/jyM9COF9NqW/a33Fk1fzZsZqweLwD9DMPbGhox77H/b/wBgefyB/wCdA/OtD6YmP34LA/GCfP8Asfj4469W9qULO1RXzY/3H3xX369xI8nhdN2lEX5EAB2JIYjbaGnU/J1seP2P21pVtBuWyCfFryD/AKVzefg9KLBSL5yQD8j7WP8A4PFdKKoRDMsIZJGlgd5RH/8AE6SGEpJ4/tLAMmgRphrR+X9Mm1wNwIkU2AaIK82a8f8ApkdNMdoJ2mwwNnzZJIBv4O3jj7kV3klM0sku12ZCP2ABCxgBf30Pj4GwCfG/D5hKzKxIbe24gWCBgXzxYN5zwLo24JVeNlogKKB/8pqsk34+M/IrromQNGBJJEZ/dboo8AKUG32B5DsSHIOvnegCB9PRptdpFa9wrkggXYHH/wAsdBuqlI/UABAYE+WN2MYwoIW+bx9zmenmkrz14ooWmMx20oZeignsCw8b8DWgNEAjYB2Jv1AyHNAeCDk3VCqP8ngWPt1PutELf6lB3YzkA/H/ANY/et374/uKy3F5bHpJx+wMUDUqX+X5COXd3JVclE0lPB1IgCI6bQ+1ayPfubqPHSkgECyJcktBCJow5olnZUWiFpFJdm8+VFA8cDkhidzAdi3vIUe1SSFYhVO6z7hRsnAU5N56qSt5+1kpusuSyqQSnax3bEUkbrKGQbhhljgUExtGIUFgH30iEdlZX9uYVViBAWJn3ZMYqvF025ybPttqqhYZsxxMs5a3faGUBSyMGUn3WLAUfCi1W1sVZAyLHXGeSRZ6wgihCtLdsMIolYRf+3Cr+nqJcIfu0Sri0AliIVgS/wBCNN7tuWN4CCrK0dzMxsoKpKJasnbYUFxwgKzoy2KslmO2wFCqrWqvgWoERDEkiQOpJrBGuHrSdvalmmchpo4PbDl5Nn2xGGl/pf8Axjuzf+MhkH4qxM7SOM+1QQFB80DZoAFuf2BA6XGpQbkFSG1DbVFHybGCQCckHBObsA4xeHtZCHItXpvYmp4a9fuSQxFxUqxVlhaeaRR0jh/WWqsBXsFmtWoIQxmswoUuyxqm6gztsU58MAwJIrPIJ4AOKB6fVHclU3OES3YH9Cx5s5wAzRAgf4hi2PVrf8LX7M+K/cSPVbmHKyLlHhMnF+PrjovdhJt8rq5zISZYTJ2VZIjhkqRrI34w2ZkiCPJ3Wj/WX1DqOxnRQ6ZFMmrEkpkZlIQRvGFiAx+oSWWvFDjb1e/of6Z0ffDrdVrSPT0hhh9Mkr6jzRtI72owY9oU4IoE1ZN3F47+HT6GYGaP9FxaJlEPWzbtJj7d23MyQdy7W6U08WjBGIvYdFEZHho2YnLtb9c/UGoaRXcxoz2FS1VRHdEEPmuaOCQWYUca9pfof6fhRWj06KwH6XCylt65YTNGdrb/AAK24/TjpsvVz+Fp9tvPalw1cFa43lbMc4hzFCxL+tr2pVX+vLKHjjsVTMpmlpWIpYejlqa05x7jP9v/ABB7/pGVWkTWQqob03VUQg3agKBWCfd7R4KupHUd3D8POwa0SCOKWCVrYTQsQyObFbG3A0wYkFdpUGyMbs7P3YfZ56jfatydMRyJ487xHNy2Rxbl9CMw0sq1VBJLRuVS08uLzEdfdh6c8rR2KwmnpWLsVS5NDs3079S6H6h07SQJ6Oph2nU6WU3IoNKrRsKSSJmG0uCXVqEiR7k3Yx9TfSeu+mp0TVBZdJqCfyuvjsRykG2jZATsmRCpKWRglS21kRsPRP1Abjl8Yi5O7JPNHXhjSITmzRncRpFGYkDxtj53inEkolRKLWfaWtBC2prVRtt37Sa9wyfcKJXyP1hXUWRRU0LG3qrJasUN80aJoA+f4r+bNA9SOoZ446jlP0zOly3bf2wjlWiHaQs7SDY0rkDqpDMG2DpQwjNGqushdRtLk5HN2KPHBv7DH8FTyqmOLBFeLUAE+Bir+Meckuh6cSySci4rgM7mZhY5FyPA4+vPNHLYasMlmKVD3FjBUSGESvIE9yIya6e7GOzKWDt9UjaQFYKOP6ML8VfnN+OOht4UMXa/a3OeMgfH+1c11t3sSKZZ9nTvK6rttlSzsSdE/l4Y7Oxsk+R4Ip70yKCdqvgYPIyOMiyOfsfPQUTWKAoDcQOf6hQz58gmv44PcSgQsV05ITz41/YB8bO1AOyDs/JP+DHsCCQxuyT/AP2z8DBNkCvPSwbRCLFKAKObFnGLHNXef9xuNkYhDsa/UxiQt8jfVR5bwAfk9RrY+Tr6KgDpG4qtpJarsGgTxVCybyDZ8Z68BDFGJNqKWwSPGf8AXzwa+3RhVliisWvz9yyJrAdepVRC06iPTKx7EhCzeAFChhve/p2BlUPm2omgo9tsOKF2R+33+Ok6gURmwW+2KFGvizePOPjoWGBkb2lPtmU9A/zrQ0CNEfJXR1sAn4J39PMrOqykkOgpQpG0++9xr9RwBt/2oW1GwVjGopWJJYmmAAs8EAeDzRocV18uzRwOYHX3FVy2gFJDMAP3VlA0ujr/AIG9qR9PSggew7aNHxmv2/38V19FKJK3KCKJAK2VyMWT9/jIHjrNjaqyGoK8DssoZY45FYB104XYZtBd+fJHkbI0R4mwoDEgX5Px4N8f6ngjiupygwCsRQs8ZJAb+KyTyDiq89Zl/uR9QLXPfVnn/J/1vvV8vynIfy+WKSGtJBgsUThsCZJIo4JJHgwtCoPds+xKXkMa/qHkb3bNooBHDGpUKVX3XZBDDfWDfLVtUFjtsgEAdQutJDuSwO81SgBlVeLKkELhTZxXnhS0eOzVJHSstQyySv1gMTma9KCvSKOB5GUKHTfuRsKtEmazGwi9+NHekiclmDbbv3G1Cg5ANYBJ4YW4NAY3dJikiIAI3MSpWssRZahRBCj9RrYBRrbnersHHlslkq0EsUOOrQf+7eCpPAZUEP8A4YGZKbwyREv7jCNq8kbtOys7O7WGTGgT9YZqVS7Koo4BO1TuQggckgkbioLUCEeWRxCFCKTuYKwa6sqT7BuBBLXutAaUsoJZfz1Afcld+kdPu/ZNsiykxuWVgSGYBKyjqT1mVTJ19tl+o0g76IOLGD973H7/APM/x1Ioli/CigMEFic7avijYNUxwDyJ2/ZB6fQeqHDPvB4tWxYv8qP2v8t5VxFwSJza9NPUn0d5lnsRFF7qLI+TxUSUa6D3HtItmFF8NHLW+/ar8rP2OWVysA7zDBMSMbdZou4RRu1E/wDZvTXwNqtd1Vk+nNKNdF9QQogbUf2RLqIeN7DR6nt88kIBwTKoUrndsL8AkGyf+BDyylRqfdRw97cMWTmf0kz9eo7MTZo0j6i4nI2aoO+xqS28THb2Aq/zCiNhu4jpv4nesR2mVVJRjrYGIGA+3SlFLC6HtlZaDYVjjF3T8L2V37vAzAGIaKZaH/aCtQsj2RYCvs5A/WuB4vzlmjkjb8VLOrCPYCaBILAsDvrrqBs9htAuvxByJY5HUszVuLCrLBtqYIJC48/a8/HWwCQK4RaDKBu2mwQvkEZJPPFc+T0hsqocSKoUMpYq3VVXt2A7DqxDbIBYHRUvsaZvobZRIXIrJW7vNWDgA0aomzjHPRyVtsth7zuI5/pJxRx4JwDZABPUGfun9IuO+unppyn065JGsUOUqe7isrGim3gM/UVpcPmqo0W7Y+97TSQArHeom1Smf9NZkVrH9O9xn7RrtPrICxMbASxsxCzxMdsyMeRuSyCSwWQrIoRkVuoX6h7Rpu9dr1HbdVSpOKhmpS+n1KAnT6mPcTukjlAIVtqshaI7UZw+N7mvHc56dc1z3E+Q1P5dn+J567ictWV0lWC9jbrwSSQTOjxzV5vbjlo2xF+ns1GrzvDJHN0bp3Szw6zTQ6qBy8OoiWVG4LJIik7l4UrZQqf0FCopRXXKWt0s+h1M+l1KmPU6aaSGdCbUSROUbbhbj3AtGQtFCpAo0JacVsvyTHQ5pYvbW1Gt26ihQsLSdJHVFEk/SNzIrIGlmKowDOzhtALEYfVUsMyMVI5q6C+Dj5+P8umpCZmU0R6aWSCCtnO7gED4F3+4A6kLxGzjcz6h+lFqu0Vc1/UHhkSPINSOp5Hi9VyIwfx7MOgOgrnyT8lG0gOSQcFjXgC7/wBOLq8A1z0MwKq5JsU3+Xu44+Kz/HW2qQiSd2JBIcn/ALVZG3o/kN70x/c+BrXxVGCsqst0pK1QBrjOcVXH+XPSUSgwBreWu7vK7fOOcCwPNjx1+VghZGBI6NvyQPOwDoHqW6kg+PGwQ37/AEK4J9Q4ULZBzncB+rPH3F0QTnjr1K2Gh5JB5yDRvND3D+OOeu1SeRHKdSVIMh/zskdvAI1tlXXwSW/4P0yjsG9p85skXRXBxVkHwTwRz0tUG0AmhgC+OfOR5APnF3XBERzyfriWADtPLLKvx4ZI+qkA/BK9gCfx2Tskn6WrEMKNH2iqN4AGDX+V/ufull3Ag1VDHBOQcHA8Dn9/HR8kweQgEgBCw8gsG7DWuu/nZ2d/A89m+pUkb/TrlN1BhdhlGLPABujnA4IyCylaa6Iuvkc85ocfN/er69hQ8rMfLdFBLnY+WPgKNk7JO9n5/wAn6QrMHZFyReLF17aLWQLu6rgEfcBQ2hbYlWO3N/q/UDWOPaB444x1m+xNiK+0BZgJDIheNXLMV9wL11tSu9gg7UnYP/BsFMGYm9lDI45yQT4/evFWeJxWUD2glrItixBwTdXxgWABi+L6yR83r33zV9Pamlgx+SuUoImeR4oY8fZ/RLE7ydbLmOOsqbtEyAxBYWid2U3aN1HkAlFAJrmgxAu9lsSTt24oHgDqt6mKV9rHcw3MVU0UwSpsWDgirIxWB5AniOKl/WtkMiXZolk6RJG8E00axtI6yM8ZRYUCsf6sb+2qsW7xoIgJq5rTZHYBos5IIAurAByNxGQxskqAbPRei07bt8i+8AhVoIwXBDWQuBjFHkG8ZkDxapAkEtqOtFX7lE/JITYlWPse08yRrO5WaRykczzlAeiSSKfcEdliFdnIOVJ9qMSVACLhQBliwIySCQBXUpEFLDaKX2hmNbmBFk7iM2bN3kC8AZWvJOJX6XAOKcvWvKtDlHIeS0oZVVilifDnHRRLEGd2lKM90t10rWEaLyYwAIZ1m1UsO4B4Y4XcAV7ZFJFYGao/NUaINmQk0kseig1TB1jnknQNzRVkQEAeVJlNVTMCM7aE8v4a2atemPqlyfkEvYU19G/VPG5GsymSO1Hf4fkeUSR+yxMUryRenTooZBo168bvFELBep/WEY1Xb4oY2/vT3DRMGWgw26mLSlmyDROsWgvtIDVTAnq2/RLx6TuE0ri1/s/XKylmG4mGScqBYBv8kyryQwXcVWj0f/w7c9yD7ffvSwvCMzFPBB6kSXPT/LwIW/Ts2ary5XAETiNUnFTM1MajSxq0ErGYwBlkjsRDfWGmh7t9NPqlIP5StZDuw4VG9KTmipdHdtrLYJUV+non6Nnk7N9Trp3Ubdbu08gBsD1R6kXA2tucKq7aTawKWSCNUquIa0UZLR9/x6lfyIUAr8KejlWKgE68yHf7/WAuArOMlQWA8ZJraSxNHhas5oDPW+RbpXZgOTQbK5JJBN1zzQAJ+BjpM2dF2Vis0fypVtqjEtvZQHyAFDAoQey/jo+fVkIQIRRG7ahu6OOeTjGcHokxttySSMnaxoDxZwAACaz58WB0zvOatBa1m7cuVadGukn6uxZmSvBXjRmklaSaZ0jQJEG8kLvpryV39G6feXWOFGlYgCo1LnIFgDBP6vcLIArIWiG9QAsTPKRCgKsHkICjbe1y5KlVNFrLAVZJI9oy7fxSeE8Bb1D456remvJOO8mpcwpWsBzf/TmaxuTOJ5Xxz24sbfytarcnlqnkGHkiq1WhijrS2OM27Fpo7uSWW5vn4f6nXfkpe36/Tz6dtM6TaUamJ0EmnnILrAWC7hFKGLKw3KdQu1dkZA59/EjQ6P8AtHT9z0U0E6a6N4dU2nkWX0tTAQsMjqCSonipQRYYQOWKSyKzRS+2zk9bIVszwLJX2q2ZFeXDjYY2Krsnv04y4b86zr70ehuSEzNsrXIF018WypgoNim20QGGCaPjNePOCesxindVmTHu3CqH6M8YBIsGj8jGb6mp6X+mWTn9SPS2A2la4/qLwd6dZWSNJpf9T4o14w8oSNTNKEi3LJGiMS7uiKfqOLj05QRkxP4GBTXiquwASRjixd9elAVOWyjUDXGR8Eg/v+4zxtjIRZHVW0WYkkgn/wAjswBA+PwCLr5J2QfP1TJmKjaoxuZmNgUbBXnixVfPjNnpIxwDyT+xOSbPgE8eMAAY65a7O6+NsygHxvXjRA/yCG/Hx5bxvWw0ztgsPaSCwBGQBtI8ZIYmgQcXdZ68G1Vc0QBdCycmjQyfJOM/PFdfWkPvP7eixYxhdAdQBvR0OpBBI2Pgjx5I0Mw2yVdYXHyWRbJ+bs0eBWCOOlgExirznIugM+fg5zRJ6NYqsst/K2u+v0lWOx7YI3IoMcUhVdaJLSqAD4HVv7SDqTEStvkUC4o1lIz71AQGj4INg8V56b9QBYxXuZirEjJIJ8YrjkYOTVVZtxSWOfNx17URlWeCyF7BeitHDKwLdyTpG8L87OvnZ+vICZNQL5ZHo22CVYLVHkGseRkDA6bnX2WCqhaJ5o5o+DRzk0KAJ4oj2ziCaWJ9gxu0ZPbe2jPU6/bXjxrx438n6HjLrI1tWGFsMmmA81fHP+Xnr4xhvb5WsihisDybsk/z8V1mV49xSHiUNmdMpkLjSWFmeS1aknAQDbonukkKWAOt9T42Trza0LybwzMfYSMFbxjJ++fPk31NbFT9IGWsXWCDuoWattoUVm2PWZD1OxfJMH6mc54zBhprSYTn3NMWciabRpJJiOT5jGlY5NtKq94HaZDI0Zk6942VFP1bYnhMSyNKoLRpcd5Fopz5BF1jAJ+buG9aYOYooL9NnTc1KoCuyg15LgbmNgWSRnomxWNzssimz+kxFcSIJoIg9q1ZSORG/TyWWREqpIyqXKTSyKyKDE3iP6akeACqeVqtGchY1u13BAx3NVgAgA7snHSwmoYguY4l/VSe8vtP6aIG0E8nPFVZB6lT6VcAzvqJn8Jw/jdK5kL2ZyNPGqldYllY2ZtswaT2K6M7pI0KSSJG61zG/wCRXUPrtbDooJdTNIqLHGzKZCWHtF5Qe4gteALIFgc9WDtmgk108WnhjZi0iCkAG0PbWN1KLAcJeCV2miQDYh9x/pDjMFhuK8Nwt/H2cV6P5qhwSri6SRxwZfm2S4xjc/yzktq6A1228WfzsGEFedYocbDxnKWFMT2cs1mndm7lJqHk1U0bLJr1bV7pLLRwLM8cERGFUFIjKGvJmiTAWJRbO/aERRw6OFlMPbZE0Y/wSaiTTq+pmumdmjkcwKoLKiad6q5N7DcU5BylMhe476UYie1LknKXMrLYfGQ5njs+MyPDZcBiBHRsZG4/KpecWcQUo1hNcqtfSoYYqFrJ0Z2WKBohJrSxKANsFOY5d8eojllQlQEgOmMpDsFDiMk/3i7ofSTTLIyaUbTISrFbQyxGGTTCJSoLD8wmoZDtB3Bto2bWYSq9c/tY+8jAcTwvqwuP9N5ea+n2cn9S4k9N6uVXmWHkmGEtyYOi0cpx+QxXCocHQlxeJxqqlI4+5Fg3yKXBBbquj+ofp19TL29vzkel1sSaINrGjGlmAMyLISW3xPqjOQXcAvvRmCemSly7h9Od+/s+HusUmgk12inbXlNGs35qyVdooQy+lNHpY41KLEbLJUXqOwXqdv2mffF6w+uz4efn3B+NUcJmqc8lXk/HL0sNebJUzNBej/QSZC+8Xa5WlRopFrNERE0QnhsROaR9S/THbO1CRNHrdU08Mqo2m1CeoQsg3C5AiKQqEOpZySoNjcpHV/8Apj6h13dYIp9To4IIJoxs1OnkXa7Rkoysu9hXqBxiiTtI9rKTY3luR06WKs3ySAsUkqL5G9KW0FQbAJXwyqzbBBUD8hTFhJoFwWwQTW6waWuLAs4I8gmxzannZVBIpTmh/UBwTge0eaIBsDPVRHrj6dZr7h+cXLHqT6qX8P6TYy0j1eGYSxcmjs1UZ/bjOOjkSp/MbSyPWjtTRXbftGIsoZWi+tC7F3GPtcKw9v7dE/cHX+81sipYAw4MjsW2Dml2ogutxoCm980M/c39TW6todAsigaSLLMzfqcqhVSxKlbcu6ncCqgV1E77m5vsgPpFzL0W9N+O8EwPNsZgbOW43lMZmcNe5hHyfjdeTMxw5WdbM120+cXGPjMvDLLaeCvavFYY70MZq3Psy/Urdwg7rrNRqdRppHVNRG6TDTvFNtjLKrqEG0ESRuAEbYp3GNs0L6i/6vSdu1XbdANHHqY4mk04jdWnGoiUyWxDFt0u305AD/3jbaIs0x+leKkn51Uu1JRFNh7mDyrhpREz4x8xBh8j7Y0FeeNMtXtvHIR0pV7uttqF9K1Eh9HYQrb7jNg+2TYWNWTxtoWTnN+eshUb3Y4I2Rm+CQH2kgcm7TNnBOc31an6C+oC3PWL0fq5I9bMnqx6bVKzr5T+tzbAQRsux2Ll3XahW0GJAI+orUaYpFJIhsejISCcmgzMLFk+bJP7fAQzsQ+01SGgADi2NAn7Ch985xezQTye9Ku26l+utDQ6syrvwCP9p8j5HyfqkSkEAkbd1Ekj74v7jxya8fCYXJLEmwHoVXBFkUfFADHN4GCR10V8nyS2/kjzsDY1oDwNnWtb/wA62OzAE5BFNxxbIVGBYvIPPjBNGiEwWWuTZNjnjg3dgYxxfxjtC/UydkLOVX2yNjTb7ed72Py1rf8Ayf2+m4z7rYBjtoFhZNFfJrNCz+3npuUG9oJUbgbH3BBr4+L/AIvoJPZmsXUhUtHJYmjib8ugQF1U9ySoAIOwCSAQCQNb+nLZnIv9RIJAx+xr+mgCRXP+fXgXYoJs1lSQefkXxWbJoDPHHSw46sq52vAHUiBLMPudh1MixSAabR7Lrrt9bKjud7P0TpQxmVFKkjcAQALIwTu+ALaifF18NzMPRcsOaJFZrcAQB9754ujVY6DXJHa7KGIaI92jddsH1IQ5U/uoYnRHz2HkkfQ8jOGNreWAI/8AGxv9jyDQ/wBunRycVnOQf9gPFeBz831nBgt/zCOzGzMVjP8ASiD/AIsf2c7HkdlBADeBs6IKn6uwZTfqEAD2qfmzx4HAOc0M11Jkg0oyRxd3+pc5A48V8Y6ob+5zHphfWv1CrvIiRZHP2s9W9yRndq+cp18i0jNL2X2mtWbYRY2JiaFogsYQBS4GBiXYwIrZe0m9poDB5AA4s+bIz0I9xtltpzV3ZJJq6okHgXf2Gb6jhJaq15El96NY5PMMndAZO5ZkUEeJJD1aP20QKJAuvjsCArEFQGNCiADSkHddVyKOWHll+3XpkUhG3+4tgE0Lo0tGslgt1n7EXd8P8JjheCV+W85ykcaZTG1461S3dVD+go2YrLWp4llj61ppIddZEZ5FqkjavK6rlX1xqZZZoNKrXG7ElVzvdTe3Fltha9oDAE5XFdbN9AaCOLTza2VTvRUAJUbliIa2UkWjE5IsbkK83ZZP1X5nhuZ0sGaeOvZnE1r3IshXx2Ke7cyHJ+aepeby3JsxEYKEbW7c6RckyvFcdRrTQXP1WcykdeaJ+MWY4Z7RaeXQvIzssUhhiV5JCgWDS6OKOEMC5xR06zM7q22NF3KzTjqv6/URaqOMRo8sKtqGURMTJqNTrpnnlUhB6hJ9Y6eJFKvukkMZQ6ckNl6XZ71I4v6p1uBcB4TNzL7n+aW57mB4pPlKWFwXAsbBDkkaxfzFy7XxdA4nHS2Wec3MbRoJYzEVG3DcuxU70hPBpe4aUTTaiOLtEYWNpQheXXTO6FQoWt6u4QsshZ2CoWG3cBE6XUT9r1ex9M8vdnBdIWPpxaGKNGuWZ/cCQoJVVfYvvVASw9SXPJeUfcjw7kz8Hn9ePS7O+qEFwVDw3Ecb5O2PnuY3mTem15KvMbuYw8kVSL1Cg/kctyxiqeRGHf8A1fc4nRwX62ao7/1P7ZPom1ixTJG8Mmo9MvHlSjuoksP7xHuZFO42VRXVKDi//knXDuX5MgiFNQkP5jZQR1ZTSadJFkLqHAPpmO1J9qkbQnvtR5Tl8RzTIUYOO2ONrynmGZjfi4hQ1eHepeMUtyfiVdooQ0S5LGV2yGLx1qvUnrLhJqqCRLMcdagfU8EeqhGyUSz6OBI3ZgVln0ZkZIZpboBoZFaJypbc0wDi1DHU/pedtLKyzRelpe4udRptiMYItY0QkmijJSMhNTAvqwK4Qp6BUUqkC8T1H49m7PozlJ8axbNxYmWyIow3eV1hb3IQe4EW+pi7kH25QOyMAfrJ9NKkXcoBIzGJpFViwA9MWQWAvJJIIPG2ybrGnTRepoZWiSp44meNbYF9qmTaosgEgMBZySAMAjqmPnXBOY85zF7A5Gzm8b6dYLjVLl+VFKlfr0PUfJWstj5bHpw2cryVJMfFc4vHnJBaW3QhsZFcbisllsZVy0lyjsn01qOy6bVRtq5NPCWleFXkkAMSRAn1QpopI8jISzMCVUrGTKQwyr600v1BrO1yjtUM00voRyqkcahpjP6m4B2tJGjjRFWJVdQ8ymVDGrAt/wAn9JMB6qel2P8ATXI8b4SvLcVzX03y3BOQennphluPWeH1cFzDlKc6y65zOpPLiMVyDhX+k62Z4qJ4jyPlmJxvIrGOy1+lPyeO/d5+oe1aWMy6TXaeYR6bVIYI9RGyappIdsUbJA8irsb1ihZgUVkjIHtUZH9NfS/1PrNQ0Xde36zSxyaiB/U1ySpqYW9RJJXi9RVBIYDcsausqIjB2l9WNavec+msXoz913L/AE+RJoMTxXlVk0A25bEnE81STNYAKdAymTDZXGt3ZlkEaSe4zyBllJ7Zrz3LsOj1xYFp4BvYV7dRC5hnaxQJ9ZHBwBm1ChWHTH1B27+yO+a3t4Vh+X1BSLcBY071PAGJJJ3QyRuxBOWRbxRn/wCjPH8BkPUj0HyOLrPWEXrP6U5GJ37d5HHPONu/ul3f8HSJUP7IGcqOxIZTk/lnskkQyXtLEG4yaB3HBJJF48YA6hJAyK+7FALQUEihbXgmjeSTgKeKPWyGR2S1abwR3m/IhegJLgBSPx+PjW/+x8/VJ1JBxXNA+K9woVWCP/sdJhA38YDOOObCgAG81V4J/c569h2LoQQdRn8Qf/zeiQSfJAH/AD43r6DY5OPsTV/ypODxg/bxnotcbicC7sivn5rHQmCWVLCoyk+5NCkZ/ZC4VdAk78sPOv2Gtgb39tOAFs0bGbyfI8CiCDj9+OkOQRYJODkeR84+M+Obuq645Kq0WScjYZ5EdmA30f3HYr4GwV6r/wAAEEHX0okoHVgQwBrxkffHyf8Annr7fagZ+BWPb+1i/Pxj78jaludbayw7QgyAuF66DKwPx+531dtqNeGB87908hDq6NRUOAQCeQQ1eDznFg1RvhJCgVJQQ1f7A4r+RirsfvXQ6MlCXEbyAqoXxsKGAYhVIOvgdiPgjz8j6+c7ACd1YA2gsQAMA4PA8nJFXfJUQWO7FNlSSosXV5r7fH7DrMPbzFuC1XpLRuPATqSeKIlYw/ks/wCSAlSQGBI66IYg7+rhJMaArhlAIprvbbEe04Uk/qzgcZEhHGu9tzAE3V2ATfFjANA1uoE0MA30Sn7dvtS9RLmE5p60elXq76p8ryGAzeJaHiXL8hxrh/HeP4HOX7q37ON4flMHy/Ncpp1/5jK7T5iTDwYfIrFLg7N2rjrCUzu/1V3bRaqbtvbNRpNGIRDMxmgSfUOZowDZnhngj05YhWpBKTHuMiROwOufSf4f9r7p2mLvnd9LqdfHqZtRpI4E1kuk0aNC+1GYaaeCaXUSIxO5p/QEMiL6bsN3UCfu7+xf0V9OKGJ9Zfty55mcv6f5Lk82Jy3DOQ5DGZXJ4Oxcr2bdKvic9Djcbkr9fGT0sjHkMNn6t3P0Korm7lbklWeaSV+mPrDX90mm7X3bTRx6qOASx6mISIkqKVSRniZ2RGkBXZJCVgdlKhU3AmJ+r/oTtvZxH3btE7rp21O2Xt2pAMumnljaRUjlKRyukTxyhknVpREUcvIqnbNj7duM8k9MvSmepdfI4KKWG5n8q8KTQ5KzRoRQx2LTrGhyFWqIKMpo/wBOOeYmQ05Kth62Rq1rXamDVdwVqjlJZYow7exXkY0qkAW11vyFP/eArGF6u3btDqNH2plkDwRlDqJmp1leCMV6pA2Oiemr7Ar+rvBCMjMsy2n/AGs/az6TenfAeBX87xqnN6nVeOUGyuTv/prk/HsheoM2QweARVWniqtR7NinavU4f5hmZFlu5i/kb1iWdq33vvWs7jqNUsU8i6QyOUjjJVZFRj6c0ovc7MoRgrFkQqEVQE29S/Z/pvTdr02kkl06/mhCm9iqu2meVLmihKgLEELMnqRhZJWJkmZ2s9CfVX7UOActz0HNOHw5DhPPccqxVOV8PvWMJmpYmZ2apcv0Ja81uhMJO1ihY/UVJ5I0aaBnDdovtv1N3XtqNDHKDpgblhlVZIyAFb9DqaWwSFBI3BTftFF9y+me0dy2yanSqJRe3UIWil2Hd6iErbbXBojNAFlHurqNFz7W/UCvy08gz/qTzfMWmzcHJIYK8GAxWMkz1daMUPIp8dgcRjaX+pK0mLx9ityA0lzKXqdLJPaa7WisrZP/AMjd1n0p0qyxQx7WXEaNi922PehIB4cHBUFK9N3Q1eP8MfphNYdaNIdTO+12lmaQ7pFFIzlZQJDGATGWVQDTVY2iUvoh6I4TgbUsnkMPXtR42ylqG5kIY72RkyG5ZIshZs21muWLlexYmmivTvJMk09hxKvd2en6rukmonWQSyFyrlirMVZSu1kZQcoTTFBgMoauruvb9PHF6OxRt2FAUQhRGQV24HuQBgjAKQrMo9uerDqHAX5rxLIZ32qlPGiq+oZ50iayJYz2Zu3VCC5RVjjfszHRAbqWC1Hb9RPC/cUCwrEF80Gs7WZQQducgE+44A5p2DXxafUDQlpJGf2j2kqpN0CbJAK7hYuq8DArVsenlipyPOcMsJXWfHzTz1EL9obWEycrPDZhk6lZIXkSapMh7GGWpMqn2iGK11ojii1JJkST2OhGRMqqGsmrui+QFyABdUQIPSZ4iWwRJEOQ0T3tKXfH6SCQRRsAZKmo+ldLHQkyQV4Vi1LFHCiiId1b3XduquSzEr16uSGbbaA+vU1zSFTlVNgFtpvjwCRY+5GeD02dCilpVBLEgkAnx80c/bgeKOeqD/vp4lxfF/fFUyyVYT+s9KOPXMpO2o45MpDj+VYNLUuwEZxheN0aEfvtIQViljaOQRL9bn9BSzaj6fbT7iyx6vULGtkgIzQTMKzQMmodsX+og0K65/8AxPhhg+pF1LKFaTQaB5GANu5XUQhmzViHTRx1RJCfIs8ft65rgb/rv9vOHrew0Uvrx6M0mjKpJTkST1L4zH7EgYGKaOwCY3jkAR1JDABihuGpilTSzq0YG2CW6IAoRtlaB4xXOaH36zGWeJjIVZzuBAG2gLBFg/vVCs1jNdbK7MAn9xVCpISpI0AVaQEnZ1+Xg/J2O2/jQH1R5lZ1AFDJN8iqv4/evOL6+iYIctgkj5zTe7nN0LHAsGz16WuUkk00bCN1XqdgbdPx2dHfl/28j4GwNkPY6NHYHuINXYoGjYHnOMjGQfPTizLIpHuII5POBeQP445BrwB11tysJIHBKsr1mC615WdW2dEnf4sQANfkd60QHGba7MRtp8mvspFg+AATVi8fyhACmwjjdn9mdeL/AG/5ffxccjIqwBaNyJerbP8AUeMCbZ8eAO5UbGu2ydefpGpIDF6wRv8Ai2KqSP8AOwSARdYz0tB7VxVgWDyKFUf2FZ8/vfXzH9e8vQ6PuO2guiEBCsV+AN6B15BI8+QB9N6RgSCg2gszCuQKN1gDkjH3PxhLW6svwQM/amwfv/pzno2M6woBGP8A6hmHhmPX99Hz4Hn/AAdjZ19ETTIiAL7QGpmIIJYA2LBz/i/dj8W3savgMQQFoAWdoHjAPPOf+ecw+R/mOOPvSw/qFn2yiMNuMnRZToEbLAMVY67a/bX1awCWIr2FRijeMZoZx+5/e+pH1VYWqsSpAIFCxRs0M/Y+Pjx07X2y+slWtiebLneJZCPK8UwHLKeJi9r3K2WTkzYuCOU1HiikiNGjDmTMSskEhs0QLaz3Iqj5r9W9vfSd6XuRcPp+4dsfSItBfS1cDHBPDiXTs0gFoXEEigARlpOjPwu7zp+4/S2t+mQBHru2d1h7qbcMZtDrHihMqlY2eP8ALamNIZRTKF1EO0u8xGmg96+Y7N8t51wLNcrhoYzB845BSx3DuE4jF4vjeJoQ0c1jKVXL3YMZQoSz5mvHyO8cnlskt/K3ZcpXhtXJEjSIH9imhg02pjjb1ZdJo39TVE7zsMU8hhTaCFjLQBnUbN0imVt7MZFT9b9tdpO36jUu1avXPFp9Mx2sdkulX8y9gvvRNWFAmIKpqY40SJUYGd3Lmkr5ORqvtinet49fDExjHR36stuqyOyI8XsrYUo6gGMFGhZp5kapgqqq4fcypKbqgZGjcWCazbNkUd1HBwJ+KdpE2n27pId4AIuESIDGaokAK1q2NpyKBAfTF+rNiv7DpOw3pQkZJJVWU9fkxshJQDqdNoKQRsmFeJ2+w+3xXGMj+ceQOerAJYXYEgbjyWxk5o3zknNnn9rf7i3qVFfWIOwLSqF6jejoHx/tYODtSHJ6667VQdQ2rUrvKrShaYGgFBxuofyB7h87GN2+umSYKpO1gSRtxfnB/wAjtHP2sdPFTy1PIlRKsbN10H8HtvTEhv71KgjZDKfyOuygfQDLYCqQVFmr27qAsq2aIJAOMj4HTg0u00ABVAgDxnORRJz4sUP2BJzLkeJwVGD9dYOPrXL1HGtejjMyUhkbUVd7TRe9VE4qrMbCQNPD77r0E8OxIrmijkn1EUG4IHcKSQcKWouOS5ofpIzVX0maFBpppFCs6xyMochB7FP/AHlEICcGwa8DlSz/AKn/AHo+j/ptSxfAcFzR5qoWK/ebK5SF83+jaX2Y71ynUISri47KvCLc0MdOSZpYVld4mX6vOq0U+s07abt8M76QMP79wyeq6iwtlVUA3vCAlqIoCi3Vbgl02k1A1PcNRp0kACBIyHKLlWdgSXBNBWJobgfcxaumKp/cZx7mHrh6fYDjvu5zK5aPKY3KvXjnt16GEsyUnV7FuBBTSxXu162QjR2msw4uK9L/AEYbYd4V+0Saft+rl1LKgiMcyA0hlkW1O1GG4oyu4HklkBA27VPk7jBqdbpo9GDOWMkTsqnZESpZd7gEK5ZQSDyiMw/ViTvPM9+goMiMsewexAAYAEkgM3ldAlGPyDoft9Rel04cqVJYDN5oCwBdecWc4NnOD1J6i1R2O0EClUUKJ8/cg4oUOKByOs133sSQ8k+5mea9alStR4ZxeufZnCNIkI5s9mtMq9ZHDSZ6k6ElUUROpDCRfroT8P4/R7QzhQAdRqRZJ9pYaZENHFEadiP3BOeuaPxSZdV3hI2at2l0llQBiFtc5BINhidSoAJsov8Ak2P27Yyt/wCqT7bZq8/WnH9wfoaUgSbSmaP1U4s8bPoglAxBYabfQr47fV81b/8AB6o+2/y2oO8USB+XbAXyTX8nF4HWYHSkBqkG2rAPOLNeKsGryR1uLr2w8sgLbIMYbY/tZeoH5EjfwR5Otk+CT9ZzbMUBUBTu25ycgixVfcZNfvwgqBe0m9xrFDIxR++Fq+TddGcTrIbQXe2jJ1rZ2APG/wDIPn4+fGgQfoUyZDsgoEqDfABBujyPHOLsGjhaBvaCaCsCwGDk+c/GP3vovtsVBDEoyKiHsuwwHYggHQAIXt4O/HnwQPrzUKQoJ/qZmo+PHnnBx9j0SAGplohiar97o/Hz/nfXuwwNiFv7klVIkYEk9mKRkn/Hzs7O9/8A79Mzi1Cg1aE2b8ngnj5+Mf6oUkoVaw6EhvFbsgmj9h9hxY6G0QixzzFuoUSMoIGpHDhQuwSV6/mdtsH4PnWk6RVjX9VFVZlsXvYsBsNkVYLZHFXdZCWY+0rRyQfAqib5+Qo5zd8DoSr+5Ej6KF+rMh34PXQP7DwNft5B3+5+lsd1lVGTZyGF5BNn7beQDz46UpsfNDB+3xwKIxYOeswX+t8dlWlqUZTNLBZjitIIJo/bYoxRj2HVl/yV/EjW2Gh9W+N5Q4wDuBKnFgVYu7rjir+D8GwRKzkMwBYFiwsAUCaJxWRV2SMEdCuM81fBcox2Ux4/VCnbU5Ja8sUNl6Z2lmGKaaOxCtkxljUezVt1Enjha1TuVhNXkC7toU7tpX003sLrujdwCFdSCGZVolVZQrhWVjFJIgYb93Vj7D3ST6d7ppe5xKziEyetEHI9aCZBFJEWJKIzEI8AeNkTUxxyuG2mMzQ9Z+WcW9U/t2x/FeM2uMcx5XRrNmMdYg9OeJemfLMU+Gz2A5KvFJIePPPib2SyuW4fxrIyZS9bae41S1VpZTEQZm3NFm0aa3s2v9DWQLpoP+z3RxqIGil082l9dX06r+YgkSSVncK0ivIWeN5YNp3WTXab6l7Y2s0esl7hK+1gkkzGdJopYdYsW3VGQaHUAx6dXRTHG6RK0Z9ICTpracOP5lx+HMY6ytqvcijuVABYglhM7yw269mndgr36Fqjkq+Rx96hk6lS/TuULVWzUgtRywLCyo0XqQvlomKkmnsFQ6urI3plHRkZWjd43Vg6SOrBujopI5UjkQ7vXG9Gb+5aiSrRvG2145I5FkjkidQ8ToyMo2tSZgq3sRZeKR+8bsV0VIMTEb0GYaAJXqPOmb+/ZHYsgoVAuiBkZ9383isk1j9hjosyslbkohhRLVf2BY0aoZJXiiQR06vGM8IGhDv1aMaI02+3bt2LKxYDseo6HxsHYC6AU8KuCwI5prH6lNCs/wCEUcg5xwb6mNNqrUA2rKT7cWv8qSCCKzu4/kCRXE+Uo7Rkz/iOoC+SSQVKka2DvbL1Cg9iPAHxESpSkKmLsnFi7NVXgD+fgVmWTVeqqjcLAAo8GvnN5J4Ix+2Q6WTqYTlWHuYLMQwXaGRgapZrzBgrxTbVgWQxvGVPX25UaKSGRUlSRWRWViLekiSqGVozuRtpb3Kysp2lKIFGwdytZBsY6Dn1CR2CUvJwV2shwwIYMCCCc7WzmiL6a8ehX2++m3GLlXL5DE4uDNJJXtZLkWQglzuRlYSmlWmzduN8lJHA7yxVICzQ1oWD+07Rh1lpu5dw1bAKX3RlXKoGUoQBRAiIRd/6qAXfdG8nqK0uk1GsYw6DQyTIAyfoknG2QhZQ7yGmURhUJd94AUEmwobGxe+3b0rg4Jj+Ocr4xQy1N5rePoYu02Sq058hFPTjt2c1DF+jgs2I7tmCae3IosQXJGaR/wAiHHj7vrl1LSJqJlkG6feCjBlkDbQXILLSqwRB7Nm05Dbyouya3RR74tAUXT2Y4yBHILDAlNOzBw5tqbB2NICCXJ6LPUX1AWbDTvNJHJLJDIyyRspEjFwA8ZDeOxP5bOt9mGh5JWi0bxlA9UaJrgLgnJo2o/g3XPUfqO4LqY5PTDArQcPimyKIJtWBGR44rz1np+4qSzm/V7lmYnntmvdkxUeKVXZY5a+NxWPwVwjqQY1GbxeYrqgXbNAZNGGSOWXb/p6RtP2uCNAA4L+oRYILM8qbs5PoSRGyOGKWCCeucPrdjL3ydnBKskJiAND2RLFJVf8A88MwBJyQSKGOnC+3PgNep9w32l3q63K0mS+5T0Bq3TatT2yjXfVrhKGRYJnXSQB2f21ZVcHqCoBIn5ZpX0+pBK50soBC17WjYWebs5o0f4x1THRU3sATSGhusGuQN188jjmqvPWzhbccMxMiqpZo9ft2YSBlJ14+f7f3Ojrwx+qa52+1DZUGrFn55xX71WTd46ZVVNF0IJYYBPPivHR3XZxG0hUo7uSVV/IHwNsNLvyPnZ6+PGvoWQ0p93JsqQCb3WRYIx9vNGzd9LQAFmu7ayCLyD8X+5++Pt1yuyyMYg2mMz6bYAJVPIUeSVGhoHY8fJK/TbSM6kNftII8/qFmyaP+4vgi8uooKGsbSKzijmvvkDjjnr6jyPNCN/gsq6QrsFBIrFlGxolV323ogjXgbCCxYjccChj4/YWLAP7/ADfSX4bjcAc4N/uMcFvP7Ek2ejncSdkAVV/NQDosCx7n51obI35B3+RPU/TyrGHcIaQXtDkbh7qBvHF1xknxXQm59gG3PJIFCrONtkg4Hmh+nkiuck8cOlUglQqsC2tEA68aUf50fn5J8n681DGJIzXkqOAT5u2/jA+3O3pzTgybkF+33CqH6iSRk5AJ8HyBWMZgq+Jx9XI2LtZI1Flf6zKmhIUj0jk612QDqrDe1GwNjQuTooY7TYAFAUADd8ciqrFDOfvJDCg1tYijdEH55wL/AHvx89JungTintvUdDNemMrsys2gQSQSpUhioGifj/P+UQxyDcTIzG+SzHaMAAXZAwBihgfw8ZGNB/cAPaAABSgAYNi6sWPA8AV0Zx5H2XFeCzZrXYgHWWpPNBMjCPQYPGydlBbsEcMnuFWZS0asqtRp9JrIfy+rgXUKCSpcAFXYEEo9h0ZgArMpG4KFbcuOidF3HW9tmGo0Opl00m2m9M3HIi2VWWM+yRAT7Q4IRm3KN1WG+1vlNy5m/WSnmMmzcz4dzuzV5dTWzK0Oe4fmHtZXgHJnxszmpSyq1bGVxdjKYmOD+Z1aEUnI0u5RamUSgfVXbYNA+lXTw1pJYW9BgQxhlj2x6jTmR7eSE7oZESQkxM0iQbUFdaj9Hd8m7jHqm1MwOsjmInICRpLHKGfT6gRoEWGTeJYXeMKJliT1Q7kMJZ5Zq1iWOWuyOHVGOivbe/DfI2dEdhrY6lCWCFfqhvGyMQRRJsjJA+L55HxjJ4z1pSToyiSldiArgnJAsbhR+aJv3DGLz18giWNUljIViQrBiP7o/OgQ6lewYAHYHU9wd7AZku6Zdwwd10QDhsEePvfAoDjovST7FO0AENxzYZji+fcOeAbyfhdcZzFms6lZlO/mI6CqSQSOwLHt2A0T/neyfBE1CD3MVraVB2jJFHaa/pIF2Rk46PE6F9pXaTZu6FnwaHyPPijjr96m+uvKeC4urV4dwLOcuzWQ96GtPRhIwuPuNH2r2uQZlzDQw+Jg/J5bGRuU4H9p4EnjLMUM7XoF1s5iaaDTxqFYvqXETMPIj9VkRmIY3TBloFq9vTMum9UqXE0oZtoGniaZs+3a5jDkDiiRS/qA5uHfFsH6x+tebs8k9ReZ8FwNgR+xUr8kzwyGSEk/9GGjhOK8Wo5Xj1PH1kE5ydnLcqxmTf3K5goWJjZnguI0nbdFHQkZ2c7Aumi9VncFSA0shhQRFTQ/vJaKn01ANNcNAncIY4dPotLHpNLh5JJ5QHZCSxISH83JLNVXFK0OwGtwG4A69UvQq3x/ikedT1W4SbNWlHVt4SjwvK5mSaXu4Ye6/JcRHO7AqZ5Dj1hG29uGJihDMDRBlAilJYEsHmRCBQva3ourYsgBlwaK3dE6qLXVJNNMIo4VLFzpzs27fazP+YVwzE2RTKjDAO1SxP6d4HO8f9GBLneUvySU3Mg2OrS46apDhaiXLEq0BJLlcpNchdJhLBILAjEBigjCrAT9Nalope5MsUBiUIqkliVYEKNyhUjAFY2gEmj5I6yTuWoQGWaOdZjNPIzEIY7MZIJVTIxdWVgTJ7CxwwDbQK4OX2cNl/UfILavRvT49NQxSiZo/caSlj4RcaeYALJKuVnuPKwH/mMihEUCNdQ7Pp2Xt8bGMhphLMfaaIkZglWOCgQgfpraQTWOf/qXUrN3LUAMCkSxQKWK2CkQdtwIHuMhcWaOSpq6Mjvt5zOIf7k/tprGeC1LH9xHoS8aRyRTLHKvqrxNonR1JUOsgBB2OpVSda39SupZV001L7hp5iKB8I2CQD/AJrNAZA6rBDMWYuu1UKlQwybJugSeBRIFfbArWQ8a2JXJ2G6iSMjWw0fbr8bAPdN/Ojrx5+KbKbRWW9xdg1Vmw1EWQPI+OBYxXTKklmsgrYK5GCDVAE1jzVjnnoy/VyfpWbztAHIA0xX8l+d7DeFK9gCPAO/oeaNUY+4kVQv5wbq/4r5FnHK43tsgA77+zDdzeBRo3x58UevtyQ+1FKoACHRI12Hxrf8A0BoefxOiP3H0NkbgQctu4J280PJ84OPjzkkYBojlSfsAp+/+V/J+ehNaXUPvu7BtQRovwNOwQk/HySCdnXx/kkOoAUchbZCBkGua4oD7fcj9+mJAdygD2tZNg5o8fzR5Garz0bRlWUMfHbuCfx7EfABGvjw3cj51s9jr6UoX0lBwSaDeSwBoms0DYHNYPk9NSAgHixRGQAF9u5T9+CMYrJHPXpeoG2jQnZ/u3vRJAJ1+RJ6kknx8aHn6c2CYlZQGK0RtF+AD9h/Bv5AJPTYZkt4yRftIF+M/Y0Lxd4oXjrIXyj1blrPR/khisQy1+0sjufLhV2AFJDdC2mO18/IC+TcFjYglibGLIOcknBPjHxQ8c9S8hbDAEAADI8+QfuPHHPHXDhvOuYStNNfo2MrQlimnSzqM9B36hQVeHaLvoPhvHga12cQrGbBBPkH7V8Dnx5/bHTTb3A8gWLz5v4z/AKED96s1xXqCvIMzPRioCpdU9VaUMGSPYV/cCyMgJkBZQgYlR5PXY+m5Nhtw6m/dtByDxkD4BN3XxR8rQuPaY/aDhjheDjFkfPPjAz0Xccy6+kn3U+mPLxI82D9aMbZ9H+ZaeRfZ5E7xX/T/ACtivErw3JZsjUgwUbTIho4sZGVZSQIpIvv2kXW9l1IRiZ9EF1sQIJqNbGoTNbQImklr3EyLDYz7bD9L699B3vTh9wi1qnQyUWC7pTuixjPqBVBHup5PdVq0seWcjbiWYaBnIxkryNTZl2sCsxAru/Xa+0wCVztWNdUVmkKdmzaOBNUhI/VRvOW2ivHIHnkDrXpNU+mkUf0kA5HHH2vjxxYOfHSiw/OMfkIl1YRWAVt9gobsBsgMerbAAOgz6VSOjEfUbqNC6mkG8Ek0AAy+LPyOWNcHwej9L3IWCGCnhieME1g/Ask+CK810ucXbWd9pISjuAxVjo7PUNvfYOp6/uSAxHyQDGzxkVYYEACqrIPx/Lf6EVRBk4tSJaJbCkYBzZAN/wDm+fgWbz09eNr05aUdPS9LCoJhI3ue4zMy/ksi+Rt9a6/0xvQCsR9MJuR1YhrX9JyQtkEFRZCngk1nFiujhqZSpjRyoBBwSTd2LANXxisZAA6T3KPQW3zARPHyazxqsVLmfGVYZcgf6gLCu8zwwwzP3Co7JN0k0/VjH4kotZHFuZ9P+YkI4llZFteNxAJYCzV8AtXnoUv3YSg6XucmjUCiU2SsVoih6xZUNMaBJOTQ6a639qPDcdPBfyPKec5m3CHLDLclsZGF9kkI0EiGOHs/ZXWFkHWRge4AEZKd1I3JFotHGTRLrCN3NgAnPn7MQD5x0JqtLrJhI2p7z3OYLtWSKTUBYnDkk/3MaolncQ2DV4Oemq9es3ivT3h+YkikjjxlWCMw12ljh96dENStXTopCz2ysNaMIj9pnTqFVvM32vSy67UwRKoDzyUWANKCQzMRX6UCtIxvG0jJYdVPvWri7bpJpXbbDpoZH2s27eKFgXkOzhAoGXfgHqlGzPHkbOQv5FkfIXrE1uWb2gqz3LEjWLL9Y9KolmkdiuwqhyPGtjY4wsMaRKWVI0SOJSbKxKNgF/A4x9+QesGlf8xJPLIwMkrPI9WR6ju0jYUtQ3NgXgcGgepIfZXSmsfcv6BSx1vdNT7gfQ2zII0914q9f1O4xaszCNQ0ntV68Ek80gHWKGFnkZUQsGdYwEE43Nf5eYDGb9M18ACxxjis5HQ8aGMTM6/qjKjINj3/AMcfzZJ4odbOa8CuhcknSR68gdvhmI+QANDe/Gtn/unRtcQJr9TWQM+B/qSLOcDgnpkgs7LgsCAALABb3cHyCD81446EziREZfbATTkk+d+ToHfwdk6B8bGgfJJHk2mUG+HC/wDmIuzZND9ufjz0VkeoFFqRYNiq2qKs4AsePJzZ65t+dcqf96DQJ3ptKfG9AAHyexP0I4BLDGSc38jArFAcHH8eOiIxQDWa2gH5/UF+3j5/y8DvMkaGBAD/AFf06No7VWhaRnbfYDyUXYGuv+Na06ERYzQpigVuSAyNk3dm8eOfnpCsTITd0xOa4bwRd4vgEf79HcRYGL4JGwEJPwoJ34YAHRJ1v9/3BI+vqJI5tRQXIBHu2k2byCbuqsGhnoZiDvWiAaJYg/1FVIF+eD8fY56CSzf1XR2CgdXVvOyJOxC+PkADQ1vRUj9x9LkL+0ICrVbbTX+o5s2c/wD17GilbIBByPH2Njwf9fJyT1kYtcFocnxkc2KMdaSmZq0W9Kxeu5jZZFOwquyHTa11AI3sbt8cheypHv5JFmji65rxnjHF9Skgf+uhZBNEnJBOTnnnOb6XRavxyli8BAYv1k8aRRKSumZwBK5BG2jWVjskNtj534+kOWVqJBDXVVurGcZu/wDnnN9eoNynaMKPcaIv9yQL+R/oBx11s4d5b9C7XjrIsCf1WRFjdjtm+UTz2B8bI2PnQGx5sYkMKC3YrHGeMci7P+/HSWvFeOfjJAF/PPGTXiumN+4CHN5jAQ4HjMFqLkte5jeS8VzFMItnD8s47dXJcfvUZJlkhW5XvVoSPdieIQTTAr3IKO6ZY/d6pDRSb4ZVfcFeGVWSUMR7gDGSjAHdtJqvDju6GOSNikse2SOZctHJGd0bC8e1huo2DVEV1PTNUqXqfwLi/Ma9eKvDzbh/HeW1YIFZY4a/JMLSztaOD3JrD+3GLwii9yxZ8J1ad2DOuMs8nb9bqNOXLHT6qfTuL2srRTPGSxFL7wAwCkkAAMFsA79HGnctBp9YgAE+mg1A9xNLOiybVyWADMwXm1H6mANRDzVblfCr2qE5uVOzFYpCVY9fy69lDdHJOgrI6HZ7FFIH1OxNDqFAf2t7fepFEHBOcmj/AIQeDVeImSGWFq2k/a/GDdjBJ8Zxiz0sONevcuJKRZetYqdfw/rKwVZAw2yyqXjKMQSdv2HgnYDbHn7QJ2LRsrDm1wTVYYVdgj+DZqyKIi7g8RpgRWDdVS4Fbl8XWD9+SOpS8I+5DjFn9Otq5CrqUCsWQgFiSD22rD/cPB0f3GtAQs3aNQl0hNXgX98kkBTfxeRnHUlp+7LQJtGAydoK3Yqq+x5HjPPUlqXrfxZ6aSSZWiymIFZfeVWAYHsrgspI2SwB6+QVA0N/QLaDUO1GNrvgWBkWLoFTxxZPJo+Thr4VLOkgtlN025sZI2ZIWjVEEYvHHTd83+4DgOOoXZ7HIMZAI4XZmmtqkcSoNDtI/QKo/u2i+QECdW0Afpe1ap3WoXJODtQvbGgRgY93tpiNtmwKPQer7zpY4nLTRqALJLhVBX20WI9oABoYAIrAsimj7j/Wt/VXP16ONlki4rinszVUcSRy5G326DIzxFlKQsjsKVbrsIv6idDNMqQ6x9M9qj0Ss86VqnjvG1hCl2VBzbkYcqao0DeTiP1b3qbubbNPIV0qSZJBDTSbgtkA7Ag5Qb7N7if6TG3F0Yrlisb1jUM0rRhIwRIQqbIDDsBs9dEr42B1A2fqxSmmtqKhfaMg+fNHir83XJIHVXhjQA7F9MHBs7rarsV424sAfPkdTF+yzEy437r/AEXWL86A9W+Ae2zq3uH3ORUfZTbaLFANPpf7ip2p6kiapg8E9AioTtzyAGY5/wDDZ5yBRu669kXbG5bPtHGM+7P848cgDPHWvipMfyD7KCKNkHhSGUhTseN72PkbHTyBsbqKHcgQXasbyKPuBzz4o1nnOb6HclH9SxtcA1ROAc82QauvgDAJvo3sMzxhY1LBoEmkIBIADEb7ADXZh1+BvYHx5DboWkjCj9aqW8DdVE5rNqauz8cjpRcASj9RQ0MYojis8cWaAxY8AJEzSe2rkq/bWvgqGIGzvr878jXggEeDv6HmTaxwaxX3NA1zYx818HnouJjtyM7RjzmqPNfOPGLqr6GWJAs8Fdh1ZpCdjbdSEfuvYDYLAA6/5+PA16rqwIJPvayTYxfjFkHORdnJxfTe0qbq8Ys8gZ+f5zX/AC6HrIwkXQbyq6B15VANnfnz/k78+fkgfSnIVwTlGUAHItRQBxkHwAaJyDg315sR0NgDNmrobs1kYyeKzV4vAeWdFA2CzMexY/BGteNDWh4AGvH+f2+lMGkr0yQVsMQDZ3GwORigDzVk4568tVFWoHAFjFeL85s3x4HFDLIMjisWJielGKV2cu4VIjIT+RVW0PyYgnRG2860ARbA6oCy8nHjGbwKFfcknHAuupMI8mMrYs5BJAoeaF55qvsQa64Lj8fcytfJWLyy2o67LUUuoURsY3DKgYg/lo/2nsdH9vpaKs2Wcqy3WLwfgiv2oZ+fnposYVIJDKcmsWcY8/bz8/v12uWXjl9tJwhIIUKVZnJ8A/kCQRo/Gj/k+NfX1hPaylqI92aAonwwJyfjxZ5BCgu8WHZQx/TtBFih5OP3NnNH5BVbsRxPEzwNK0ZV1ZYhIFKeAA7LpT4A0Suzs7H7shj9yDftrNEm65GL8k1k5rL/ADXt3Hg2B/qOSD9jwT1K701w2dxvoB6UnkeMmw+VXC52KClZnjtSHjFfnHKq3Bbyy10EaQ5fg1XjeYq1zuajTyEFK1LPcrTSnI+/SxSd/wC6CF1aMalWZguBO2ngOrjDe7MWr9aMlrOLAqut3+lVm/6udrWVSsjaQbULbmbT/mNR+VaxyG0phdFAHpxuqGmFFM5DidfkIYGsPcA7AdQwLIFAEhKtpiNAMF/yxGz+IcWpaCVmLEoNygCgTfBviheRgbuOj5Iw5NgEk87Tuq8ge6rPGQReDi+kK/pDjMmzUL1dFb3Gj79W9xTs6KgR+NovjsSpI6jX7m/2k8QDxsCGr2ngAWODeKzzYP8Ahuile3xTBYirFtoQtS2LPk1QNYvacXjm0tlftIkkdpcXlJ4PefcTbeN0JP4qohaIdvj8+pOyTvQCkuDv4ohkDEGicVV82bH3K5J8YyI2f6fJJ2SNdEYLNkXml2/xhbA8E2Osf22QcVxc13knJuSZmzI5r0cNXzF6lVaRwRCj/pJUtHrIy9/atKhKhfyZmCuP315pBFBFBEB+uQxIxCDkgvYBIHkcVWemU7BCiNJPJLKFql3sq7qG26CsfduNFjir87kT608Gpcf9Ks3icZjayW5kpGRoYYxPZvDI0LQV7DIHdpJK6xxLM4VUCqZAF2pfZda03dYZppH9PcwUsxIRPRaNiExXtJJoUAP0nA6E7/oFj7HrUghT1WRaCqiu8iyLIiB6H6mQD3GrosfIrZyk8st0CSOxA0AMUqzArNDLGAkqTIVEkUiMjRyLIoZXVgfKsBp+lCWGU2rLvVrBVkYBlKkFhRBBw1fYCrxDUO7MyOjIUIUpIDvV1ABD3RLA3YKoQRRFjovjNupZgWmWaEbm94/kyyHyXAUqdHqpJ3pdEj5JWQEULoWJbcCPIyLAIuiKq8A2QKweo19TKrAbVAFhuQcXkDd7gaoH4AzzUxvs150Z/um+3HAzQFruR9bPTmr+sCMEIscrxnV5G2Q2lUjZ+SW2RsaC1MH/AA07Ajb6Mlhv/A9n73ur4FDByenTJvSm3bmUGqxX9JNC8E/IGBjrYzXxcqzEOQR7RKdfjQKly522z2IP4gAKGOvy39VHYqsdtAEfuePHj/fplzIaVlqyWWiCfuD9h44qsnHXdDKTfKtsJSKxA9d7ZijeBvfhi40CO66BB2QhY9rbgx8+2hVEkjNc5P8A7X16W/VgKf6hRzZHB+TjJFcdBoPdlsw2AP8AySRsRvXTbDY2RoADYOh+xG9kEizqS5FgAE1m7/Sv3N2eft8cPwMFVhkmkv4FgcC6x588+OBlqCT9VXJLMwl93sdkEfmreSd6A8gE62f7j514IHV0HtzQsAgCqIuzjx55+xy8JFYHHFi7wDxRwTkkcc/bHQ1lnLxdfIVZGBOwNFeut6352SDo+ASdFfpckcjER0GABKk0KG4fbnA8/eh0kMgVib920A0LuxfxmhXFV4vaOuZYQSdZFj2Y10CUJGmIbewT/wDXXhT5O9+Pr3TKRvFsDYBPK4sY8fA+RRx0POcgAA8nzYFkZ4x8ZPnrKrn6FXLTmkUE0IfcY/BSZQOw/JlGuvUAed7/AAIXevq1SpGXKKofzbHCuCRi74s5+PnkTEZZFDE0SDd0RRPAGTzk1xnm667jA46GFCzgTpCPbHu/kAigMqkAKSdDwTsjYC/RKRgJQb34AoAkfPOc/Jxz5Bth2LMBRoki8cmrwT4+Of8APAHGiMe7LkAFsI7JGoDABAx6lUJLeV69z5JJ860SUDY+71GBAYCywAIFgsDdUCQDR8mx56WCwVdpYWMkgKecfq20LBAOLqheLWHp76a899YOWRcN9PcDbzmZt9ELos5x+JhlL9s1yG/HDNHhcDTSKaa5kbSqgiqypWSxZMVeULW63t/bYDq9bKungQEqHJEkxBsR6eNyjTSm/wDs1HtB3SenGrODtDpdd3HULpdFE88zMoYC9kKuDUmocArFFSsQz5egsQeR0R7NPXbjdPCZOvgcJJO2D43j8ZxrCm0GaRsXg6UeOoh5Fb2/e/TVlLSKW9xnkP7s31g8EsszS6iYJvnkkmkKDaN8j73IRQF5ZRYFnLE2SOujoUXSQ6eCJCkcEK6dcKDti/ugSSA7EhLYt5NUoCgsnx3GA23SZEBIAMTAdfCkkEgEDQ0QQfOxonW/pxyDivdZzecC8k/azkijz0qTazKY8g0pajktgAX8Hmv3rwRljBQLlO5rxo6OVZU223OtOrOzL1Y68ADrrYHgfSWZglBsUDZ/pGbANH4/yHHHTkFqxCqNyge8g7gTYNDwaFG/jFeFN0kRUUxxkfOyGQjrGWHkuQSOzMNMNH4AB2fIRSKQb3MSbIwCSeD/ACR5GeiJ32OxJBHp7dwWzuwaJ422RZObtukZm6AtXcY8iA9Zy0ngyosYTuzKCejMrAHRKqS5UEDx9P7mXfRA3gKMc5F3/mftijmrDlVjFGR7l5CnGclj82L+3HFiuo4+s+IGW4xmFSs8v/uEJPkOkkcqSRMB0baJ1LnajrretMfqW7VIY54gWrFVixhgSAcWCxGSQR/pC9zVpNHIgXeGKmhe61O6xRB3Up22avJ46Qdr7T+KetOLpZytlrnFM9drVEzOSxlOpfr32r11q/qcniZnqM9xOkQS9BepSPB7guQ3pWryVZLTfVmv7I00DRRanTB2MUbu0UkQclgkU6hyIrJJidJBZsMp3boHW/R2h736er3yafUyrGZ3SOOSOQou1Xk08hiUy7ceojRg0N4ZiskTxfb/APwc5vVbnNzhnHfuP4ji81lOJ8kyPA6/O/TjOY7Hcg5Zh8dYy1XiOZyWB5NyKfA0MhjK1yWzyfH4rkt6u1Qw0eFZF5AhuX0j9XQfU3dD2eaE9v1csE82mB1DamDUPpY21EiA+lA8Tfl4ppQAs9rE1KSQRnv159LH6N7Q/wBRK/8Aa/btPqdHBro0g/K6vRQavUJBHME3zxTEamSDThTJCjST1viTaeiLgP2MetX2r/dr9uFr1Q9NIP5Bf9XeKNg+d8Ut0OY8Gt2f5nfXGSpmMaHs4Gzbt4q3NhqfLcZxvMXmx1izRoyNTmevde5aTU6TSzGVWZDGW9VCrIQfDHlCwwPUCNQ4FUc30Pfuz92haPRalROyqfy0qtDql3kLQVrikUNVtp3kjjG0XtKM+kvIYfN8dsPjc9iclh8gteC2amTpWKNyKtcrxWIZZa1uOKaNZa5jkUSRgqQ0bKsqMi02aN4GZJFZHJU7SjA0wJWweALo3QFVgggE+oH9wIKq7FgM04PpspIH+RBogkgkC+iGaVP6bRsQjVVkbW9sVMhKkkgaPXe9eSf+QCycA45OfsDyf/fi+Qc36wqqxuAahnNtX+RH+xroNSupsDye3Tw2wVHx5+NEsOx//ltkj4Af2udxZVLkjgUScqBkZ55INDoyOOlX/EQu/gUfH74P3/8AU4lcS265dm2ok0OoLFdflG37gMSNEDwCpGiR9P8AqM0kY2lR4s1djkCqyMgfF/z68dxvRwu3I+5Ygiro+xvnIrz0admV4SNP+OlXsCTsnQOz4IBAII2CB+2/p+q23RNgWLFk455q6weTXFdN3aEBqKgEtXNDNV45vkYxddF93v8AqiGLKFQqSSC4YMNKT+XgAtvwB4H02P7pmjYMCpuhfJsmqJwCSDnwDwR0oxmRVK7T+48fNWKs3g5/16y+fav9rH3u/ex/qdfte9GLvqJV4JdxMHLuSZDmPp1wLCYG3mEt2sfTkyvqRzPiEWYuyQU57NnGcXGbyeMrPTuZOlSq5DHy2rbD22actLBb1QO54kUEg37ncBiKJpbJUEcAnqR1XcNJotizyRxs9lFZWbeoFsSFUiMA2F3n3iyAACOrHvUr+Bf96fBvR7j/AKhY71M9JvUH1kzHL4MDd9COL51cJRxGGux1RHmh6zc/yvEOIW+R1b1l1vcQlwmNxj4yNLPGub8qz13HcXtPanSjSxwu86FpZo4jtdQqNIyxx75D7beRlQkA00iA4LuoEXdI9Tq30q6cgx6eXUKaLNIIkMzqIkRttQpJLZk3bVCCMSOim1P0/wD4K32ueiHopyoevE+T+6H1zzXHvbl5PT5Dzr0x4JwDKiq0taH07wHEOVYfJ5oUuRPjZMjyrnN3KT8lw2IWOrxjiOLzfI+N5Wxar6eEXaO6CBmfuz9v1f5OcFv7jWjSynSmNGtHqdUBM6SKLojZujagJ9fxyfUnZd6CPsY7t24dzjCi5e3vqIItcZXRUn2jTvNIRA0KEJ6mz1kjeNpuK3eCenvF7HFfTfi/HuG8fszrduwYCjXqG/bZEia5kpgps5S10jggFzKWLFpa0VeCKaKtGIRx7J3PUa2cTaqefWTMqrv1Ds7RRqv6IgT/AHSUxb01CqWO8ruJPXccHbINCno6TS6fSxKXYx6aMxB3sgs+za0j0oO9yxLKoO5Qo6iV6u1lyd2Swn5o9ydmIB0AzkhgD0D6LMNhG2QA7N3DGU07KEYAg8KDgbcC7xkkgElra7rAoe2SbPuJjSryTVg35o0LF/JABOWSq1lo2dyMCJh+DdgHjO/bPcgggsG6A6KhQmwFcsfWAJFfq2k/FNfgE2cEeMn/AFdSW2UsChF4IpSa22BihjdecljhcAdMgeeKSVVdQBHNJ2CqV2SrkbGip0p2CdFlAOyQO0gd3hJK5VjQzZZVI80KN8fJJ6MhJYlg21qyKwbRTYIu1O4qTgncM9dLpWCIdnHUd3Xbdz4Kgr7nhux7b8l/IPnSgEnTjfZClQaAB8ADJxY8Z4//ANH3VR7UULTAsbIyeAtNzQtc3R5wOekxb1MzsPhUmO10XUlSqnYKqVA0wCgHSk6b8SPSKbDbsljYsjFkVgg0DsGCSKoeESe1CtgbAqn4DVTMpsWCCRZugDVHhAzYAcgwuYgCh5w0yOpT82RgVkXX922ViAANuGYbP5aJikEcyMCaDBvOEv55Nj5OfkXRBlBeF0vkEDAoXnJsc5Gfmv2VHpJjpMIRSaNoxFMqyAkL3/Ng/wCIXQJ34B2eiMCTtth90YSbnWhdsCACAosK2R4AAxVk556Ro1KLtY7aBAF3Q9pBO4GwxrA81fjqwP0EqTN6uenFelK9S03I6tyCWJpQ8UWOgs5KYr7RR1Vq9KdH+V6djKDCsmy/w8hfU/XX0yqEho9ZJOze4MYtFotVrZ13KQR6kUEiN/QUZg4277p34rzpo/wx+s5ZVBR+2rpFsizqe463Rdv0zgNaF4tTqInj9pO9VEdSlGV3fvYOax/21+unJsLksngcjxnFj1E45k8PZnr2qWZ4jzjlfJuO2qtqtapWaAoWatuWKetZjnpCzWlpSt7SVn6n7qvr9s1sDi2l0rKA6oUKldY8ZZD7Tt2o0YIIUqDRBscJfSmofSfU3YdRGWVo+76BSYXMLbHniRwJ4yHVnWVlNEFtzk/razrG5jnHPPSv7N7UecvfzDkXpPw3LclmnkNxsnVn4JxkZGvaNmFkMjZTOVry2URZYjDKsVhfcnLZ5oIGn7b25NRI0rrooT6jAMWdkhUsZaGZGbJJIJLElsySbp3eWMfUf1GVQQwp3TXxJDD+hUj1U8aCiSKHpDa1gDfe1AdnXDFchgsgUrRSrl6mTyGIuVJOsQFrFWbWNnkrq09gNUsz12sUozPJN+nmr++onDqK6O7dvfXantv5qJdZppWhaCU+kzMGXYYy5p1kDrsKBmLH9Aptsoexd2h7fpu6nRySaHVaePUJqoNuojijeyfW9O3gMQDbzIgQMACQCpJ9T6fqrSuvhjEw8nSDtoAeSd91O/OvyK78eUS2Xeyf14vnBAz96ujzVDoeMDYhHlFJvk0oAP8Alz0pox7qVZmVQ8UZHuaH5FliZSRr9j5I878aA8/RUduwLH9DN9uBj/TH/wAoNk4fItwmBf8ASXFmjz7ibP8AkeuskrRSQPHvav3cE/iwUN8+NrvQ8b35H7efpySVoyrAD2sCR85Yf8hx8n+G1o71OABtAHm6JPzdX/F889AJ5VknMbMDIFMhDHQVC2lKnak9iTvZOyp8/wCGBI25rG58ELuyEYsQbya4AvOP3HToJVQAABYAN3wOCK5x8AfYX1O7iHKeC+itTEcY9G/SziHpP6d4nMVMnf43wbj2OwMd1I6dahdyeQkqQV2ymflw9etUsZ/MW8jlb0ECJbyEmhLFSuz/AIi6mL6g7edTIdL2qWT8trFcs8MUE6r/AMRJLbEHTyLDPK5YsYoyGIO4NpvfPoWHWfT/AHCLT1qO7rANRoVRRvfUwkSLCqYB9aL1dPHCVVBJKjja1bJLclwWJ5Dj81gY2eXE8nxMgWQEyKIsistrFZKJXkV4Z6sht1TPGnVYf5BF21GI16Imhj1ME2nZQKiZCGAZgkpCKCM/9i5ZWBH+FbslTzwNXOp0+t08xin08sbRFSpIkiKsjowH6kqNwQbpXYe6iWiuZXI5Pj1fH5mR/wBWtWzx3MN2lQvcxrtgchZiZo42c2LFdLtadUTaMsyARzAratBqnl00EkhBkSOP1KIBE8YO9lsblUMszEEWWCsCKW8l7xp44ddrYY4ysDTzpArHcywSPcKsSDuIidFd6ALgnKHd1Q5yET4fk/KcPKkcUuM5JnsTMK6fpq4/l2Xu0p1rQr+MNcmuRBCmhHEUjB6oCeMfqftMXa/qbvOhgRI4NP3HUnTwjCx6aZzqtGi+0Ui6aZFj4fYBa7q6/Rr6G71L9Q/Rn0v3XUy+tqtX2TQ/m5XIYy6/TxHR62WR8e99dpdQXoH3/Ng9ILkWOlyCF4kMi6YPvzpS2wybGoyx2Wbem+GLN1YMRuQjkH2iitjKmqII+A11jjOLrqwMhLhFUAn2kHCscmx4rn4o+Oma5LiLWPMZaFgHWMr2AJALaG9AFdEs3Yj8kI6kMNhcU4e0YKSikHmmJFUt88ZwBjyCenCjMEEh2sFJB8kUD4zYB4rkEfboFBGdqrqAvTQLsVUSdSSq7/E9gCVPkhgNuD1Ban2l0UEg4FqDfH7g1XJon9WOjtOhRGNXdBEJNDaoUhbFgWNxJ2n3YHSN5HZsRkwwCRmVnIj8jqo6u0aKFHVWZhqTfk/jsr1H1IaZlK+9iwwoKgFseTZFDyM3ef2H1LtuKu1gKSBdkF7sE4B+ME4NkDnoxjp6oDv5msESSglj27k7HbsQdKH6jxoKWIUMOo7uVY17huKJWQTVAeRXN83YAtj0+GJgJX43LZwQNoo1fAYFsAXQBJJov4bUdcxapMp1LI0etFgNv28b/IAsy/3Agg+dj5XLlVZaVh8giqAWift5zVYF8dCKVDVv9rBme6XBFqRRJyM8V4O3p4K/EWx1qGzHFoSOQzdPP4HsGJP77b5K+CPOtLsaRy6bFC2Rb5IARs0Lyb4Axmjm+hlZBIQpsWdtn4Hkea/iqsfHU2vtQxgt+rAtsxMeE4tmrpICuPckFLHq5kYERe21twAo7nRG+gIk0L8I9EifUur1J/Xpu0az0Rt9wl1Eumi2mxgHTvqAAvuZiWJWMNuwv/pCa51+h9DoVO4dx+odCmoBc0NPo9NrtcpVQ1EjVwaUncrKEb2qHqQDv4mec/0j9mvqlXhnapb5zS456boUZWknq8puUMZcjCMPb/pUeU5m04I2yQmbs3RBDuX1Pqxou0dzmIUyRaTUgGrVZRpV0kQo4J9dHagDZLKMkVzT+HXbm7r9c/SehIZkPd9HqZVAPuh0Uo7hMNwN+6HT5thSmjt34lPwTh1anwn0VqLGKycY9B8NTij200cKHE8GikcyMWDBBjjDGzf1HEkmm6Suz1PQQxppYIkz+X08sKnbsG1JCiijRDGOOIEEAl93tBUXf5tS2p1vctS9mTVdz1c7YFh5dVqJaoEf/qSCxwMhWACiOHqhjaOP9VeeYeIkvUzUNlyiBFMuUxWNyzr0LlgzNfJPUKQ/khewI5y+v1/L/V3e0QgAvoJSLwHm7Zop5LXNkmU3ZKkfAO0dT/hsX1P0L9OzSZBh7hHeLC6bvHcdJEAwC0iJp1XABUhh7iCT6w/8zhUvJXsz1mKAShTJKiIwb+5fyYeGbsvZlDaCFuy/QPbPq/u3bwFeQayGxceqLzFQtYWQsZVBBY1vaNWK2jFL6X3n6I7J3Il1QaLUkNU2kAh3M4oepBsMLhSBfsVyLAnQuSHASeN445I5F9ti0hGyCgKLpRGwjfQ8MSqa6jbBSev1ova/rHtPcZAry/2dIyp/dahxsZrt9sw9p22SDIsLG/avgZf3X6H712xTJHD/AGjAoJMmkBaVQuVaTTks5aslIWmVL22BTtyM6l+6Ojq+m7AghQwBVdgaJ/u6+T4K+daP1aiVkJZHDgqrrR3LTAjFfIurrABGDmlshUyIyMGDspVgUa0IVrDAEEHBBAINA56501VyzSJ7kxVSX1siIH+mhJPnqDvYOtkn99loe1iEBLEAknyB4oA5Fi8c3/KlW75Aux5Gef8A5/yrp2sx6r27ePOMycUcw9px7oHR2JU67FuyKpOhv2069SQCpIfnKbWyTIUlJYHcCyAAm6UUij3WWFbQw3tYFMQOpoO1JDLviLjdwu7eAVPIBN38C+L8V1KP0F5/e5rwPil0WCt3G5bkXp9lVsSEPWsRTSX8FZYh555FTJ0MTFAzkWJak0kj9JJnT66z+je8t336e7Nr2VxM2m/Ja0OQ3/Fw79NqZqse2ebSjVx+9nTT6pVJ3gg8lfWnYl7B9V987WQo07zpr9EEUBV0OuQamGLxTQRTtpZDSr62nLKu1lPSn5RHWr8jyArSloM7Ux/JK0DSN2FmzBXwuQMUbE+zWilqcdmswxrEq27k0sgE1iT3b/2uWMNqVYspdkmjA3EmgwlPtulVTHuv2f3j0DbgYx9S6crLpyEH6Hhks17i5MZsjO4llOSaQKSFx1T59xfEI8L9wfKv0wLVeWUeO8ygg/p+zXfKY9sHcjjKdvwtZLjlzJyOAS1nIWXXfbf1h/4taOOH6i0uujjRU1vboiSo2tLLpZZEcnAV29Bo4QWAKRxxKNoVb6i/6Pfc5p/o3uHbpJS57R3vUppod4b0tJ3CDT6rYgq1V9S2tlFkgySTEEHd13wXAobNaPtF2DKryhxoSPvr+TkaO+uwpJH7keNHL3JYbdtKKYDAxeb+a8X9gaHW6BvevJYkNuBr+LwAeOfPm+G29XeG0VqKYUBCdF9xvBQr+BTYGgob8TGxG2GiVdQPodCqDfHZsv5GHIJUfJFFa/fGepONTKTuxIKA+dpA9wHgAUSMg0COTUWb+N/SGMupKh2DFSR2XoSgjB3+Mb6Ib57bOjoEPEl7Y8qoAXyoOST8Ej45Hnx0XoyzHaws+47myTQPijlvOeRzzbc5Rz7zEg7ZdliD2Kx+4nzoEkdfkdgZCCVbWvo6IiOPIGSAMAnIxx+4JNYJ/cdCTwf3zYIBJZVuxiNS1mrouxJ+3HmjCiss8cEXzoaHkb+DH8EkBl0wZixX8gnk7P0MctliArMa4r2gis1zdm/t0+i0IgKUA1RBPtqgKAxdHdd+4EDOS6fp5xJZM2srw7dujbdCG2wBDDY/2p3J35Y+FACjbDSuzsN3sRjV37hjnOdw88+RV101KFFuy+5gFJINLjcQLPmxQAvi8UepQWOKV2runRRI0YHVepk0Ao91Nedr4B1pj/b5B+ko5oYrYcmzlR7aNGq3BjfNUPFmJkAVrU83QHCji9x4/wAs+R1I77UOINQX1F5CwlaUy47jlZCojSMVK8+QuuX7bd53v41de3H+nWBD3m/VkQ73+D+h3aTvevYgHVavQaCNSKUJpYtRPOd7GyXXWw7gtFBGKLB39PlX/pHdy/4z6V7YoUDT6Pu3dpWBJZvzMuk0mmGw0qhDodawayZfUYUgjHqxV/i33mb0z9EuNd3apyP1yRbq+3DKZYcLw/nmWjV9tHJsXcNihGigxyNX6SHRLC0fiDIkXYIhd/ntf2+BkGTs1OobUFWyCLN2xuwORRHVT/AnRif64k1YVTJ2X6e773GJjY96aeLQkjahAoasC7BBcYzfVodKADHYiKsU6Y70ulqq3URQq9l8dBUjC9wNk05I440JkZvxVgzAMOlbGIHtEZyBeDbqMg8qeMAkm7zbmkHqNI90GkEhVmAoe2RycVf96bxwSCKx1DH1PvVbHrb6nT1/6rJnaVaQiEqP1NHj2FrWUCqGI9u1FNECUPdoiwZ+oX65k/ERSfrPveRRft5ALE2f7H7dZGaNfpvjB89de/him36A+nAynK93YMTZpvqLvBLXki73ZO488VXSpy/LVo1jgZApXYCL0I/uIc9eshBGxoN4IBbvp/qnpIVAAsGypFqfnOfBPj5Pm76t8mnikJLpjcRZN84FE/sLIAIyKsjoiv57JV7dWw69qs9gxNKnbpXmKsV94KA5Q/0gRv8Ap9mZihIRlmRDtX9LYAtUsAHFEkZYkrfIHAArp6PTuRIEWwEsxkKS+BZHO4gkkBSKWibK31w5BlMziFjyeKhS1pVOQwzTGBLkagP7uNclhUyClkAZhJXsDvBYiMpimq2rsH1Rqe1SLDOzajSswR4mc3GCw90TEMY3AskgOrjBQtTpRvqb6O0He42m06pptcV9SPURqC0jZuPVKF9TUQnbYKt6qH3pJsV45FHw/nOE5TTmuYa2J3gk/TZDG2ENXLYeynxUy2ODPPSmKgtAxD1bUQM1OzZrhJW1vQ6+LWRDU6ZlkVxWbBUXYDgcP5OSCCCCRnrCO6dr1nadQ2l1cTQyAgh6LRTLRqSCQqoeNjYGQ6bdsiK4ZVTg5XFLZ92Ry7FZCVCBkDMA2t99+B0YMEBkbrrX5BucREu7cQbILWcAgZwBdkc5Nkiyc111oYhF+peFULTE4GDjFbuCb4JA4HUwPtX5bHk+O81pVwobCc04fyCf2w6IsiZSnahZNNE4mWOhIxCrJHIPZEnfcqN0h+FeoL/TLoTaaXvOpQli1FlXQavjAG71DuokbQAaZj1yx+MUH5f600jEkjWdkgnN1dq2s0oFmrW9MFpzuCoCoKgDqT3MH93IYfIxM6yY/P8ALeOlG7RKuNlvNyeEGNSEZkPF8YK8ZDLFBasRp1DSdtg0LFdbGR+p21UMhUn3JNAzFipWiQ8cYs+4bnAzg4B9SKHgdj+pfy7IxWyrP6e4lx7lVi5JAIBYqRfiCP3YcYalzDg3NkQLSGAyvG81KTG3V8TlK1zj8bKSQFEWSzahiz9S6bbtKHelfi1ovzHau1a4D26PWSaUsQuE7hpw7WSu5S0mk0ygmlJBT9W0nSf+jx3Q6b6h+oOzMQB3PtUOs9xJZp+zap4l2CwCh0/c5WYFR+kFsA7mjxvPaaKVjT2leIKPz2B7ZDP+BCKRpW2PhuqroAj6waSNBEx9wI9vtIrBya5HOfHg3kDrFcPk7rsndY4quCSK4+4sWBkN7zfKjPEp7ikM6gopBbuoPwp/FYyCHJ+D/d419DRq8pYN/hIyfKn2mhwduAfdZ5B56lIZNlUbJJJY4sUuMfcULNAAfNBgs3xztDKziNVTtJGVYNJ31shQDoofx7psq34eAOw+lxqVqwTtvcMWVogggkX42gHHkgEWdFLbB4wQ15s0psgWtk8WSccX+/TG2KBkeXv17EvtkA2SpJ+Ou/lifyZgA3wWOvpaahVWsFjQC/4RXNeCf6lwozk8dHhL95oUpOa91iqB5sHjyeMdK3inFzaQ2EOpI5wCpYgsi9mbTBCCEPYgAiPZUtsqOi69RCeFP6hQG4DcCq3zwOaG3J/UegZHWPagLGmJ3D3Mt5psYu/8WaJI6kVxOjHi5O/QhiiqApUaZOwLOe3YbIUADYLMCdAHQhjWiATZJBFDG26qiLAqhdEjNnoCeYEYK4BvcSTnFKKOQbrdRHnPS0vcheAIVbswDdkCFvwUuzMEBcn+wAj4PnSkeSSsarGSUF7QS1k1eQCp2gjNi6zk+OowM7OwNEe3buIAPPkizVf8scie3241a8fpbDk1kdzyDk2WyTh4+nSKu9LGhQQ8jlCcE8wkMSPuZkClfzl6X/DHRDT/AEjo9QxI/PavuGrAChdqwSTdvRQorcrHSlt7GyzOi2gEh4t/HTWDWfiFqtKoTb2rtXaO2vtcMS+oU95Ja6PqIO4iMohNIAWZf09VufxN45s/yz7Z+J49DZyEXK8xyCvVXZ9+1lLEHGaKqArRtZL8uheEFuz+5MAAm9D/AIiyGfTdm0kZAkk772tdpsWmkhKTEvdbQ9AAbizXjqV/AQpou9fWXcZnUafSfRHeFmfaKT81qINTH/S1bl0MxYlSoCgsCPabXTCYpDBGWcyT+m+KcRlEISXl9a1drtLGWYhMdaV5a7u3vVZUEp1NtvIkZonZuA8VgVR2UxqjZwwN4XIIogjoXReyKXeCCul1ZAOc/l2VQGIPutKUUTvrHA6rj51M8Xqp6jMs7SN/q/Myr2lDNr9dMpVdHQ9qNfbTqxZVVUdyE0eXfrRt/wBU98e/aurWMjDbPS08UIBwoxsAJUZzYs9di/h8gj+ivpqDaFb8i8hIJAIn1M+p3ZJORMCWwPNKOulHKQFVaXQIGvbeMMGV1c6OxplLsR0HgjRZQWANWVd0gwLQsFAJoBxS4IGCQAM0KyMHq3upJbYKOCaO0jaykkEcHkggH44PSgGSjkjVDHC4jIKRydHKGGNAjRq7MB/tePaM34ICyn8meKxgAZJFCqJAznhuB+3ij02sbx7gS49RSWIYhveSMlSAST+ogBWU1kYHzIk3K7gJr24igbqCCdhSwI1tiR1lRW6qg/ZfLKRAXLFroFwoAJVbUVtGDWSxJsfGCQLKAgOwMADi8UTYsci/NE8sfgkxH5xHmaOZOSwOYyPHcoBLQlyeLMcN6ehK6TPSnlkSYS13sVoZ1UjcbwgBvL7sHau4ajQMz6dyu6PYVu1BDAt7TYBtVogf4uL90N3Ps+h7rCkOtgGoWKX1FOQwfay4IKkCm93uIZiL/SOns7ipBZk/MhY5pG6v52schbQIA2WcDsfJUeQCBqsC7UXX9I8+dp+Bm/vXjPVsnYvYs0NqgYwCKP3vN3d9Tw+w6tHmOCc5tmOKNpvUXH1n7CQl460fHbTIxSRWVJA8oAVvxeRn8rpB0l+FunVfpg4B9Xueqle79wB0UZDXYvbEVAoqAQ1Bg27k78YXeT62hjZi35fsmijXdVEPJrZBwOA01m7JthYG2pKeqtuehjuR2YCpfF+rPppFCHB1DU5dkeCYHMJBo7WR6nKcvNESVUTz9WJi2DpiSGLUCRSw26mEkAi/eyXRrGCykUAwJJyT1ineNOH0rIxstoZZjgUTB+ZKggV5gAwKChCBuBPUfvX+Ns76NchawUE9LGJm45+oZ4ZsdSkzj/p+4kAa3LgzSn31L071rb95PBH1xok1n0t3mBiFOn07yxOFFxv22Ya1NpGT6iQrp3Jr+6eRc3u6G/CvuUvbPr/6Z1UVt+a17dt1CFiqyw92gn7cSwTbfoyTpq0S9nraeE1tDI1VuN5JYtKoWIBtFezNobUFe3VVPk+C2iASDoKST9cuEspokNZrjFMM/wDt8HPXe5Rbs88/Izng/ANfP+/RvZvzyNGe3VgHkPUnywPU6+NbJYgkE6Yjx+7SgIwIAtnF3nCtnzzmx4voyNCCwJBAsAUD5NeB/wDPB682pffqOZRv3G6b8bAYHZBI3/t0F31KgBtknQbzKsjHa3tZgKIBwCRn7ECvBzuvo+JRQIwSCcYo7iDQ4ojkVWLFHpEtx+uZIthSHLE7B2OpBGiQTtgT5/2nzp/oetzgbmAwxzZNsLB4vJHPI+PJ/rAK/tvaAfgEkAjAOAMfNm7B6UmHqw49J4Y12JSAN66poNpgpB2yjfUnQ8LseD9FiYEJGAckrk/povkHyT9xx+3QUg9Vkdgo2jc1DJJFUPFAChfyT9ulXWZoYZJezfB8g/ntELMx/ZifJ/bZ1saJ+kqCWXdXjgnPzeRz4qv456j9UqbjQIBonPgkivgeaoDx4wEzlMlb9qUBx1C9m2AG2RslSAP9vZepJUg+R/h9jmiWNyKh4UFbA4Gbo83d5u+mkhSwRdFbF/c1kGx48H+erWPRlpKPotw8hy8kfFmu+6dszTDGQTlishkUdpJS3UDooPVAoX8us/pWMaf6W7DAtEf2R26UkggltV6E75tjQknYrRXaCVFgAD88vxBnOr+ufq3UOKZvqHucSAUNq6OaXRxYAC36OmRSQATlj7iSa7PWCmOffxF/QHiV49aHDcVk+WqjuTFYkwj17eOiEaptiMjx2nNKHZUEMksQLeD9Vr6rhMnd/pqJtrJu12rKsLojVQIu1v1blEhok4smyaq5fhvIdN9GfiJqV/VrdX9L9jBBIZYJ5O4NqTfCiSI7bUFixpqVV6t5gow1FjsKCHu8syMkwDB+/wDKsXkMdXXsyqVT2uO0ZAmnEcgbRbZZiWi9mnBY/wB5MwJoWNrOErHACIp4wvz04D/wknn2rz5JeMEn/MnA+3HVNuYyzWeRckzZQu+Y5LyHIH3fylCz5CZ0jdux6lFZEAV2VQCpL9VY8md6dp+996mahv7p3EjFkomrlRd+4t7vaTg1njrtv6ahbR/TX0/AWDGHsXaA5AABdtDC8rLQX9UrOwJAOQcHAHfqGICITGH9sAjy2vgbIKkHTjyD/wBDwCYwQgAHg5JIAvIBJGOcGhYA8V4moJ2LBiMlWYVgUHqiDZJ4ySbz+3Soxzs7RwBmDRKXDkk/I2AB5+V7FgNKzHqV6kkN7d5bJAGCBV2DyCQebzVf7kvsWr1MHcaokijdiubq8XePmh0fLNK8Z0esnZlT8j7fRYkOioUBSAwIIDaYdRpPA9Ql+LUe0Br95JHmgALrJHxwfA0kYViCFIoXyTZz5ORis8DHHTN83oqs0M85UNI2u0IIJ3GHPZHPVfLFdIddUT53oHaMXvjBNpyWJPkjBBBzVm//AFJBmJ3ApjcLIOBdsCRXyAL+/X//2Q==</field>
-            <!-- Avoid auto-including this demo user in any default group -->
+            <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
             <field name="partner_id" eval="ref('base.res_partner_agrolait')"/>
         </record>
 
-        <!-- Add the demo user to the portal -->
+        <!-- Add the demo user to the portal (and therefore to the portal member group) -->
         <record id="portal" model="res.portal">
-            <field name="users" eval="[(4,ref('portal_demo_user'))]"/>
+            <field name="users" eval="[(4,ref('demo_user0'))]"/>
         </record>
 
     </data>
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 0b5057ef506..4a493204d67 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -2,10 +2,10 @@
 <openerp>
     <data noupdate="1">
 
-        <!-- Don't use any implied_ids here; this group behavior is particular -->
+        <!-- Don't use any implied_ids here; this group's behavior is particular -->
         <record id="group_portal_member" model="res.groups">
             <field name="name">Portal Member</field>
-            <field name="comment">Portal members can access information provided by the portal menu and the others module it's linked with.  Also, portal members are chrooted in a specific menu.</field>
+            <field name="comment">Portal members can access information through the portal menu.  Also, they are chrooted in this specific menu.</field>
         </record>
 
         <record id="module_category_portal" model="ir.module.category">

From e6288ebd823b5b68fd0cccbe39dc24157bb055ab Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 12:17:21 +0200
Subject: [PATCH 181/312] [IMP] mail demo data

bzr revid: abo@openerp.com-20120725101721-87h3l31byw15unjh
---
 addons/mail/data/mail_demo.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 274259e544e..f9edb8b9e2f 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -29,10 +29,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus. 
-            Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. 
+            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
+Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla.
 
-Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. 
+Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
 
 Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
             <field name="type">comment</field>
@@ -54,11 +54,11 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Agreed !  
+            <field name="body_html"><![CDATA[Agreed !
 Would it be possible to learn more about the author ?  (second comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
         </record>
 
         <record id="message_blogpost0_comment2_attachment0" model="ir.attachment">
@@ -76,10 +76,10 @@ Would it be possible to learn more about the author ?  (second comment)]]></fiel
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel. 
+            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
 
-In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue. 
-Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu. 
+In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.
+Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu.
 
 Check the file in attachment for more information !  (third comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>

From cd2e64ea3e9abd14ec204c7a09a6c9e874eb1b92 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 12:17:38 +0200
Subject: [PATCH 182/312] [ADD] portal demo data

bzr revid: abo@openerp.com-20120725101738-zpuxrocmx9jp6v1i
---
 addons/portal/portal_demo.xml | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index da3ab53e1bc..e5b5ea2fe70 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -18,5 +18,43 @@
             <field name="users" eval="[(4,ref('demo_user0'))]"/>
         </record>
 
+        <!-- Company news and comments -->
+        <record id="message_company_news0" model="mail.message">
+            <field name="subject">Our first company's blogpost !</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="content_subtype">html</field>
+            <field name="body_html"><![CDATA[Hello, and welcome to our company's portal !
+
+Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
+Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.
+
+Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
+
+Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
+        <record id="message_company_news0_comment0" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="content_subtype">html</field>
+            <field name="body_html"><![CDATA[Great first blogpost !  (first comment)]]></field>
+            <field name="parent_id" ref="message_company_news0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_demo"/>
+        </record>
+
+        <record id="message_company_news0_comment1" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="content_subtype">html</field>
+            <field name="body_html"><![CDATA[Thanks !  (second comment)]]></field>
+            <field name="parent_id" ref="message_company_news0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
     </data>
 </openerp>

From 232c5679568cad1027dd379de6286a31b551c3e5 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 14:43:23 +0200
Subject: [PATCH 183/312] [FIX] set the right field as 'name' field in the
 portal's contact form

bzr revid: abo@openerp.com-20120725124323-tq9u2mxg8wpvy1zc
---
 addons/portal_crm/wizard/contact.py       | 3 +--
 addons/portal_crm/wizard/contact_view.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 15923a6bb4f..c83ab014c36 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -36,8 +36,7 @@ class crm_contact_us(osv.TransientModel):
         Therefore, user #1 will perform the creation until a better workaround
         is figured out.
         """
-        values['name'] = values['contact_name']
-        print values
+        values['contact_name'] = values['name']
         crm_lead.create(cr, 1, dict(values,user_id=False), context)
 
         """
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 4a388dca275..4b0110f0508 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -15,7 +15,7 @@
                           <tr>
                             <td width="70%%">
                                 <div class="oe_portal_crm_contact_form">
-                                    <field name="contact_name" placeholder="Name"/>
+                                    <field name="name" placeholder="Name"/>
                                     <field name="partner_name" placeholder="Company"/>
                                     <field name="email_from" placeholder="Email"/>
                                     <field name="phone" placeholder="Phone"/>

From 31621f412a76cdaa04b866d94d94fe0e96f24a12 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 25 Jul 2012 16:13:33 +0200
Subject: [PATCH 184/312] wip

bzr revid: nicolas.vanhoren@openerp.com-20120725141333-ueaj3e0i8imlwvre
---
 addons/web/static/src/js/corelib.js   | 12 ++++++----
 addons/web/static/src/js/view_form.js | 33 +++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 1ed4c4788e3..a092b670ef1 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -378,7 +378,8 @@ instance.web.PropertiesMixin = _.extend({}, instance.web.EventDispatcherMixin, {
         instance.web.EventDispatcherMixin.init.call(this);
         this.__getterSetterInternalMap = {};
     },
-    set: function(map) {
+    set: function(map, options) {
+        options = options || {};
         var self = this;
         var changed = false;
         _.each(map, function(val, key) {
@@ -387,10 +388,11 @@ instance.web.PropertiesMixin = _.extend({}, instance.web.EventDispatcherMixin, {
                 return;
             changed = true;
             self.__getterSetterInternalMap[key] = val;
-            self.trigger("change:" + key, self, {
-                oldValue: tmp,
-                newValue: val
-            });
+            if (! options.silent)
+                self.trigger("change:" + key, self, {
+                    oldValue: tmp,
+                    newValue: val
+                });
         });
         if (changed)
             self.trigger("change", self);
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f8f09ae2762..7c2ad5cfaf3 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -33,6 +33,14 @@ instance.web.form.FieldManagerMixin = {
 };
 
 instance.web.views.add('form', 'instance.web.FormView');
+/**
+ * Properties:
+ *      - mode: always "view" or "edit". Used to switch the view between page (view) and
+ *      form (edit) mode. Depending what is indicated in the dataset, the view can still
+ *      switch to create mode if needed.
+ *      - actual_mode: always "view", "edit" or "create". Read-only property. Determines
+ *      the real mode used by the view.
+ */
 instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerMixin, {
     /**
      * Indicates that this view is not searchable, and thus that no search
@@ -82,6 +90,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.__blur_timeout = null;
         this.rendering_engine = new instance.web.form.FormRenderingEngine(this);
         this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
+        this.on("change:mode", this, this._check_mode);
+        this.set({mode: "view"});
     },
     destroy: function() {
         _.each(this.get_widgets(), function(w) {
@@ -91,6 +101,16 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.$element.off('.formBlur');
         this._super();
     },
+    /**
+     * Reactualize actual_mode.
+     */
+    _check_mode: function(options) {
+        options = options || {};
+        var mode = this.get("mode");
+        if (mode === "edit" && ! this.datarecord.id)
+            mode = "create";
+        this.set({actual_mode: mode}, options);
+    },
     on_loaded: function(data) {
         var self = this;
         if (!data) {
@@ -149,8 +169,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 { label: _t('Set Default'), callback: function (item) { self.open_defaults_dialog(); } },
             ]);
         }
-        this.on("change:mode", this, this.switch_mode);
-        this.set({mode: this.options.initial_mode});
+        this.on("change:actual_mode", this, this.switch_mode);
+        this.set({mode: this.options.initial_mode}, {silent: true});
+        this._check_mode({silent: true});
+        this.switch_mode();
         this.has_been_loaded.resolve();
         return $.when();
     },
@@ -300,6 +322,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             return $.Deferred().reject();
         }
         this.datarecord = record;
+        this._check_mode();
         this.set({ 'title' : record.id ? record.name : "New record" });
 
         if (this.qweb) {
@@ -576,9 +599,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             return $.Deferred().reject();
         }
     },
-    switch_mode: function() {
+    switch_mode: function(source, options) {
         var self = this;
-        if(this.get("mode") == "view") {
+        if(this.get("actual_mode") === "view") {
             self.$element.removeClass('oe_form_editable').addClass('oe_form_readonly');
             self.$buttons.find('.oe_form_buttons_edit').hide();
             self.$buttons.find('.oe_form_buttons_view').show();
@@ -957,7 +980,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         return this.fields_view.fields[field_name];
     },
     is_create_mode: function() {
-        return !this.datarecord.id;
+        return this.get("actual_mode") === "create";
     },
     open_translate_dialog: function(field) {
         return this._super(field);

From fe8b2937c9e8652d5726c4fe74d0c51024923362 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 25 Jul 2012 16:18:32 +0200
Subject: [PATCH 185/312] Solved problems with switch_mode

bzr revid: nicolas.vanhoren@openerp.com-20120725141832-4zqw6g0zf9m4hfro
---
 addons/web/static/src/js/view_form.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 7c2ad5cfaf3..5ba4dfcea54 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -63,6 +63,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
      * @property {instance.web.Registry} registry=instance.web.form.widgets widgets registry for this form view instance
      */
     init: function(parent, dataset, view_id, options) {
+        var self = this;
         this._super(parent);
         this.set_default_options(options);
         this.dataset = dataset;
@@ -92,6 +93,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
         this.on("change:mode", this, this._check_mode);
         this.set({mode: "view"});
+        this.has_been_loaded.then(function() {
+            self.switch_mode();
+            self.on("change:actual_mode", self, self.switch_mode);
+            self.set({mode: self.options.initial_mode});
+        });
     },
     destroy: function() {
         _.each(this.get_widgets(), function(w) {
@@ -104,12 +110,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     /**
      * Reactualize actual_mode.
      */
-    _check_mode: function(options) {
-        options = options || {};
+    _check_mode: function() {
         var mode = this.get("mode");
         if (mode === "edit" && ! this.datarecord.id)
             mode = "create";
-        this.set({actual_mode: mode}, options);
+        this.set({actual_mode: mode});
     },
     on_loaded: function(data) {
         var self = this;
@@ -169,10 +174,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 { label: _t('Set Default'), callback: function (item) { self.open_defaults_dialog(); } },
             ]);
         }
-        this.on("change:actual_mode", this, this.switch_mode);
-        this.set({mode: this.options.initial_mode}, {silent: true});
-        this._check_mode({silent: true});
-        this.switch_mode();
         this.has_been_loaded.resolve();
         return $.when();
     },

From eb4f3cecb68a3bf6baabf59e1607b5e9df38834f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 16:20:24 +0200
Subject: [PATCH 186/312] [IMP] in the portal's contact form, only show the
 'email' field to anonymous users

bzr revid: abo@openerp.com-20120725142024-btojdzrsvqru4dlk
---
 addons/portal_crm/wizard/contact.py       | 12 +++++++++++-
 addons/portal_crm/wizard/contact_view.xml |  6 +++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index c83ab014c36..3cf2adac98d 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -24,7 +24,7 @@ class crm_contact_us(osv.TransientModel):
         read datas generated through this module.  That's why we'll write those
         information in the crm.lead table and leave blank entries in the
         portal_crm.crm_contact_us table.  This is why the create() method is
-        overridden.
+        overwritten.
         """
         crm_lead = self.pool.get('crm.lead')
 
@@ -37,6 +37,16 @@ class crm_contact_us(osv.TransientModel):
         is figured out.
         """
         values['contact_name'] = values['name']
+
+        """
+        The email_from field only makes sense if the form is submitted by an
+        anonymous user; otherwise it should be the current user's email.
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+
+        if (user.login != 'anonymous'):
+            values['email_from'] = user.user_email
+
         crm_lead.create(cr, 1, dict(values,user_id=False), context)
 
         """
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 4b0110f0508..5414c8d6ccc 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -17,7 +17,11 @@
                                 <div class="oe_portal_crm_contact_form">
                                     <field name="name" placeholder="Name"/>
                                     <field name="partner_name" placeholder="Company"/>
-                                    <field name="email_from" placeholder="Email"/>
+                                    <!--
+                                        The email field only makes sense for the anonymous user.
+                                        In other cases, it's auto-filled in the python code.
+                                    -->
+                                    <field name="email_from" placeholder="Email" groups="anonymous.group_anonymous"/>
                                     <field name="phone" placeholder="Phone"/>
                                     <field name="description" placeholder="Your question"/>
                                     <button string="Submit" name="submit" type="object"/>

From e406b7759ae4fe6240f8ab2c04edd4b163ea1c9c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 25 Jul 2012 16:31:50 +0200
Subject: [PATCH 187/312] Fixed problem with m2mtags

bzr revid: nicolas.vanhoren@openerp.com-20120725143150-x6u8pfira3wbc8mg
---
 addons/web/static/src/js/view_form.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5ba4dfcea54..6d55ad40378 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -94,8 +94,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.on("change:mode", this, this._check_mode);
         this.set({mode: "view"});
         this.has_been_loaded.then(function() {
-            self.switch_mode();
-            self.on("change:actual_mode", self, self.switch_mode);
+            self.check_actual_mode();
+            self.on("change:actual_mode", self, self.check_actual_mode);
             self.set({mode: self.options.initial_mode});
         });
     },
@@ -112,7 +112,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
      */
     _check_mode: function() {
         var mode = this.get("mode");
-        if (mode === "edit" && ! this.datarecord.id)
+        if (! this.datarecord.id)
             mode = "create";
         this.set({actual_mode: mode});
     },
@@ -600,7 +600,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             return $.Deferred().reject();
         }
     },
-    switch_mode: function(source, options) {
+    check_actual_mode: function(source, options) {
         var self = this;
         if(this.get("actual_mode") === "view") {
             self.$element.removeClass('oe_form_editable').addClass('oe_form_readonly');
@@ -3563,12 +3563,13 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
     render_value: function() {
         var self = this;
         var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.view.dataset.get_context());
+        var values = self.get("value")
         var handle_names = function(data) {
             var indexed = {};
             _.each(data, function(el) {
                 indexed[el[0]] = el;
             });
-            data = _.map(self.get("value"), function(el) { return indexed[el]; });
+            data = _.map(values, function(el) { return indexed[el]; });
             if (! self.get("effective_readonly")) {
                 self.tags.containerElement().children().remove();
                 $("textarea", self.$element).css("padding-left", "3px");
@@ -3577,8 +3578,8 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
                 self.$element.html(QWeb.render("FieldMany2ManyTag", {elements: data}));
             }
         };
-        if (! self.get('values') || self.get('values').length > 0) {
-            this._display_orderer.add(dataset.name_get(self.get("value"))).then(handle_names);
+        if (! values || values.length > 0) {
+            this._display_orderer.add(dataset.name_get(values)).then(handle_names);
         } else {
             handle_names([]);
         }

From 74aa5cfa8ef6d501b66a58190f768989b120fed4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 16:40:39 +0200
Subject: [PATCH 188/312] [IMP] identation, also remove useless 'noupdate=0'
 attribute

bzr revid: abo@openerp.com-20120725144039-o3kjxo065qhode33
---
 addons/event/security/event_security.xml | 65 ++++++++++++------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index e0d17c3bacb..f46bc5fff96 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="0">
+    <data>
 
-    <record model="ir.module.category" id="module_category_event_management">
+        <record model="ir.module.category" id="module_category_event_management">
             <field name="name">Event</field>
             <field name="description">Helps you manage your Events.</field>
             <field name="sequence">3</field>
         </record>
 
-    <record id="group_event_user" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="module_category_event_management"/>
-    </record>
+        <record id="group_event_user" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_category_event_management"/>
+        </record>
 
-    <record id="group_event_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="module_category_event_management"/>
-        <field name="implied_ids" eval="[(4, ref('group_event_user'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
+        <record id="group_event_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="category_id" ref="module_category_event_management"/>
+            <field name="implied_ids" eval="[(4, ref('group_event_user'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
 
-    <!-- Multi - Company Rules -->
+        <!-- Multi - Company Rules -->
+        <record model="ir.rule" id="event_event_comp_rule">
+            <field name="name">Event multi-company</field>
+            <field name="model_id" ref="model_event_event"/>
+            <field name="global" eval="True"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-    <record model="ir.rule" id="event_event_comp_rule">
-        <field name="name">Event multi-company</field>
-        <field name="model_id" ref="model_event_event"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-    <record model="ir.rule" id="event_registration_comp_rule">
-        <field name="name">Event Registration multi-company</field>
-        <field name="model_id" ref="model_event_registration"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
+        <record model="ir.rule" id="event_registration_comp_rule">
+            <field name="name">Event Registration multi-company</field>
+            <field name="model_id" ref="model_event_registration"/>
+            <field name="global" eval="True"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-    <record model="ir.rule" id="report_event_registration_comp_rule">
-        <field name="name">Report Event Registration multi-company</field>
-        <field name="model_id" ref="model_report_event_registration"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>-->
-</data>
+        <record model="ir.rule" id="report_event_registration_comp_rule">
+            <field name="name">Report Event Registration multi-company</field>
+            <field name="model_id" ref="model_report_event_registration"/>
+            <field name="global" eval="True"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
+
+    </data>
 </openerp>

From e2107d35d18fa8fcaeed44e9dd26b70aaa6ff4d0 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 17:24:55 +0200
Subject: [PATCH 190/312] [IMP] use const SUPERUSER_ID insteand of int 1

bzr revid: abo@openerp.com-20120725152455-9q5kkogalmzmul4y
---
 addons/event/event.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6a8cf9f8a0b..c3942642b3d 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,6 +23,7 @@ import time
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
+from openerp import SUPERUSER_ID
 
 class event_type(osv.osv):
     """ Event Type """
@@ -159,7 +160,7 @@ class event_event(osv.osv):
                 elif field == 'register_prospect':
                     number = reg_draft
                 elif field == 'register_avail':
-                    #the number of ticket is unlimited if the event.register_max field is not set. 
+                    #the number of ticket is unlimited if the event.register_max field is not set.
                     #In that cas we arbitrary set it to 9999, it is used in the kanban view to special case the display of the 'subscribe' button
                     number = event.register_max - reg_open if event.register_max != 0 else 9999
                 res[event.id][field] = number
@@ -178,7 +179,7 @@ class event_event(osv.osv):
                     if reg.state in ('open','done'):
                         res[event.id]= True
                         continue
-        return res 
+        return res
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
@@ -189,7 +190,7 @@ class event_event(osv.osv):
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
         'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
-        'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'), 
+        'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -227,18 +228,18 @@ class event_event(osv.osv):
         self.check_registration_limits_before(cr, uid, ids, num_of_seats, context=context)
         user = user_pool.browse(cr, uid, uid, context=context)
         curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
-        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
+        #the subscription is done with SUPERUSER_ID because in case we share the kanban view, we want anyone to be able to subscribe
         if not curr_reg_ids:
-            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': num_of_seats})]
+            curr_reg_ids = [register_pool.create(cr, SUPERUSER_ID, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': num_of_seats})]
         else:
             register_pool.write(cr, uid, curr_reg_ids, {'nb_register': num_of_seats}, context=context)
-        return register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)
+        return register_pool.confirm_registration(cr, SUPERUSER_ID, curr_reg_ids, context=context)
 
     def unsubscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
-        #the unsubscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to unsubscribe
-        curr_reg_ids = register_pool.search(cr, 1, [('user_id', '=', uid), ('event_id', '=', ids[0])])
-        return register_pool.button_reg_cancel(cr, 1, curr_reg_ids, context=context)
+        #the unsubscription is done with SUPERUSER_ID because in case we share the kanban view, we want anyone to be able to unsubscribe
+        curr_reg_ids = register_pool.search(cr, SUPERUSER_ID, [('user_id', '=', uid), ('event_id', '=', ids[0])])
+        return register_pool.button_reg_cancel(cr, SUPERUSER_ID, curr_reg_ids, context=context)
 
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
@@ -260,7 +261,7 @@ class event_event(osv.osv):
               'register_max': type_info.default_registration_max,
             }
             return {'value': dic}
-        
+
     # ----------------------------------------
     # OpenChatter methods and notifications
     # ----------------------------------------
@@ -415,7 +416,7 @@ class event_registration(osv.osv):
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        return {'value': 
+        return {'value':
                     {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,

From e7f3b6f14c7f0e2c4c06d57cb962d893bc6176fc Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 17:42:46 +0200
Subject: [PATCH 191/312] [IMP] hide current registrations for portal members
 in the event form view also, identation

bzr revid: abo@openerp.com-20120725154246-wx7et6nwi3f8n37v
---
 addons/event/event_view.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 32352744fa8..a5181e7dded 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <act_window
             id="act_event_list_register_event"
             name="Registration"
@@ -129,20 +130,20 @@
                                         <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
                                         <field name="street" placeholder="Street..."/>
                                         <div>
-                                             <field name="zip" class="oe_inline" placeholder="Zip"/>
-                                             <field name="city" class="oe_inline" placeholder="City"/>
+                                            <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                            <field name="city" class="oe_inline" placeholder="City"/>
                                         </div>
                                     </div>
                                 </group>
                                 <group>
-                                       <field name="type" on_change="onchange_event_type(type,context)"/>
-                                       <field name="register_min"/>
-                                       <field name="register_max"/>
-                                       <label for="register_current" string="Current Registrations"/>
-                                       <div>
-                                           Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
-                                       </div>
-                                   </group>
+                                    <field name="type" on_change="onchange_event_type(type,context)"/>
+                                    <field name="register_min"/>
+                                    <field name="register_max"/>
+                                    <label for="register_current" string="Current Registrations" groups="base.group_user"/>
+                                    <div groups="base.group_user">
+                                       Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
+                                    </div>
+                                </group>
                             </group>
                         </div>
                         <!-- <div class="oe_right" style="height: 200px"></div> -->
@@ -477,8 +478,8 @@
                                 <div>
                                     <field name="email" class="oe_inline"/>
                                     <button class="oe_inline oe_right" string="Send Email"
-                                      name="%(mail.action_email_compose_message_wizard)d"
-                                      icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
                                 </div>
                             </group>
                             <group>
@@ -544,9 +545,9 @@
                         <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                         <filter icon="terp-personal"
-                              string="My Registrations"
-                                help="My Registrations"
-                              domain="[('user_id','=',uid)]"/>
+                            string="My Registrations"
+                            help="My Registrations"
+                            domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <field name="event_id" widget="selection"/>
                         <field name="user_id"/>
@@ -574,12 +575,11 @@
           <field name="search_view_id" ref="view_registration_search"/>
         </record>view_
 
-        <menuitem
-            name="Registrations"
+        <menuitem name="Registrations"
             id="menu_action_registration" parent="base.menu_event_main"
             action="action_registration" groups="event.group_event_manager,event.group_event_user"/>
 
-
         <menuitem name="Reporting" id="base.menu_report_association" parent="event_main_menu" sequence="20"/>
+
     </data>
 </openerp>

From 8ea8f1da5b1da4d137bc0f25b49d6caa4ee2f25c Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 18:23:06 +0200
Subject: [PATCH 192/312] [IMP] put groups attributes in the product's form
 view in order to hide qty incoming, qty outgoing, qty available, procurement
 method and costing method from portal users also remove some code commented
 out since 2010 (written by qdp, commented by sbh)

bzr revid: abo@openerp.com-20120725162306-n4ypzds4ltsrhy6j
---
 addons/product/product_view.xml |  6 +++---
 addons/stock/product_view.xml   | 24 ++++++------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 4fe51dc67f6..48c9327b903 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -73,7 +73,7 @@
 
                         <div class="oe_title">
                             <div class="oe_edit_only">
-                                <label for="name" string="Product Name"/> 
+                                <label for="name" string="Product Name"/>
                             </div>
                             <h1>
                                 <field name="name"/>
@@ -95,12 +95,12 @@
                                     </group>
                                     <group string="Procurement">
                                         <field name="type"/>
-                                        <field name="procure_method"/>
+                                        <field name="procure_method" groups="base.group_user"/>
                                         <field name="supply_method" groups="base.group_user"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
-                                        <field name="cost_method"/>
+                                        <field name="cost_method" groups="base.group_user"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                         <field name="price_margin" groups="product.group_product_variant"/>
                                         <field name="price_extra" groups="product.group_product_variant"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 04a0959739a..d5a3545a1b3 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -105,15 +105,15 @@
                 <group name="status" position="before" version="7.0">
                     <group string="Stock and Expected Variations">
                         <field name="qty_available"/>
-                        <field name="incoming_qty"/>
-                        <label for="virtual_available"/>
-                        <div>
+                        <field name="incoming_qty" groups="base.group_user"/>
+                        <label for="virtual_available" groups="base.group_user"/>
+                        <div groups="base.group_user">
                             <field name="virtual_available" class="oe_inline"/>
 
                             <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
                                 type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_inline"/>
                         </div>
-                        <field name="outgoing_qty"/>
+                        <field name="outgoing_qty" groups="base.group_user"/>
                     </group>
                     <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
                         <field name="track_production" groups="stock.group_production_lot"/>
@@ -123,7 +123,7 @@
                 </group>
             </field>
         </record>
-        
+
         <record id="action_receive_move" model="ir.actions.act_window">
             <field name="name">Receive Products</field>
             <field name="res_model">stock.move</field>
@@ -136,7 +136,7 @@
             <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
             <field name="help">Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
         </record>
-       
+
         <record id="action_deliver_move" model="ir.actions.act_window">
             <field name="name">Receive Products</field>
             <field name="res_model">stock.move</field>
@@ -215,17 +215,5 @@
             </field>
         </record>
 
-<!--        <record id="view_product_valuation_form" model="ir.ui.view">
-            <field name="name">product.valuation.stock.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <field name="cost_method" position="after">
-                    <field name="valuation"/>
-                </field>
-            </field>
-        </record>-->
-
     </data>
 </openerp>

From 011f1ab2ab5cadcade4a8576bbfb628c4440c68b Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 19:40:49 +0200
Subject: [PATCH 193/312] [IMP] put groups attributes in the job's form view in
 order to hide number of employees, interview form and total employees from
 portal users also, identation

bzr revid: abo@openerp.com-20120725174049-pnwp3fqg4o1mxs02
---
 addons/hr/hr_view.xml                         |  4 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 77 ++++++++-----------
 .../portal_event/security/portal_security.xml |  1 +
 3 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4d034a452f5..c43ca7c25b5 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -375,8 +375,8 @@
                         </h1>
                         <group>
                             <group>
-                                <field name="no_of_employee"/>
-                                <field name="expected_employees"/>
+                                <field name="no_of_employee" groups="base.group_user"/>
+                                <field name="expected_employees" groups="base.group_user"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                             </group>
                             <group>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 7881d6f1e37..281bee7c56a 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem
+        <menuitem name="Recruitment"
             id="menu_hr_recruitment_recruitment"
-            name="Recruitment"
             parent="hr.menu_hr_configuration"
-            sequence="40" />
+            sequence="40"/>
 
         <act_window
             id="act_hr_applicant_to_meeting"
@@ -44,9 +43,9 @@
     <record id="action_applicant_unread" model="ir.values">
         <field name="name">action_project_unread</field>
         <field name="action_id" ref="actions_server_applicant_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_unread'))" />
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_unread'))"/>
         <field name="key">action</field>
-        <field name="model_id" ref="model_hr_applicant" />
+        <field name="model_id" ref="model_hr_applicant"/>
         <field name="model">hr.applicant</field>
         <field name="key2">client_action_multi</field>
     </record>
@@ -62,9 +61,9 @@
     <record id="action_applicant_read" model="ir.values">
         <field name="name">action_project_read</field>
         <field name="action_id" ref="actions_server_applicant_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_read'))" />
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_read'))"/>
         <field name="key">action</field>
-        <field name="model_id" ref="model_hr_applicant" />
+        <field name="model_id" ref="model_hr_applicant"/>
         <field name="model">hr.applicant</field>
         <field name="key2">client_action_multi</field>
     </record>
@@ -173,12 +172,12 @@
                     <group string="Contract">
                         <label for="salary_expected"/>
                         <div>
-                            <field name="salary_expected" class="oe_inline"/>, 
+                            <field name="salary_expected" class="oe_inline"/>,
                             <field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
                         <label for="salary_proposed"/>
                         <div>
-                            <field name="salary_proposed" class="oe_inline"/>, 
+                            <field name="salary_proposed" class="oe_inline"/>,
                             <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
                     </group>
@@ -224,10 +223,10 @@
                <filter icon="terp-document-new" string="New" name="filter_new"/>
                <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-document-new" string="New" 
+               <filter icon="terp-document-new" string="New"
                    domain="[('state','=','draft')]"
                    help="All Initial Jobs"/>
-               <filter icon="terp-camera_test" string="In Progress" 
+               <filter icon="terp-camera_test" string="In Progress"
                    domain="[('state','=','open')]"
                    help="Open Jobs"/>
                <filter icon="terp-gtk-media-pause" string="Pending"
@@ -262,7 +261,6 @@
     </record>
 
     <!-- CRM Lead Calendar View -->
-
     <record model="ir.ui.view" id="hr_applicant_calendar_view">
         <field name="name">Hr Applicants Calendar</field>
         <field name="model">hr.applicant</field>
@@ -271,15 +269,14 @@
         <field name="arch" type="xml">
             <calendar string="Applicants"
                 date_start="date_action" color="user_id">
-                <field name="name" />
-                <field name="partner_name" />
+                <field name="name"/>
+                <field name="partner_name"/>
                 <field name="title_action"/>
             </calendar>
         </field>
     </record>
 
-    <!-- hr Applicant Kanban View -->
-
+    <!-- Hr Applicant Kanban View -->
     <record model="ir.ui.view" id="hr_kanban_view_applicant">
         <field name="name">Hr Applicants kanban</field>
         <field name="model">hr.applicant</field>
@@ -359,20 +356,19 @@
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
             <field name="no_of_recruitment" version="7.0" position="after">
-            <label for="survey_id" />
-            <div>
-                <field name="survey_id" class="oe_inline"/>
-                <button class="oe_inline"
-                    string="Interview" icon="gtk-print"
-                    name="action_print_survey" type="object"
-                    attrs="{'invisible':[('survey_id','=',False)]}"/>
-            </div>
+                <label for="survey_id" groups="base.group_user"/>
+                <div groups="base.group_user">
+                    <field name="survey_id" class="oe_inline"/>
+                    <button class="oe_inline"
+                        string="Interview" icon="gtk-print"
+                        name="action_print_survey" type="object"
+                        attrs="{'invisible':[('survey_id','=',False)]}"/>
+                </div>
             </field>
         </field>
     </record>
 
-<!-- Stage Tree View -->
-
+    <!-- Stage Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_stage_tree">
         <field name="name">hr.recruitment.stage.tree</field>
         <field name="model">hr.recruitment.stage</field>
@@ -387,8 +383,7 @@
         </field>
     </record>
 
-<!-- Stage Form View -->
-
+    <!-- Stage Form View -->
     <record model="ir.ui.view" id="hr_recruitment_stage_form">
         <field name="name">hr.recruitment.stage.form</field>
         <field name="model">hr.recruitment.stage</field>
@@ -407,8 +402,7 @@
         </field>
     </record>
 
-<!-- Stage Action -->
-
+    <!-- Stage Action -->
     <record id="hr_recruitment_stage_act" model="ir.actions.act_window">
         <field name="name">Stages</field>
         <field name="res_model">hr.recruitment.stage</field>
@@ -424,8 +418,7 @@
         action="hr_recruitment_stage_act"
         sequence="1" groups="base.group_no_one"/>
 
-<!-- Degree Tree View -->
-
+    <!-- Degree Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_degree_tree">
         <field name="name">hr.recruitment.degree.tree</field>
         <field name="model">hr.recruitment.degree</field>
@@ -438,8 +431,7 @@
         </field>
     </record>
 
-<!-- Degree Form View -->
-
+    <!-- Degree Form View -->
     <record model="ir.ui.view" id="hr_recruitment_degree_form">
         <field name="name">hr.recruitment.degree.form</field>
         <field name="model">hr.recruitment.degree</field>
@@ -454,8 +446,7 @@
         </field>
     </record>
 
-<!-- Degree Action -->
-
+    <!-- Degree Action -->
     <record id="hr_recruitment_degree_action" model="ir.actions.act_window">
         <field name="name">Degree</field>
         <field name="res_model">hr.recruitment.degree</field>
@@ -470,8 +461,7 @@
             action="hr_recruitment_degree_action"
             sequence="5" groups="base.group_no_one"/>
 
-<!-- Source Tree View -->
-
+    <!-- Source Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_source_tree">
         <field name="name">hr.recruitment.source.tree</field>
         <field name="model">hr.recruitment.source</field>
@@ -498,11 +488,12 @@
         <field name="view_type">form</field>
     </record>
 
-     <menuitem
-            id="menu_hr_recruitment_source"
-            parent="menu_hr_recruitment_recruitment"
-            action="hr_recruitment_source_action"
-            sequence="10" groups="base.group_no_one"/>
+    <menuitem
+        id="menu_hr_recruitment_source"
+        parent="menu_hr_recruitment_recruitment"
+        action="hr_recruitment_source_action"
+        groups="base.group_no_one"
+        sequence="10"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index c9aec1edd4b..d4d5269e1c5 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -2,6 +2,7 @@
 <openerp>
     <data noupdate="1">
 
+        <!-- Add a 'public' flag to the events and only show these ones to portal users -->
         <record id="portal_event_rule" model="ir.rule">
             <field name="name">Personal Events</field>
             <field ref="event.model_event_event" name="model_id"/>

From be24d83ce43ab2036a487f23051cd6d45007bc24 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 19:57:50 +0200
Subject: [PATCH 194/312] [IMP] put groups attribute refund/payment's form view
 in order to hide the payment information tab from portal users also,
 identation

bzr revid: abo@openerp.com-20120725175750-4tqhkheyue0yak0j
---
 .../voucher_payment_receipt_view.xml          | 69 +++++++++----------
 1 file changed, 32 insertions(+), 37 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 372d8aa1937..166c216b9a6 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -22,7 +22,7 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id"/>
                     </group>
-                   <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -54,7 +54,7 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id"/>
                     </group>
-                   <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -72,7 +72,7 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment" version="7.0">
                     <group col="6">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}" />
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}"/>
                         <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
@@ -94,8 +94,7 @@
                                 <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
-                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        />
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"/>
                                     <field name="account_id" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
@@ -108,8 +107,7 @@
                                 <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
-                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        />
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"/>
                                     <field name="account_id" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
@@ -156,11 +154,11 @@
                     <group>
                         <group>
                             <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
-			    <label for="amount" string="Amount"/>
-			    <div>
+                <label for="amount" string="Amount"/>
+                <div>
                                 <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline"/>
                                 <field name="currency_id" class="oe_inline"/>
-			    </div>
+                </div>
                             <field name="journal_id"
                                 domain="[('type','in',['bank', 'cash'])]"
                                 invisible="context.get('line_type', False)"
@@ -182,8 +180,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1"
-                                        />
+                                        required="1"/>
                                     <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
@@ -198,8 +195,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1"
-                                        />
+                                        required="1"/>
                                     <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
@@ -278,7 +274,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_vendor_pay"/>
             <field name="target">current</field>
-            <field name="help">Click on "Create" to register a supplier payment. 
+            <field name="help">Click on "Create" to register a supplier payment.
                     &lt;p&gt;
                     Track payments you do to your supplier and amounts you pay.</field>
         </record>
@@ -316,14 +312,13 @@
                     <group>
                         <group>
                             <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-			    <label for="amount"
-                                    string="Paid Amount"/>
-			    <div>
+                            <label for="amount" string="Paid Amount"/>
+                            <div>
                                 <field name="amount" class="oe_inline"
                                     invisible="context.get('line_type', False)"
                                     on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                                 <field name="currency_id" class="oe_inline"/>
-			    </div>
+                            </div>
 
                             <field name="journal_id"
                                 domain="[('type','in',['bank', 'cash'])]"
@@ -347,7 +342,7 @@
                     </group>
 
                     <notebook>
-                        <page string="Payment Information">
+                        <page string="Payment Information" groups="base.group_user">
                             <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -369,8 +364,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1"
-                                        />
+                                        required="1"/>
                                     <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
@@ -409,21 +403,21 @@
                                 <field name="audit"/>
                             </group>
                             <field name="move_ids" readonly="1">
-                               <tree string="Journal Items">
-                                   <field name="move_id"/>
-                                   <field name="ref"/>
-                                   <field name="date"/>
-                                   <field name="statement_id"/>
-                                   <field name="partner_id"/>
-                                   <field name="account_id"/>
-                                   <field name="name"/>
-                                   <field name="debit"/>
-                                   <field name="credit"/>
-                                   <field name="state"/>
-                                   <field name="reconcile_id"/>
-                                   <field name="amount_currency"/>
-                                   <field name="currency_id"/>
-                               </tree>
+                                <tree string="Journal Items">
+                                    <field name="move_id"/>
+                                    <field name="ref"/>
+                                    <field name="date"/>
+                                    <field name="statement_id"/>
+                                    <field name="partner_id"/>
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="debit"/>
+                                    <field name="credit"/>
+                                    <field name="state"/>
+                                    <field name="reconcile_id"/>
+                                    <field name="amount_currency"/>
+                                    <field name="currency_id"/>
+                                </tree>
                             </field>
                         </page>
                     </notebook>
@@ -464,5 +458,6 @@
 
         <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="12"
             id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
+
     </data>
 </openerp>

From d92994caa6fb411a81462d0eb335227a1e4be7cb Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 25 Jul 2012 20:16:10 +0200
Subject: [PATCH 195/312] [IMP] remove a bunch of wtf comments in XML
 (horrifying things like === comment === or --- comment ---, without any XML
 comment tags) improve identation in a few files remove some spaces preceding
 closing tags

bzr revid: abo@openerp.com-20120725181610-oq0ug3u9t7fgpy3h
---
 .../account_asset_invoice_view.xml            |  29 ++-
 addons/hr/hr_department_view.xml              |  12 +-
 addons/hr/hr_view.xml                         |  14 +-
 addons/hr_recruitment/hr_recruitment_view.xml |  37 ++--
 .../marketing_campaign_view.xml               |  60 ++----
 .../marketing_campaign_workflow.xml           |  29 ++-
 .../mrp_operations_workflow.xml               | 186 +++++++++---------
 .../product_visible_discount_view.xml         |   7 +-
 addons/project_issue/project_issue_view.xml   |  11 +-
 .../project_long_term_view.xml                |  44 ++---
 addons/stock/stock_view.xml                   |   4 +-
 addons/subscription/subscription_view.xml     |  15 +-
 12 files changed, 187 insertions(+), 261 deletions(-)

diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
index fe1435d4745..40ee51e10b8 100644
--- a/addons/account_asset/account_asset_invoice_view.xml
+++ b/addons/account_asset/account_asset_invoice_view.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
 
-    #---------------------------------------------------------
-    # Fiscal Year
-    #---------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_account_invoice_asset_form">
-        <field name="name">account.invoice.line.form</field>
-        <field name="model">account.invoice.line</field>
-        <field name="inherit_id" ref="account.view_invoice_line_form"/>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <field name="account_id" position="after">
-                <field name="asset_category_id"/>
+        <!-- Fiscal Year -->
+        <record model="ir.ui.view" id="view_account_invoice_asset_form">
+            <field name="name">account.invoice.line.form</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="account_id" position="after">
+                    <field name="asset_category_id"/>
+                </field>
             </field>
-        </field>
-    </record>
+        </record>
 
-</data>
+    </data>
 </openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index bbf66f0d4c3..6d9141238b1 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -2,11 +2,7 @@
 <openerp>
     <data>
 
-        <!--
-    ======================
-    department
-    ======================
-    -->
+        <!-- Department -->
         <record id="view_department_form" model="ir.ui.view">
             <field name="name">hr.department.form</field>
             <field name="model">hr.department</field>
@@ -37,7 +33,7 @@
                 </tree>
             </field>
         </record>
-         <record id="view_department_filter" model="ir.ui.view">
+        <record id="view_department_filter" model="ir.ui.view">
             <field name="name">Departments</field>
             <field name="model">hr.department</field>
             <field name="type">search</field>
@@ -48,7 +44,7 @@
                     <field name="manager_id" />
                 </search>
              </field>
-         </record>
+        </record>
 
         <record id="open_module_tree_department" model="ir.actions.act_window">
             <field name="name">Departments</field>
@@ -60,5 +56,5 @@
 
        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
 
-        </data>
+    </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 72b1ba603aa..1c145694a44 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -227,12 +227,7 @@
             <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
         </record>
 
-        <!--
-        =======================
-        Employee architecture
-        =======================
-        -->
-
+        <!-- Employee architecture -->
         <record id="view_partner_tree2" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
@@ -271,12 +266,7 @@
             <field eval="True" name="replace"/>
         </ir_set>
 
-        <!--
-        ============
-        Employee Category
-        ============
-        -->
-
+        <!-- Employee Category -->
        <record id="view_employee_category_form" model="ir.ui.view">
             <field name="name">hr.employee.category.form</field>
             <field name="model">hr.employee.category</field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8b1751859e8..fd68dc5136c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Recruitment"
-            id="menu_hr_recruitment_recruitment"
-            parent="hr.menu_hr_configuration"
-            sequence="40"/>
 
-        <act_window
-            id="act_hr_applicant_to_meeting"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="hr.applicant"
-            view_mode="tree,form,calendar,graph"
-            view_type="form"/>
+    <menuitem name="Recruitment"
+        id="menu_hr_recruitment_recruitment"
+        parent="hr.menu_hr_configuration"
+        sequence="40"/>
 
-    # ------------------------------------------------------
-    # Stage
-    # ------------------------------------------------------
+    <act_window
+        id="act_hr_applicant_to_meeting"
+        name="Meetings"
+        res_model="crm.meeting"
+        src_model="hr.applicant"
+        view_mode="tree,form,calendar,graph"
+        view_type="form"/>
+
+    <!-- Stage -->
     <record id="hr_job_stage_act" model="ir.actions.act_window">
         <field name="name">Recruitment / Applicants Stages</field>
         <field name="res_model">hr.recruitment.stage</field>
@@ -27,10 +26,7 @@
     </record>
 
 
-    # ------------------------------------------------------
-    # Jobs
-    # ------------------------------------------------------
-
+    <!-- Jobs -->
     <!-- Applicant Read/Unread actions -->
     <record id="actions_server_applicant_unread" model="ir.actions.server">
         <field name="name">Mark unread</field>
@@ -343,10 +339,7 @@
         </field>
     </record>
 
-    # ------------------------------------------------------
-    # HR Job
-    # ------------------------------------------------------
-
+    <!-- HR Job -->
     <record id="hr_job_survey" model="ir.ui.view">
         <field name="name">hr.job.form1</field>
         <field name="model">hr.job</field>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 6a06cb33f1d..66a62c5b12d 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -4,19 +4,14 @@
 
     <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
 
-    <!--
-    ======================
-    Marketing Campaign
-    ======================
-    -->
+    <!-- Marketing Campaign -->
     <act_window name="All Segments"
         res_model="marketing.campaign.segment"
         src_model="marketing.campaign"
         view_type="form"
         view_mode="tree,form"
         id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-    />
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
 
     <!-- Campaign Followups -->
     <act_window
@@ -24,7 +19,7 @@
         id="act_marketing_campaing_followup"
         name="Campaign Follow-up" res_model="marketing.campaign.workitem"
         src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form" />
+        view_type="form"/>
 
     <record model="ir.ui.view" id="view_marketing_campaign_form">
         <field name="name">marketing.campaign.form</field>
@@ -43,10 +38,10 @@
                 <div class="oe_right oe_button_box" name="button_box">
                         <button type="action"
                         name="%(act_marketing_campaing_followup)d"
-                        string="Follow-Up" />
+                        string="Follow-Up"/>
                         <button type="action"
                         name="%(act_marketing_campaing_segment_opened)d"
-                        string="Segments" />
+                        string="Segments"/>
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
@@ -61,10 +56,10 @@
                         <field name="object_id"/>
                         <field name="partner_field_id"/>
                         <field name="unique_field_id"/>
-                    </group>     
+                    </group>
                 </group>
                 <separator string="Activities"/>
-                <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
+                <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}"/>
             </sheet>
             </form>
         </field>
@@ -146,14 +141,9 @@
     </record>
 
     <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
-    <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30" />
-
-    <!--
-    ======================
-    Marketing Segments
-    ======================
-    -->
+    <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30"/>
 
+    <!-- Marketing Segments -->
     <record model="ir.ui.view" id="view_marketing_campaign_segment_form">
         <field name="name">marketing.campaign.segment.form</field>
         <field name="model">marketing.campaign.segment</field>
@@ -202,7 +192,7 @@
                 <field name="campaign_id"/>
                 <field name="date_run"/>
                 <field name="sync_last_date"/>
-                <field name="state" />
+                <field name="state"/>
             </tree>
         </field>
     </record>
@@ -248,16 +238,12 @@
         <field name="context">{'group_by': []}</field>
     </record>
 
-    <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" />
+    <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20"/>
 
     <!--
-    ======================
-    Marketing Activities
-    ======================
-
-    these views are not intended to be used outside the campaign context.
+        Marketing Activities
+        These views are not intended to be used outside the campaign context.
     -->
-
     <record model="ir.ui.view" id="view_marketing_campaign_activity_form">
         <field name="name">marketing.campaign.activity.form</field>
         <field name="model">marketing.campaign.activity</field>
@@ -285,7 +271,7 @@
                     <group>
                         <field name="type"/>
                         <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
-                           context="{'default_model_id':object_id}" />
+                           context="{'default_model_id':object_id}"/>
                         <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
                         <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
                         <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
@@ -344,12 +330,7 @@
     </record>
 
 
-    <!--
-    ======================
-    Marketing Workitems
-    ======================
-    -->
-
+    <!-- Marketing Workitems -->
     <record model="ir.ui.view" id="view_marketing_campaign_workitem_tree">
         <field name="name">marketing.campaign.workitem.tree</field>
         <field name="model">marketing.campaign.workitem</field>
@@ -358,10 +339,10 @@
             <tree colors="red:state == 'exception';black:state == 'todo';gray:state == 'cancelled'" string="Marketing Campaign Activities">
                 <field name="campaign_id"/>
                 <field name="segment_id"/>
-                <field name="activity_id" />
+                <field name="activity_id"/>
                 <field name="object_id" invisible="1"/>
                 <field name="res_id" invisible="1"/>
-                <field name="res_name" />
+                <field name="res_name"/>
                 <field name="partner_id"/>
                 <field name="date"/>
                 <field name="state"/>
@@ -464,8 +445,7 @@
         view_type="form"
         view_mode="tree,form"
         id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-    />
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
 
     <!-- Campaign Follow-ups -->
     <act_window
@@ -473,7 +453,7 @@
         id="act_marketing_campaing_followup"
         name="Campaign Follow-up" res_model="marketing.campaign.workitem"
         src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form" />
+        view_type="form"/>
 
     <!-- Campaign Statistics -->
     <act_window
@@ -481,7 +461,7 @@
         id="act_marketing_campaing_stat"
         name="Campaign Statistics" res_model="campaign.analysis"
         src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form" />
+        view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/marketing_campaign_workflow.xml b/addons/marketing_campaign/marketing_campaign_workflow.xml
index 4db60dbfa27..ad3fb0ddcca 100644
--- a/addons/marketing_campaign/marketing_campaign_workflow.xml
+++ b/addons/marketing_campaign/marketing_campaign_workflow.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-          
-    <!-- ==================Marketing Campaigns================== -->
-    
+
+        <!-- Marketing Campaigns -->
         <record id="wkf_marketing_campaign" model="workflow">
             <field name="name">marketing.campaign.basic</field>
             <field name="osv">marketing.campaign</field>
             <field name="on_create">True</field>
         </record>
 
-                        <!-- Activity -->
+        <!-- Activity -->
         <record id="act_marketing_campaign_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_marketing_campaign"/>
             <field name="flow_start">True</field>
@@ -32,7 +31,7 @@
             <field name="kind">function</field>
             <field name="action">state_done_set()</field>
         </record>
-        
+
         <record id="act_marketing_campaign_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_marketing_campaign"/>
             <field name="name">cancel</field>
@@ -41,19 +40,19 @@
             <field name="action">state_cancel_set()</field>
         </record>
 
-                            <!-- Transition -->
+        <!-- Transition -->
         <record id="trans_marketing_campaign_draft_running" model="workflow.transition">
             <field name="act_from" ref="act_marketing_campaign_draft"/>
             <field name="act_to" ref="act_marketing_campaign_running"/>
             <field name="signal">state_running_set</field>
         </record>
-        
+
         <record id="trans_campaign_running_done" model="workflow.transition">
             <field name="act_from" ref="act_marketing_campaign_running"/>
             <field name="act_to" ref="act_marketing_campaign_done"/>
             <field name="signal">state_done_set</field>
         </record>
-        
+
         <record id="trans_campaign_running_cancel" model="workflow.transition">
             <field name="act_from" ref="act_marketing_campaign_running"/>
             <field name="act_to" ref="act_marketing_campaign_cancel"/>
@@ -72,15 +71,14 @@
             <field name="signal">state_draft_set</field>
         </record>
 
-         <!-- ==================Marketing Campaign Segment================== -->
-    
+         <!-- Marketing Campaign Segment -->
         <record id="wkf_marketing_campaign_segment" model="workflow">
             <field name="name">marketing.campaign.segment.basic</field>
             <field name="osv">marketing.campaign.segment</field>
             <field name="on_create">True</field>
         </record>
 
-                        <!-- Activity -->
+        <!-- Activity -->
         <record id="act_marketing_campaign_segment_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
             <field name="flow_start">True</field>
@@ -102,7 +100,7 @@
             <field name="kind">function</field>
             <field name="action">state_done_set()</field>
         </record>
-        
+
         <record id="act_marketing_campaign_segment_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
             <field name="name">cancel</field>
@@ -111,19 +109,19 @@
             <field name="flow_stop" eval="False"/>
         </record>
 
-                            <!-- Transition -->
+        <!-- Transition -->
         <record id="trans_marketing_campaign_segment_draft_running" model="workflow.transition">
             <field name="act_from" ref="act_marketing_campaign_segment_draft"/>
             <field name="act_to" ref="act_marketing_campaign_segment_running"/>
             <field name="signal">state_running_set</field>
         </record>
-        
+
         <record id="trans_campaign_segment_running_done" model="workflow.transition">
             <field name="act_from" ref="act_marketing_campaign_segment_running"/>
             <field name="act_to" ref="act_marketing_campaign_segment_done"/>
             <field name="signal">state_done_set</field>
         </record>
-        
+
         <record id="trans_campaign_segment_running_cancel" model="workflow.transition">
             <field name="act_from" ref="act_marketing_campaign_segment_running"/>
             <field name="act_to" ref="act_marketing_campaign_segment_cancel"/>
@@ -141,5 +139,6 @@
             <field name="act_to" ref="act_marketing_campaign_segment_draft"/>
             <field name="signal">state_draft_set</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/mrp_operations/mrp_operations_workflow.xml b/addons/mrp_operations/mrp_operations_workflow.xml
index a728ee6f3a4..8d022558cf9 100644
--- a/addons/mrp_operations/mrp_operations_workflow.xml
+++ b/addons/mrp_operations/mrp_operations_workflow.xml
@@ -1,112 +1,106 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    # -----------------------------------------------------------
-    # Activities
-    # -----------------------------------------------------------
 
+    <!-- Activities -->
     <record model="workflow" id="wkf_prod_workcenter">
         <field name="name">mrp.production.workcenter.line.basic</field>
         <field name="osv">mrp.production.workcenter.line</field>
         <field name="on_create">True</field>
     </record>
 
-        <record model="workflow.activity" id="prod_act_wc_draft">
-            <field name="wkf_id" ref="wkf_prod_workcenter"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-            <field name="kind">function</field>
-            <field name="action">action_draft()</field>
-        </record>
-        <record model="workflow.activity" id="prod_act_wc_start">
-            <field name="wkf_id" ref="wkf_prod_workcenter"/>
-            <field name="name">startworking</field>
-            <field name="kind">function</field>
-            <field name="action">action_start_working()</field>
-        </record>
-        <record model="workflow.activity" id="prod_act_wc_cancel">
-            <field name="wkf_id" ref="wkf_prod_workcenter"/>
-            <field name="name">cancel</field>
-            <field name="kind">function</field>
-            <field name="action">action_cancel()</field>
-        </record>
-        <record model="workflow.activity" id="prod_act_wc_pause">
-            <field name="wkf_id" ref="wkf_prod_workcenter"/>
-            <field name="name">pause</field>
-            <field name="kind">function</field>
-            <field name="action">action_pause()</field>
-        </record>
-        <record model="workflow.activity" id="prod_act_wc_resume">
-            <field name="wkf_id" ref="wkf_prod_workcenter"/>
-            <field name="name">resume</field>
-            <field name="kind">function</field>
-            <field name="action">action_resume()</field>
-        </record>
-        <record model="workflow.activity" id="prod_act_wc_done">
-            <field name="wkf_id" ref="wkf_prod_workcenter"/>
-            <field name="name">done</field>
-            <field name="kind">function</field>
-            <field name="flow_stop">True</field>
-            <field name="action">action_done()</field>
-        </record>
+    <record model="workflow.activity" id="prod_act_wc_draft">
+        <field name="wkf_id" ref="wkf_prod_workcenter"/>
+        <field name="flow_start">True</field>
+        <field name="name">draft</field>
+        <field name="kind">function</field>
+        <field name="action">action_draft()</field>
+    </record>
+    <record model="workflow.activity" id="prod_act_wc_start">
+        <field name="wkf_id" ref="wkf_prod_workcenter"/>
+        <field name="name">startworking</field>
+        <field name="kind">function</field>
+        <field name="action">action_start_working()</field>
+    </record>
+    <record model="workflow.activity" id="prod_act_wc_cancel">
+        <field name="wkf_id" ref="wkf_prod_workcenter"/>
+        <field name="name">cancel</field>
+        <field name="kind">function</field>
+        <field name="action">action_cancel()</field>
+    </record>
+    <record model="workflow.activity" id="prod_act_wc_pause">
+        <field name="wkf_id" ref="wkf_prod_workcenter"/>
+        <field name="name">pause</field>
+        <field name="kind">function</field>
+        <field name="action">action_pause()</field>
+    </record>
+    <record model="workflow.activity" id="prod_act_wc_resume">
+        <field name="wkf_id" ref="wkf_prod_workcenter"/>
+        <field name="name">resume</field>
+        <field name="kind">function</field>
+        <field name="action">action_resume()</field>
+    </record>
+    <record model="workflow.activity" id="prod_act_wc_done">
+        <field name="wkf_id" ref="wkf_prod_workcenter"/>
+        <field name="name">done</field>
+        <field name="kind">function</field>
+        <field name="flow_stop">True</field>
+        <field name="action">action_done()</field>
+    </record>
 
-    # -----------------------------------------------------------
-    # Transition
-    # -----------------------------------------------------------
+    <!-- Transition -->
+    <record model="workflow.transition" id="prod_trans_wc_draft_start">
+        <field name="act_from" ref="prod_act_wc_draft"/>
+        <field name="act_to" ref="prod_act_wc_start"/>
+        <field name="signal">button_start_working</field>
+    </record>
+    <record model="workflow.transition" id="prod_trans_wc_start_done">
+        <field name="act_from" ref="prod_act_wc_start"/>
+        <field name="act_to" ref="prod_act_wc_done"/>
+        <field name="signal">button_done</field>
+    </record>
+    <record model="workflow.transition" id="prod_trans_wc_draft_cancel">
+        <field name="act_from" ref="prod_act_wc_draft"/>
+        <field name="act_to" ref="prod_act_wc_cancel"/>
+        <field name="signal">button_cancel</field>
+    </record>
+    <record model="workflow.transition" id="prod_trans_wc_cancel_draft">
+        <field name="act_from" ref="prod_act_wc_cancel"/>
+        <field name="act_to" ref="prod_act_wc_draft"/>
+        <field name="signal">button_draft</field>
+    </record>
+    <record model="workflow.transition" id="prod_trans_wc_start_cancel">
+        <field name="act_from" ref="prod_act_wc_start"/>
+        <field name="act_to" ref="prod_act_wc_cancel"/>
+        <field name="signal">button_cancel</field>
+    </record>
+    <record model="workflow.transition" id="prod_trans_wc_start_pause">
+        <field name="act_from" ref="prod_act_wc_start"/>
+        <field name="act_to" ref="prod_act_wc_pause"/>
+        <field name="signal">button_pause</field>
+    </record>
 
-        <record model="workflow.transition" id="prod_trans_wc_draft_start">
-            <field name="act_from" ref="prod_act_wc_draft"/>
-            <field name="act_to" ref="prod_act_wc_start"/>
-            <field name="signal">button_start_working</field>
-        </record>
-        <record model="workflow.transition" id="prod_trans_wc_start_done">
-            <field name="act_from" ref="prod_act_wc_start"/>
-            <field name="act_to" ref="prod_act_wc_done"/>
-            <field name="signal">button_done</field>
-        </record>
-        <record model="workflow.transition" id="prod_trans_wc_draft_cancel">
-            <field name="act_from" ref="prod_act_wc_draft"/>
-            <field name="act_to" ref="prod_act_wc_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record model="workflow.transition" id="prod_trans_wc_cancel_draft">
-            <field name="act_from" ref="prod_act_wc_cancel"/>
-            <field name="act_to" ref="prod_act_wc_draft"/>
-            <field name="signal">button_draft</field>
-        </record>
-        <record model="workflow.transition" id="prod_trans_wc_start_cancel">
-            <field name="act_from" ref="prod_act_wc_start"/>
-            <field name="act_to" ref="prod_act_wc_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record model="workflow.transition" id="prod_trans_wc_start_pause">
-            <field name="act_from" ref="prod_act_wc_start"/>
-            <field name="act_to" ref="prod_act_wc_pause"/>
-            <field name="signal">button_pause</field>
-        </record>
-
-        <record model="workflow.transition" id="prod_trans_wc_pause_resume">
-            <field name="act_from" ref="prod_act_wc_pause"/>
-            <field name="act_to" ref="prod_act_wc_resume"/>
-            <field name="signal">button_resume</field>
-        </record>
-
-        <record model="workflow.transition" id="prod_trans_wc_resume_pause">
-            <field name="act_from" ref="prod_act_wc_resume"/>
-            <field name="act_to" ref="prod_act_wc_pause"/>
-            <field name="signal">button_pause</field>
-        </record>
-        <record model="workflow.transition" id="prod_trans_wc_resume_cancel">
-            <field name="act_from" ref="prod_act_wc_resume"/>
-            <field name="act_to" ref="prod_act_wc_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record model="workflow.transition" id="prod_trans_wc_resume_done">
-            <field name="act_from" ref="prod_act_wc_resume"/>
-            <field name="act_to" ref="prod_act_wc_done"/>
-            <field name="signal">button_done</field>
-        </record>
+    <record model="workflow.transition" id="prod_trans_wc_pause_resume">
+        <field name="act_from" ref="prod_act_wc_pause"/>
+        <field name="act_to" ref="prod_act_wc_resume"/>
+        <field name="signal">button_resume</field>
+    </record>
 
+    <record model="workflow.transition" id="prod_trans_wc_resume_pause">
+        <field name="act_from" ref="prod_act_wc_resume"/>
+        <field name="act_to" ref="prod_act_wc_pause"/>
+        <field name="signal">button_pause</field>
+    </record>
+    <record model="workflow.transition" id="prod_trans_wc_resume_cancel">
+        <field name="act_from" ref="prod_act_wc_resume"/>
+        <field name="act_to" ref="prod_act_wc_cancel"/>
+        <field name="signal">button_cancel</field>
+    </record>
+    <record model="workflow.transition" id="prod_trans_wc_resume_done">
+        <field name="act_from" ref="prod_act_wc_resume"/>
+        <field name="act_to" ref="prod_act_wc_done"/>
+        <field name="signal">button_done</field>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/product_visible_discount/product_visible_discount_view.xml b/addons/product_visible_discount/product_visible_discount_view.xml
index 6607fe3e9b4..2bb9e7b9b12 100644
--- a/addons/product_visible_discount/product_visible_discount_view.xml
+++ b/addons/product_visible_discount/product_visible_discount_view.xml
@@ -2,9 +2,7 @@
 <openerp>
     <data>
 
-        #---------------------------------------------------------
-        # product price list
-        #---------------------------------------------------------
+        <!-- Product price list -->
         <record model="ir.ui.view" id="product_pricelist_view_tree">
             <field name="name">product.pricelist.tree</field>
             <field name="model">product.pricelist</field>
@@ -26,5 +24,6 @@
                 </field>
             </field>
         </record>
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4804456c555..4cd5bb9ba6a 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -337,10 +337,7 @@
         </record>
 
 
-        # ------------------------------------------------------
-        # Feature Requests
-        # ------------------------------------------------------
-
+        <!-- Feature Requests -->
         <record model="ir.ui.view" id="project_feature_tree_view">
             <field name="name">Project Issue- Feature Tracker Tree</field>
             <field name="model">project.issue</field>
@@ -390,10 +387,7 @@
             view_mode="kanban,tree,form,calendar,graph"
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
 
-        # ------------------------------------------------------
-        # Project
-        # ------------------------------------------------------
-
+        <!-- Project -->
         <record id="view_project_form_inherited" model="ir.ui.view">
             <field name="name">project.project.form.inherited</field>
             <field name="model">project.project</field>
@@ -446,5 +440,6 @@
                 </xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7d7310465d6..099b09b9418 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,12 +2,9 @@
 <openerp>
     <data>
 
-    <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
-
-    # ------------------------------------------------------
-    # Project User Allocation
-    # ------------------------------------------------------
+        <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
 
+        <!-- Project User Allocation -->
         <record id="view_project_user_allocation_gantt" model="ir.ui.view">
             <field name="name">project.user.allocation.gantt</field>
             <field name="model">project.user.allocation</field>
@@ -94,9 +91,7 @@
         </record>
 
 
-    # ------------------------------------------------------
-    # Project Phase
-    # ------------------------------------------------------
+        <!-- Project Phase -->
         <act_window id="act_project_phases"
             name="Phases"
             src_model="project.project"
@@ -182,7 +177,7 @@
                                   <form string="Project Users" version="7.0">
                                       <group col="4">
                                           <field name="user_id"/>
-                                          <field name="date_start" />
+                                          <field name="date_start"/>
                                           <field name="date_end"/>
                                       </group>
                                   </form>
@@ -195,7 +190,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="date_start"/>
-                                    <field name="date_end" />
+                                    <field name="date_end"/>
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
@@ -285,7 +280,7 @@
                         <separator orientation="vertical"/>
                         <field name="project_id"/>
                     </group>
-                    <newline/> 
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
@@ -317,10 +312,7 @@
         </record>
 
 
-    # ------------------------------------------------------
-    # Project Task
-    # ------------------------------------------------------
-
+        <!-- Project Task -->
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
@@ -368,16 +360,15 @@
             </field>
         </record>
 
-    <act_window
-        context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
-        id="project_phase_task_list"
-        name="Related Tasks"
-        res_model="project.task"
-        src_model="project.phase"
-        view_mode="tree,form"
-        />
+        <act_window
+            context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
+            id="project_phase_task_list"
+            name="Related Tasks"
+            res_model="project.task"
+            src_model="project.phase"
+            view_mode="tree,form"/>
 
-    <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+        <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
@@ -393,10 +384,7 @@
             </field>
         </record>
 
-    # ------------------------------------------------------
-    # Menu Items
-    # ------------------------------------------------------
-
+        <!-- Menu Items -->
         <menuitem action="act_project_phase_list"
             id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b741101a807..faa811e564c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1486,9 +1486,7 @@
             <field name="act_window_id" ref="action_reception_picking_move"/>
         </record>
 
-        # -------------------------------------------------------------
-        # Stock incoterms
-        # -------------------------------------------------------------
+        <!-- Stock incoterms -->
         <record id="view_incoterms_tree" model="ir.ui.view">
             <field name="name">stock.incoterms.tree</field>
             <field name="model">stock.incoterms</field>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 3271096a51a..3de9e9b9651 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -3,11 +3,7 @@
     <data>
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
-        <!--
-        =======================================================
-        Subscription Views
-        =======================================================
-        -->
+        <!-- Subscription Views -->
         <record id="view_subscription_form" model="ir.ui.view">
             <field name="name">subscription.subscription.form</field>
             <field name="model">subscription.subscription</field>
@@ -17,7 +13,7 @@
                 <header>
                     <button name="set_process" states="draft" string="Process" type="object" class="oe_highlight"/>
                     <button name="set_done" states="running" string="Stop" type="object" class="oe_highlight"/>
-                    <button name="set_draft" states="done" string="Set to Draft" type="object" />
+                    <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </header>
                 <sheet>
@@ -103,7 +99,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_subscription_tree"/>
             <field name="context">{'search_default_User':1}</field>
-            <field name="search_view_id" ref="view_subscription_filter" />
+            <field name="search_view_id" ref="view_subscription_filter"/>
         </record>
         <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
 
@@ -208,11 +204,12 @@
             <field name="res_model">subscription.document</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="document_tree"/>
-            <field name="search_view_id" ref="view_subscription_document_filter" />
+            <field name="search_view_id" ref="view_subscription_document_filter"/>
         </record>
         <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager" />
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
         <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
         <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
+
     </data>
 </openerp>

From d304f9fbb7765be660ac54d47c5ed2cba6719880 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 09:53:59 +0200
Subject: [PATCH 196/312] [CHG] rename this. to this.

because why make things simple when you can make them fucked up

bzr revid: xmo@openerp.com-20120726075359-b0uvuuagrfsf7nhb
---
 addons/web/static/src/js/corelib.js | 36 +++++++++++++--------------
 addons/web/static/test/Widget.js    | 38 ++++++++++++++---------------
 doc/widget.rst                      |  4 +--
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 42e549b5ca1..b80543a34d8 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -523,8 +523,8 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
         _.each(this.getChildren(), function(el) {
             el.destroy();
         });
-        if(this.$el) {
-            this.$el.remove();
+        if(this.$element) {
+            this.$element.remove();
         }
         instance.web.PropertiesMixin.destroy.call(this);
     },
@@ -536,7 +536,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     appendTo: function(target) {
         var self = this;
         return this.__widgetRenderAndInsert(function(t) {
-            self.$el.appendTo(t);
+            self.$element.appendTo(t);
         }, target);
     },
     /**
@@ -547,7 +547,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     prependTo: function(target) {
         var self = this;
         return this.__widgetRenderAndInsert(function(t) {
-            self.$el.prependTo(t);
+            self.$element.prependTo(t);
         }, target);
     },
     /**
@@ -558,7 +558,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     insertAfter: function(target) {
         var self = this;
         return this.__widgetRenderAndInsert(function(t) {
-            self.$el.insertAfter(t);
+            self.$element.insertAfter(t);
         }, target);
     },
     /**
@@ -569,7 +569,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     insertBefore: function(target) {
         var self = this;
         return this.__widgetRenderAndInsert(function(t) {
-            self.$el.insertBefore(t);
+            self.$element.insertBefore(t);
         }, target);
     },
     /**
@@ -579,7 +579,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
      */
     replace: function(target) {
         return this.__widgetRenderAndInsert(_.bind(function(t) {
-            this.$el.replaceAll(t);
+            this.$element.replaceAll(t);
         }, this), target);
     },
     __widgetRenderAndInsert: function(insertion, target) {
@@ -717,10 +717,10 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      * @returns {*} this
      */
     replaceElement: function ($el) {
-        var $oldel = this.$el;
+        var $oldel = this.$element;
         this.setElement($el);
-        if ($oldel && !$oldel.is(this.$el)) {
-            $oldel.replaceWith(this.$el);
+        if ($oldel && !$oldel.is(this.$element)) {
+            $oldel.replaceWith(this.$element);
         }
         return this;
     },
@@ -737,12 +737,12 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      * @return {*} this
      */
     setElement: function (element) {
-        if (this.$el) {
+        if (this.$element) {
             this.undelegateEvents();
         }
 
-        this.$element = this.$el = (element instanceof $) ? element : $(element);
-        this.el = this.$el[0];
+        this.$element = (element instanceof $) ? element : $(element);
+        this.el = this.$element[0];
 
         this.delegateEvents();
 
@@ -781,23 +781,23 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
 
             event += '.widget_events';
             if (!selector) {
-                this.$el.on(event, method);
+                this.$element.on(event, method);
             } else {
-                this.$el.on(event, selector, method);
+                this.$element.on(event, selector, method);
             }
         }
     },
     undelegateEvents: function () {
-        this.$el.off('.widget_events');
+        this.$element.off('.widget_events');
     },
     /**
-     * Shortcut for ``this.$el.find(selector)``
+     * Shortcut for ``this.$element.find(selector)``
      *
      * @param {String} selector CSS selector, rooted in $el
      * @returns {jQuery} selector match
      */
     $: function(selector) {
-        return this.$el.find(selector);
+        return this.$element.find(selector);
     },
     /**
      * Informs the action manager to do an action. This supposes that
diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index 99bae019ae4..55d9e7e7ad1 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -86,15 +86,15 @@ $(document).ready(function () {
     test('no template, default', function () {
         var w = new (instance.web.Widget.extend({ }));
 
-        ok(!w.$el, "should not initially have a root element");
+        ok(!w.$element, "should not initially have a root element");
         w.renderElement();
-        ok(w.$el, "should have generated a root element");
-        strictEqual(w.$element, w.$el, "should provide $element alias");
-        ok(w.$el.is(w.el), "should provide raw DOM alias");
+        ok(w.$element, "should have generated a root element");
+        strictEqual(w.$element, w.$element, "should provide $element alias");
+        ok(w.$element.is(w.el), "should provide raw DOM alias");
 
         equal(w.el.nodeName, 'DIV', "should have generated the default element");
         equal(w.el.attributes.length, 0, "should not have generated any attribute");
-        ok(_.isEmpty(w.$el.html(), "should not have generated any content"));
+        ok(_.isEmpty(w.$element.html(), "should not have generated any content"));
     });
     test('no template, custom tag', function () {
         var w = new (instance.web.Widget.extend({
@@ -111,7 +111,7 @@ $(document).ready(function () {
         w.renderElement();
 
         equal(w.el.attributes.length, 1, "should have one attribute");
-        equal(w.$el.attr('id'), 'foo', "should have generated the id attribute");
+        equal(w.$element.attr('id'), 'foo', "should have generated the id attribute");
         equal(w.el.id, 'foo', "should also be available via property");
     });
     test('no template, @className', function () {
@@ -121,7 +121,7 @@ $(document).ready(function () {
         w.renderElement();
 
         equal(w.el.className, 'oe_some_class', "should have the right property");
-        equal(w.$el.attr('class'), 'oe_some_class', "should have the right attribute");
+        equal(w.$element.attr('class'), 'oe_some_class', "should have the right attribute");
     });
     test('no template, bunch of attributes', function () {
         var w = new (instance.web.Widget.extend({
@@ -138,16 +138,16 @@ $(document).ready(function () {
         equal(w.el.attributes.length, 5, "should have all the specified attributes");
 
         equal(w.el.id, 'some_id');
-        equal(w.$el.attr('id'), 'some_id');
+        equal(w.$element.attr('id'), 'some_id');
 
         equal(w.el.className, 'some_class');
-        equal(w.$el.attr('class'), 'some_class');
+        equal(w.$element.attr('class'), 'some_class');
 
-        equal(w.$el.attr('data-foo'), 'data attribute');
-        equal(w.$el.data('foo'), 'data attribute');
+        equal(w.$element.attr('data-foo'), 'data attribute');
+        equal(w.$element.data('foo'), 'data attribute');
 
-        equal(w.$el.attr('clark'), 'gable');
-        equal(w.$el.attr('spoiler'), 'snape kills dumbledore');
+        equal(w.$element.attr('clark'), 'gable');
+        equal(w.$element.attr('spoiler'), 'snape kills dumbledore');
     });
 
     test('template', function () {
@@ -157,7 +157,7 @@ $(document).ready(function () {
         w.renderElement();
 
         equal(w.el.nodeName, 'OL');
-        equal(w.$el.children().length, 5);
+        equal(w.$element.children().length, 5);
         equal(w.el.textContent, '01234');
     });
 
@@ -168,7 +168,7 @@ $(document).ready(function () {
         }));
         w.renderElement();
 
-        ok(w.$('li:eq(3)').is(w.$el.find('li:eq(3)')),
+        ok(w.$('li:eq(3)').is(w.$element.find('li:eq(3)')),
            "should do the same thing as calling find on the widget root");
     });
 
@@ -189,7 +189,7 @@ $(document).ready(function () {
         }));
         w.renderElement();
 
-        w.$el.click();
+        w.$element.click();
         w.$('li:eq(3)').click();
         w.$('input:last').val('foo').change();
 
@@ -204,7 +204,7 @@ $(document).ready(function () {
             events: { 'click li': function () { clicked = true; } }
         }));
         w.renderElement();
-        w.$el.on('click', 'li', function () { newclicked = true });
+        w.$element.on('click', 'li', function () { newclicked = true });
 
         w.$('li').click();
         ok(clicked, "should trigger bound events");
@@ -227,11 +227,11 @@ $(document).ready(function () {
             .always(start)
             .done(function () {
                 equal($fix.find('p').text(), '42', "DOM fixture should contain initial value");
-                equal(w.$el.text(), '42', "should set initial value");
+                equal(w.$element.text(), '42', "should set initial value");
                 w.value = 36;
                 w.renderElement();
                 equal($fix.find('p').text(), '36', "DOM fixture should use new value");
-                equal(w.$el.text(), '36', "should set new value");
+                equal(w.$element.text(), '36', "should set new value");
             });
     });
 });
diff --git a/doc/widget.rst b/doc/widget.rst
index b29260c5882..02332382ce9 100644
--- a/doc/widget.rst
+++ b/doc/widget.rst
@@ -39,14 +39,14 @@ DOM Root
 A :js:class:`~openerp.web.Widget` is responsible for a section of the
 page materialized by the DOM root of the widget. The DOM root is
 available via the :js:attr:`~openerp.web.Widget.el` and
-:js:attr:`~openerp.web.Widget.$el` attributes, which are respectively
+:js:attr:`~openerp.web.Widget.$element` attributes, which are respectively
 the raw DOM Element and the jQuery wrapper around the DOM element.
 
 .. note::
 
     both attributes are compatible with Backbone's equivalent, there
     is also the :js:attr:`~openerp.web.Widget.$element` attribute
-    which aliases to :js:attr:`~openerp.web.Widget.$el` and remains
+    which aliases to :js:attr:`~openerp.web.Widget.$element` and remains
     for backwards compatiblity reasons.
 
 There are two main ways to define and generate this DOM root:

From 239131a71667408dafbae418bd6a95d3d1f26858 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 10:12:34 +0200
Subject: [PATCH 197/312] [FIX] login widget initialization sequence: don't go
 mucking around with the login's  before it's even been started

bzr revid: xmo@openerp.com-20120726081234-2lrq3ksrauxc4m3z
---
 addons/web/static/src/js/chrome.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 6b3f5eecdb8..c2ab78d0caf 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -57,9 +57,7 @@ instance.web.Dialog = instance.web.Widget.extend({
     init: function (parent, options, content) {
         var self = this;
         this._super(parent);
-        if (content) {
-            this.setElement(content);
-        }
+        this.setElement(content || this.make(this.tagName));
         this.dialog_options = {
             modal: true,
             destroy_on_close: true,
@@ -587,6 +585,12 @@ instance.web.Login =  instance.web.Widget.extend({
             self.$(".oe_login_pane").fadeIn("fast");
             self.$element.addClass("oe_login_invalid");
         });
+    },
+    show: function () {
+        this.$element.show();
+    },
+    hide: function () {
+        this.$element.hide();
     }
 });
 
@@ -877,11 +881,11 @@ instance.web.Client = instance.web.Widget.extend({
     },
     start: function() {
         var self = this;
-        return instance.connection.session_bind(this.origin).then(function() {
+        return instance.connection.session_bind(this.origin).pipe(function() {
             var $e = $(QWeb.render(self._template, {}));
             self.replaceElement($e);
             self.bind_events();
-            self.show_common();
+            return self.show_common();
         });
     },
     bind_events: function() {
@@ -966,16 +970,19 @@ instance.web.WebClient = instance.web.Client.extend({
         // TODO: deprecate and use login client action
         self.login = new instance.web.Login(self);
         self.login.on("login",self,self.show_application);
+        return self.login.appendTo(self.$element).then(function () {
+            self.login.hide();
+        });
     },
     show_login: function() {
         var self = this;
         self.$('.oe_topbar').hide();
-        self.login.appendTo(self.$element);
+        self.login.show();
     },
     show_application: function() {
         var self = this;
         self.$('.oe_topbar').show();
-        self.login.$element.hide();
+        self.login.hide();
         self.menu = new instance.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on('menu_click', this, this.on_menu_action);

From 0d84cf675524e650cc4f63bca8973bd8ed6e908a Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 26 Jul 2012 14:31:25 +0530
Subject: [PATCH 198/312] [IMP]sale : made send buttons red at draft state

bzr revid: cha@tinyerp.com-20120726090125-50nwqvimqgb82lej
---
 addons/sale/sale_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ac665df7a6b..a73f7744e53 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -156,9 +156,11 @@
                             <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                             <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                             <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent"/>
-                            <button name="print_quotation" string="Send by Post" type="object" states="draft,sent"/>
-                            <button name="action_button_confirm" states="draft" string="Confirm" type="object" class="oe_highlight"/>
+                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
+                            <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
+                            <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
+                            <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
+                            <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="Open Invoice" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>

From dd7e7d2c56512989b17533c3eaa12cb4b754a714 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 11:51:04 +0200
Subject: [PATCH 199/312] Removed mode in favor of actual_mode

bzr revid: nicolas.vanhoren@openerp.com-20120726095104-txzid0fb9tn3t1ne
---
 addons/web/static/src/js/view_form.js | 41 +++++++++++++++------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6d55ad40378..52c12407688 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -91,12 +91,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.__blur_timeout = null;
         this.rendering_engine = new instance.web.form.FormRenderingEngine(this);
         this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
-        this.on("change:mode", this, this._check_mode);
-        this.set({mode: "view"});
+        this.set({actual_mode: "view"});
         this.has_been_loaded.then(function() {
             self.check_actual_mode();
             self.on("change:actual_mode", self, self.check_actual_mode);
-            self.set({mode: self.options.initial_mode});
+            self.set({actual_mode: self.options.initial_mode});
         });
     },
     destroy: function() {
@@ -107,15 +106,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.$element.off('.formBlur');
         this._super();
     },
-    /**
-     * Reactualize actual_mode.
-     */
-    _check_mode: function() {
-        var mode = this.get("mode");
-        if (! this.datarecord.id)
-            mode = "create";
-        this.set({actual_mode: mode});
-    },
     on_loaded: function(data) {
         var self = this;
         if (!data) {
@@ -298,7 +288,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         return shown.pipe(function() {
             if (options.editable) {
-                self.set({mode: "edit"});
+                self.to_edit_mode();
             }
             self.$element.css('visibility', 'visible');
         });
@@ -600,6 +590,21 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             return $.Deferred().reject();
         }
     },
+    to_view_mode: function() {
+        this._check_mode("view");
+    },
+    to_edit_mode: function() {
+        this._check_mode("edit");
+    },
+    /**
+     * Reactualize actual_mode.
+     */
+    _check_mode: function(switch_to) {
+        var mode = switch_to || this.get("actual_mode");
+        if (! this.datarecord.id)
+            mode = "create";
+        this.set({actual_mode: mode});
+    },
     check_actual_mode: function(source, options) {
         var self = this;
         if(this.get("actual_mode") === "view") {
@@ -633,19 +638,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     on_button_save: function() {
         var self = this;
         return this.do_save().then(function(result) {
-            self.set({mode: "view"});
+            self.to_view_mode();
         });
     },
     on_button_cancel: function(event) {
         if (this.can_be_discarded()) {
-            this.set({mode: "view"});
+            this.to_view_mode();
             this.on_record_loaded(this.datarecord);
         }
         return false;
     },
     on_button_new: function() {
         var self = this;
-        this.set({mode: "edit"});
+        this.to_edit_mode();
         return $.when(this.has_been_loaded).pipe(function() {
             if (self.can_be_discarded()) {
                 return self.load_defaults();
@@ -653,7 +658,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         });
     },
     on_button_edit: function() {
-        return this.set({mode: "edit"});
+        return this.to_edit_mode();
     },
     on_button_create: function() {
         this.dataset.index = null;
@@ -666,7 +671,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             self.dataset.call('copy', [self.datarecord.id, {}, self.dataset.context]).then(function(new_id) {
                 return self.on_created({ result : new_id });
             }).then(function() {
-                return self.set({mode: "edit"});
+                return self.to_edit_mode();
             }).then(function() {
                 def.resolve();
             });

From 5d80e9a3e7dbc88ebb4c36557dee666083295524 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 11:52:31 +0200
Subject: [PATCH 200/312] Small optimization

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 52c12407688..5f65affce90 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -91,11 +91,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.__blur_timeout = null;
         this.rendering_engine = new instance.web.form.FormRenderingEngine(this);
         this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
-        this.set({actual_mode: "view"});
+        self.set({actual_mode: self.options.initial_mode});
         this.has_been_loaded.then(function() {
-            self.check_actual_mode();
             self.on("change:actual_mode", self, self.check_actual_mode);
-            self.set({actual_mode: self.options.initial_mode});
+            self.check_actual_mode();
         });
     },
     destroy: function() {

From f6e615cedc37bf91ee609aa9bd9120a6bd46e017 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 11:56:53 +0200
Subject: [PATCH 201/312] Changed my mind about method naming

bzr revid: nicolas.vanhoren@openerp.com-20120726095653-bi90exba20x8gu4n
---
 addons/web/static/src/js/view_form.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5f65affce90..2968fe368dc 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -312,7 +312,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             return $.Deferred().reject();
         }
         this.datarecord = record;
-        this._check_mode();
+        this._actualize_mode();
         this.set({ 'title' : record.id ? record.name : "New record" });
 
         if (this.qweb) {
@@ -590,15 +590,15 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
     },
     to_view_mode: function() {
-        this._check_mode("view");
+        this._actualize_mode("view");
     },
     to_edit_mode: function() {
-        this._check_mode("edit");
+        this._actualize_mode("edit");
     },
     /**
      * Reactualize actual_mode.
      */
-    _check_mode: function(switch_to) {
+    _actualize_mode: function(switch_to) {
         var mode = switch_to || this.get("actual_mode");
         if (! this.datarecord.id)
             mode = "create";

From 712897852dd01e0e93d5dc33ee13d554ee92e51c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 12:27:19 +0200
Subject: [PATCH 202/312] [IMP] corrected some code documentation

bzr revid: nicolas.vanhoren@openerp.com-20120726102719-ct3c5tx06izemg21
---
 addons/web/static/src/js/view_form.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 39dc321f97d..4426c93c619 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -35,11 +35,8 @@ instance.web.form.FieldManagerMixin = {
 instance.web.views.add('form', 'instance.web.FormView');
 /**
  * Properties:
- *      - mode: always "view" or "edit". Used to switch the view between page (view) and
- *      form (edit) mode. Depending what is indicated in the dataset, the view can still
- *      switch to create mode if needed.
  *      - actual_mode: always "view", "edit" or "create". Read-only property. Determines
- *      the real mode used by the view.
+ *      the mode used by the view.
  */
 instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerMixin, {
     /**
@@ -598,9 +595,17 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             return $.Deferred().reject();
         }
     },
+    /**
+     * Ask the view to switch to view mode if possible. The view may not do it
+     * if the current record is not yet saved. It will then stay in create mode.
+     */
     to_view_mode: function() {
         this._actualize_mode("view");
     },
+    /**
+     * Ask the view to switch to edit mode if possible. The view may not do it
+     * if the current record is not yet saved. It will then stay in create mode.
+     */
     to_edit_mode: function() {
         this._actualize_mode("edit");
     },

From a2154e35b61a5ab3845226697a27e29e54cbd8e8 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 26 Jul 2012 12:59:30 +0200
Subject: [PATCH 203/312] [FIX] stock,delivery: rename 'Create Invoice' to
 'Create Invoice/Refund'

bzr revid: stw@openerp.com-20120726105930-ls0u5zfpfh9u64vr
---
 addons/delivery/delivery_view.xml | 2 +-
 addons/stock/stock_view.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 457b2d38c90..77c456a3930 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -299,7 +299,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/header/button[@string='Create Invoice']" position="after">
+                <xpath expr="/form/header/button[@string='Create Invoice/Refund']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d4acd4906ad..6fe610012c1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -738,7 +738,7 @@
                     <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
                     <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>

From b09a121bd0941ff2789036295b5c3f420fff0e30 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 13:31:05 +0200
Subject: [PATCH 204/312] [IMP] clear out internal autocomplete cache of
 searchview on blur

ensures consecutive searches of the same element will behave correctly
(trigger a new autocompletion instead of nooping the second time
around because the new value is the same as the old/stored one)

bzr revid: xmo@openerp.com-20120726113105-d73fere31qdy8wda
---
 addons/web/static/src/js/search.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 8ffd672c143..2cd88811b72 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -516,6 +516,14 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         this.$element.addClass('oe_focused');
     },
     childBlurred: function () {
+        var val = this.$element.val();
+        this.$element.val('');
+        var complete = this.$element.data('autocomplete');
+        if ((val && complete.term === undefined) || complete.previous !== undefined) {
+            throw new Error("new jquery.ui version altering implementation" +
+                            " details relied on");
+        }
+        delete complete.term;
         this.$element.removeClass('oe_focused');
     },
     /**

From 7183f749b1498670b327599205c23d8cc379ee9f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 13:33:11 +0200
Subject: [PATCH 205/312] [FIX] trigger DOM blur event on searchview root to
 allow autocomplete to close-on-blur

bzr revid: xmo@openerp.com-20120726113311-axgwfq4d71rc1u50
---
 addons/web/static/src/js/search.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2cd88811b72..c3e7ad72dcb 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -524,7 +524,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                             " details relied on");
         }
         delete complete.term;
-        this.$element.removeClass('oe_focused');
+        this.$element.removeClass('oe_focused')
+                     .trigger('blur');
     },
     /**
      *

From 6c1bc3975e2c98d5d38ec8b41c2bc56b55fc807b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 26 Jul 2012 13:35:30 +0200
Subject: [PATCH 206/312] [FIX] hr_timesheet_invoice: when reinvoicing costs,
 force the product should set the product on analytic lines without any + code
 refactoring and better warning message

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

bzr revid: qdp-launchpad@openerp.com-20120726113530-rx713dc6sxy1cu2b
---
 .../wizard/hr_timesheet_invoice_create.py     | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index ea4d286c89f..e4df1f4801e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -90,32 +90,28 @@ class account_analytic_line(osv.osv):
 
             context2 = context.copy()
             context2['lang'] = partner.lang
-            cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id " \
+            cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id, name " \
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
                         "AND id IN %s AND to_invoice IS NOT NULL " \
                     "GROUP BY product_id,to_invoice,product_uom_id", (account.id, tuple(ids),))
 
-            for product_id, factor_id, qty, uom in cr.fetchall():
-                product = product_obj.browse(cr, uid, product_id, context2)
+            for product_id, factor_id, qty, uom, line_name in cr.fetchall():
+                if data.get('product'):
+                     product_id = data['product'][0]
+                product = product_obj.browse(cr, uid, product_id, context=context2)
                 if not product:
-                    raise osv.except_osv(_('Error'), _('At least one line has no product !'))
-                factor_name = ''
-                factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
-                if not data.get('product', False):
-                    if factor.customer_name:
-                        factor_name = product.name+' - '+factor.customer_name
-                    else:
-                        factor_name = product.name
-                else:
-                    data['product'] = data['product'][0]
-                    factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1]
+                    raise osv.except_osv(_('Error'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name))
+                factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
+                factor_name = product_obj.name_get(cr, uid, product_id, context=context2)[1] 
+                if factor.customer_name:
+                    factor_name += ' - ' + factor.customer_name
 
                 ctx =  context.copy()
                 ctx.update({'uom':uom})
                 if account.pricelist_id:
                     pl = account.pricelist_id.id
-                    price = pro_price_obj.price_get(cr,uid,[pl], data.get('product', False) or product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
+                    price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
                 else:
                     price = 0.0
 
@@ -131,7 +127,7 @@ class account_analytic_line(osv.osv):
                     'invoice_line_tax_id': [(6,0,tax )],
                     'invoice_id': last_invoice,
                     'name': factor_name,
-                    'product_id': data.get('product',product_id),
+                    'product_id': product_id,
                     'invoice_line_tax_id': [(6,0,tax)],
                     'uos_id': uom,
                     'account_id': account_id,
@@ -179,7 +175,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'),
         'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'),
         'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'),
-        'product': fields.many2one('product.product', 'Product', help='Fill this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
+        'product': fields.many2one('product.product', 'Force Product', help='Fill this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
     }
 
     _defaults = {

From e3c2297d4334e742d872291ab1596859d2fc76da Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 26 Jul 2012 13:43:21 +0200
Subject: [PATCH 207/312] [FIX] hr_holidays: security fix in the rights

bzr revid: stw@openerp.com-20120726114321-xx4j4acudjmgeoe6
---
 addons/hr_holidays/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index d2e6c27cded..b21b6ca64e4 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -5,3 +5,4 @@ access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_us
 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
 access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
 access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_manager,1,1,1,1
+access_crm_meeting_type_manager,crm.meeting.type.manager,base_calendar.model_crm_meeting_type,base.group_hr_manager,1,1,1,1

From 9375df5ae711cb977f4c37278ad6c06ebeb48bac Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 13:57:42 +0200
Subject: [PATCH 208/312] [IMP] made pager disappear in form view when in
 create mode

bzr revid: nicolas.vanhoren@openerp.com-20120726115742-jjihwmc0uzw11bn0
---
 addons/web/static/src/js/view_form.js | 31 +++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4426c93c619..3b53cf6f060 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -92,6 +92,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.has_been_loaded.then(function() {
             self.on("change:actual_mode", self, self.check_actual_mode);
             self.check_actual_mode();
+            self.on("change:actual_mode", self, self.init_pager);
+            self.init_pager();
         });
     },
     destroy: function() {
@@ -136,17 +138,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.$buttons.on('click','.oe_form_button_save',this.on_button_save);
         this.$buttons.on('click','.oe_form_button_cancel',this.on_button_cancel);
 
-        this.$pager = $(QWeb.render("FormView.pager", {'widget':self}));
-        if (this.options.$pager) {
-            this.$pager.appendTo(this.options.$pager);
-        } else {
-            this.$element.find('.oe_form_pager').replaceWith(this.$pager);
-        }
-        this.$pager.on('click','a[data-pager-action]',function() {
-            var action = $(this).data('pager-action');
-            self.on_pager_action(action);
-        });
-
         this.$sidebar = this.options.$sidebar || this.$element.find('.oe_form_sidebar');
         if (!this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
@@ -396,6 +387,24 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             this.reload();
         }
     },
+    init_pager: function() {
+        var self = this;
+        if (this.$pager)
+            this.$pager.remove();
+        if (this.get("actual_mode") === "create")
+            return;
+        this.$pager = $(QWeb.render("FormView.pager", {'widget':self}));
+        if (this.options.$pager) {
+            this.$pager.appendTo(this.options.$pager);
+        } else {
+            this.$element.find('.oe_form_pager').replaceWith(this.$pager);
+        }
+        this.$pager.on('click','a[data-pager-action]',function() {
+            var action = $(this).data('pager-action');
+            self.on_pager_action(action);
+        });
+        this.do_update_pager();
+    },
     do_update_pager: function(hide_index) {
         var index = hide_index ? '-' : this.dataset.index + 1;
         this.$pager.find('button').prop('disabled', this.dataset.ids.length < 2).end()

From 130de4f1a372800ca234e77cf9c78a236c59bbbd Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 26 Jul 2012 13:59:27 +0200
Subject: [PATCH 209/312] [FIX] hr_timesheet_invoice: error in sql query
 introduced in previous commit

bzr revid: qdp-launchpad@openerp.com-20120726115927-6qys36d1eecqfmuj
---
 .../hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index e4df1f4801e..0945b8f81fb 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -94,7 +94,7 @@ class account_analytic_line(osv.osv):
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
                         "AND id IN %s AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id,to_invoice,product_uom_id", (account.id, tuple(ids),))
+                    "GROUP BY product_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
 
             for product_id, factor_id, qty, uom, line_name in cr.fetchall():
                 if data.get('product'):

From 13c7eb084f525a1ee109a19706f23fa565a72693 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 26 Jul 2012 14:03:35 +0200
Subject: [PATCH 210/312] [IMP] crm: When we create a meeting from an
 opportunity, we pass the partner in the form view of the new meeting

bzr revid: stw@openerp.com-20120726120335-xa5wrvy5d3axcv3o
---
 addons/crm/crm_lead.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0fe3d2bc44b..d657f9875d4 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -772,6 +772,7 @@ class crm_lead(base_stage, osv.osv):
         res['context'] = {
             'default_opportunity_id': opportunity.id,
             'default_partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
+            'default_partner_ids' : opportunity.partner_id and [opportunity.partner_id.id] or False,
             'default_user_id': uid,
             'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
             'default_email_from': opportunity.email_from,

From 9c48f56020c7606d7bacf8808232b370f7edb61a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 14:15:50 +0200
Subject: [PATCH 211/312] [FIX] now completely hides the chatter when in create
 mode

bzr revid: nicolas.vanhoren@openerp.com-20120726121550-8cybfzmcmqh3t8yg
---
 addons/mail/static/src/js/mail.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8ce050fd144..f488225d8b6 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -843,10 +843,15 @@ openerp.mail = function(session) {
             this.ds = new session.web.DataSet(this, this.view.model);
             this.ds_users = new session.web.DataSet(this, 'res.users');
         },
-
+        
         start: function() {
             var self = this;
-            this._super.apply(this, arguments);
+            
+            // NB: all the widget should be modified to check the actual_mode property on view, not use
+            // any other method to know if the view is in create mode anymore
+            this.view.on("change:actual_mode", this, this._check_visibility);
+            this._check_visibility();
+            
             mail.ChatterUtils.bind_events(this);
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
             if (! this.params.see_subscribers_options) {
@@ -859,7 +864,11 @@ openerp.mail = function(session) {
                 .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.reinit();
         },
-
+        
+        _check_visibility: function() {
+            this.$element.toggle(this.view.get("actual_mode") !== "create");
+        },
+        
         destroy: function () {
             this._super.apply(this, arguments);
         },

From 9dab28d36e4bac8741050f4ab293076323a99fcf Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 26 Jul 2012 14:31:58 +0200
Subject: [PATCH 212/312] [FIX] hr_timesheet_invoice: name_get() only support
 to receive a list of ids as parameter

bzr revid: qdp-launchpad@openerp.com-20120726123158-08ajmydd95ixpp2d
---
 .../hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 0945b8f81fb..c9b2439596d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -103,7 +103,7 @@ class account_analytic_line(osv.osv):
                 if not product:
                     raise osv.except_osv(_('Error'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name))
                 factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
-                factor_name = product_obj.name_get(cr, uid, product_id, context=context2)[1] 
+                factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1] 
                 if factor.customer_name:
                     factor_name += ' - ' + factor.customer_name
 

From 66a7dc6359a1a1cb630abfa8a0f292451e0aceef Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 14:32:59 +0200
Subject: [PATCH 213/312] [IMP] customized pager of list view

bzr revid: nicolas.vanhoren@openerp.com-20120726123259-ffeg8342bcbgal8o
---
 addons/web/static/src/css/base.css    | 3 +++
 addons/web/static/src/css/base.sass   | 2 ++
 addons/web/static/src/js/view_list.js | 1 +
 3 files changed, 6 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e929ec6c16b..1e59897cd86 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1322,6 +1322,9 @@
 .openerp .oe_view_manager .oe_view_manager_pager {
   line-height: 26px;
 }
+.openerp .oe_view_manager .oe_view_manager_pager .oe_list_pager_single_page .oe_pager_group {
+  display: none;
+}
 .openerp .oe_view_manager .oe_pager_value {
   float: left;
   margin-right: 8px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c9e00c65a8a..3bb52497454 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1016,6 +1016,8 @@ $sheet-max-width: 860px
         // ViewManager.pager {{{
         .oe_view_manager_pager
             line-height: 26px
+            .oe_list_pager_single_page .oe_pager_group
+                display: none
         .oe_pager_value
             float: left
             margin-right: 8px
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 485b4e8d59b..72df989259d 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -376,6 +376,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
 
         var total = dataset.size();
         var limit = this.limit() || total;
+        this.$pager.toggle(total !== 0);
         this.$pager.toggleClass('oe_list_pager_single_page', (total <= limit));
         var spager = '-';
         if (total) {

From bf4c39cdf1ae1791164b557743513258afcb2827 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 14:38:19 +0200
Subject: [PATCH 214/312] [FIX] arrow keys handling in editable listview field
 when field is not a text-based input

* Correctly handle HTMLInputElement#selectionStart throwing an error
  (checkbox and radio)

* Correctly handle elements without a selectionStart at all (select)

=> should ~always let the go-to-other-field behavior go through

bzr revid: xmo@openerp.com-20120726123819-74n1gl01p6befgkp
---
 .../web/static/src/js/view_list_editable.js   | 75 ++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index c7654479864..ca889f68d8d 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -425,26 +425,64 @@ openerp.web.list_editable = function (instance) {
         keyup_ESCAPE: function () {
             return this.cancel_edition();
         },
+        /**
+         * Gets the selection range (start, end) for the provided element,
+         * returns ``null`` if it can't get a range.
+         *
+         * @private
+         */
         _text_selection_range: function (el) {
-            if (el.selectionStart !== undefined) {
+            var selectionStart;
+            try {
+                selectionStart = el.selectionStart;
+            } catch (e) {
+                // radio or checkbox throw on selectionStart access
+                return null;
+            }
+            if (selectionStart !== undefined) {
                 return {
-                    start: el.selectionStart,
+                    start: selectionStart,
                     end: el.selectionEnd
                 };
-            } else if(document.body.createTextRange) {
+            } else if (document.body.createTextRange) {
                 throw new Error("Implement text range handling for MSIE");
                 var sel = document.body.createTextRange();
                 if (sel.parentElement() === el) {
 
                 }
             }
+            // Element without selection ranges (select, div/@contenteditable)
+            return null;
         },
         _text_cursor: function (el) {
             var selection = this._text_selection_range(el);
-            if (selection.start !== selection.end) {
+            if (!selection) {
                 return null;
             }
-            return selection.start;
+            if (selection.start !== selection.end) {
+                return {position: null, collapsed: false};
+            }
+            return {position: selection.start, collapsed: true};
+        },
+        /**
+         * Checks if the cursor is at the start of the provided el
+         *
+         * @param {HTMLInputElement | HTMLTextAreaElement}
+         * @returns {Boolean}
+         * @private
+         */
+        _at_start: function (cursor, el) {
+            return cursor.collapsed && (cursor.position === 0);
+        },
+        /**
+         * Checks if the cursor is at the end of the provided el
+         *
+         * @param {HTMLInputElement | HTMLTextAreaElement}
+         * @returns {Boolean}
+         * @private
+         */
+        _at_end: function (cursor, el) {
+            return cursor.collapsed && (cursor.position === el.value.length);
         },
         /**
          * @param DOMEvent event
@@ -454,10 +492,11 @@ openerp.web.list_editable = function (instance) {
          */
         _key_move_record: function (event, record_direction, is_valid_move) {
             if (!this.editor.is_editing('edit')) { return $.when(); }
-            // FIXME: assumes editable widgets are input-type elements
-            var index = this._text_cursor(event.target);
-            // If selecting or not at the start of the input
-            if (!is_valid_move(event.target, index)) { return $.when(); }
+            var cursor = this._text_cursor(event.target);
+            // if text-based input (has a cursor)
+            //    and selecting (not collapsed) or not at a field boundary
+            //        don't move to the next record
+            if (cursor && !is_valid_move(event.target, cursor)) { return $.when(); }
 
             event.preventDefault();
             var source_field = $(event.target).closest('[data-fieldname]')
@@ -466,13 +505,15 @@ openerp.web.list_editable = function (instance) {
 
         },
         keydown_UP: function (e) {
-            return this._key_move_record(e, 'pred', function (el, index) {
-                return index === 0;
+            var self = this;
+            return this._key_move_record(e, 'pred', function (el, cursor) {
+                return self._at_start(cursor, el);
             });
         },
         keydown_DOWN: function (e) {
-            return this._key_move_record(e, 'succ', function (el, index) {
-                return index === el.value.length;
+            var self = this;
+            return this._key_move_record(e, 'succ', function (el, cursor) {
+                return self._at_end(cursor, el);
             });
         },
 
@@ -480,8 +521,8 @@ openerp.web.list_editable = function (instance) {
             // If the cursor is at the beginning of the field
             var source_field = $(e.target).closest('[data-fieldname]')
                     .attr('data-fieldname');
-            var index = this._text_cursor(e.target);
-            if (index !== 0) { return $.when(); }
+            var cursor = this._text_cursor(e.target);
+            if (cursor && !this._at_start(cursor, e.target)) { return $.when(); }
 
             var fields_order = this.editor.form.fields_order;
             var field_index = _(fields_order).indexOf(source_field);
@@ -504,8 +545,8 @@ openerp.web.list_editable = function (instance) {
             // looking for new fields at the right
             var source_field = $(e.target).closest('[data-fieldname]')
                     .attr('data-fieldname');
-            var index = this._text_cursor(e.target);
-            if (index !== e.target.value.length) { return $.when(); }
+            var cursor = this._text_cursor(e.target);
+            if (cursor && !this._at_end(cursor, e.target)) { return $.when(); }
 
             var fields_order = this.editor.form.fields_order;
             var field_index = _(fields_order).indexOf(source_field);

From 806aac15b0b96a9094a5c1a59de0449d801a15e2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 26 Jul 2012 18:12:58 +0530
Subject: [PATCH 215/312] [IMP] project : In project / sales setting, the
 default working time unit must be Hour.

bzr revid: mdi@tinyerp.com-20120726124258-8u7u4j6ei9q95rh3
---
 addons/project/project_data.xml | 4 ++++
 addons/project/project_demo.xml | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 966b1c49f74..a905e074f7b 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <!-- This will set the unit of measure used in projects and tasks.-->
+        <record id="base.main_company" model="res.company">
+            <field name="project_time_mode_id" ref="product.uom_hour"></field>
+        </record>
 
         <!-- Requests Links -->
         <record id="req_link_project" model="res.request.link">
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 07951280dc7..7f96ff87198 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -274,9 +274,6 @@
         <!--
     Resource: project.project
     -->
-        <record id="base.main_company" model="res.company">
-            <field name="project_time_mode_id" ref="product.uom_hour"></field>
-        </record>
         <!-- Projects -->
 
         <!-- <record id="all_projects_account" model="project.project">

From 51d739f609c2a63fe32691a676dff19e21f4435f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 26 Jul 2012 15:00:23 +0200
Subject: [PATCH 216/312] [REF] crm: Remove the opt-in option

bzr revid: stw@openerp.com-20120726130023-tqcvgdz5qt7x08lp
---
 addons/crm/crm_lead.py          | 7 -------
 addons/crm/crm_lead_view.xml    | 6 ++----
 addons/crm/test/ui/crm_demo.yml | 1 -
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index d657f9875d4..3b6c6a19900 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -208,7 +208,6 @@ class crm_lead(base_stage, osv.osv):
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),
         'contact_name': fields.char('Contact Name', size=64),
         'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1),
-        'opt_in': fields.boolean('Opt-In', oldname='optin', help="If opt-in is checked, this contact has accepted to receive emails."),
         'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
         'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
@@ -279,12 +278,6 @@ class crm_lead(base_stage, osv.osv):
         self.create_send_note(cr, uid, [obj_id], context=context)
         return obj_id
     
-    def on_change_opt_in(self, cr, uid, ids, opt_in):
-        return {'value':{'opt_in':opt_in,'opt_out':False}}
-
-    def on_change_opt_out(self, cr, uid, ids, opt_out):
-        return {'value':{'opt_out':opt_out,'opt_in':False}}
-
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
         if not stage_id:
             return {'value':{}}
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4e073981ce4..2c139470fdf 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -204,8 +204,7 @@
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
                             <group string="Mailings">
-                                <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
-                                <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
+                                <field name="opt_out" />
                             </group>
                         </group>
                     </page>
@@ -543,8 +542,7 @@
                                 <field name="channel_id" widget="selection"/>
                             </group>
                             <group string="Mailings">
-                                <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
-                                <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
+                                <field name="opt_out" />
                             </group>
                             <group string="Misc">
                                 <field name="active"/>
diff --git a/addons/crm/test/ui/crm_demo.yml b/addons/crm/test/ui/crm_demo.yml
index b5fd005126c..948a7468128 100644
--- a/addons/crm/test/ui/crm_demo.yml
+++ b/addons/crm/test/ui/crm_demo.yml
@@ -7,7 +7,6 @@
     type: opportunity
     stage_id: crm.stage_lead1
     state: draft
-    opt_in: True
 -
   I create lead record to call Mailing opt-out onchange method.
 -

From 38907f44f0f395b1de1c61159607eb62778d912c Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 26 Jul 2012 15:03:27 +0200
Subject: [PATCH 217/312] [IMP] crm: add the partner in the meeting view

bzr revid: stw@openerp.com-20120726130327-3orfncfemg9ojdwu
---
 addons/crm/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 7d4abb8cb6e..8ddf435138a 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -129,7 +129,7 @@
                     <button type="action"
                         string="Schedule a Meeting"
                         name="%(base_calendar.action_crm_meeting)d"
-                        context="{'search_default_partner_ids': active_id}"/>
+                        context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
                     <button type="action" string="Schedule a Call" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
                         context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />

From a2aa8e68faeef0caea488a1f9a430307744c6cdb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 26 Jul 2012 15:36:41 +0200
Subject: [PATCH 218/312] [FIX] delivery: group_extended doesn't exist anymore.

bzr revid: qdp-launchpad@openerp.com-20120726133641-dn8tlf571ekz4gxc
---
 addons/delivery/delivery_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index a1dbc47d390..417ae217fe6 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -226,7 +226,7 @@
             <field name="arch" type="xml">
                 <field name="company_id" position="before">
                     <field name="weight"/>
-                    <field name="weight_net" groups="base.group_extended"/>
+                    <field name="weight_net" groups="base.group_no_one"/>
                 </field>
             </field>
         </record>
@@ -251,7 +251,7 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
-                    <field name="weight_net" groups="base.group_extended"/>
+                    <field name="weight_net" groups="base.group_no_one"/>
                 </xpath>
             </field>
         </record>
@@ -264,7 +264,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='main_grp']" position="inside">
                     <field name="weight"/>
-                    <field name="weight_net" groups="base.group_extended"/>
+                    <field name="weight_net" groups="base.group_no_one"/>
                 </xpath>
             </field>
         </record>

From 9155ba655da0ff1daabff8836ad3b3da976c7e2f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 26 Jul 2012 16:19:15 +0200
Subject: [PATCH 219/312] [IMP] mail: Allow to search a string in the body and
 the subject of a message

bzr revid: stw@openerp.com-20120726141915-ghsdz2210gwwpfjw
---
 addons/mail/mail_message_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index eb68ab70a3b..986bb4bef38 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -81,8 +81,7 @@
             <field name="arch" type="xml">
                 <search string="Messages Search">
                     <field name="user_id"/>
-                    <field name="body"/>
-                    <field name="subject" filter_domain="['|', ('subject', 'ilike', self), ('record_name', 'ilike', self)]" />
+                    <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
                     <field name="type"/>
                     <filter icon="terp-personal+" string="My Feeds"
                             name="my_feeds" help="My Feeds"

From 26aaa7d9a7ac454141129e35d4469c44d2abcf06 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 16:20:57 +0200
Subject: [PATCH 220/312] [IMP] improvement to cache control

bzr revid: nicolas.vanhoren@openerp.com-20120726142057-7nf7wii9t37b6xo0
---
 addons/web/common/http.py      | 4 ++--
 addons/web/controllers/main.py | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index bb87d719bad..a70ef53a91c 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -425,8 +425,8 @@ class DisableCacheMiddleware(object):
         def start_wrapped(status, headers):
             referer = environ.get('HTTP_REFERER', '')
             parsed = urlparse.urlparse(referer)
-            debug = not urlparse.parse_qs(parsed.query).has_key('debug')
-            filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and k=='Cache-Control'))] 
+            debug = parsed.query.count('debug') >= 1
+            filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and (k=='Cache-Control' or k=='Expires')))]
             if debug:
                 filtered_headers.append(('Cache-Control', 'no-cache'))
             start_response(status, filtered_headers)
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 9c8451cd71e..76eccbda159 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -194,9 +194,11 @@ class WebClient(openerpweb.Controller):
             if mods is not None:
                 path += '?mods=' + mods
             return [path]
-        # old code to force cache reloading, this really works, sorry niv but we stop wasting time
-        return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in self.manifest_glob(req, mods, extension)]
-        return [el[1] for el in self.manifest_glob(req, mods, extension)]
+        sugar = req.httprequest.environ["QUERY_STRING"].count("no_sugar") == 0
+        if sugar:
+            return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in self.manifest_glob(req, mods, extension)]
+        else:
+            return [el[1] for el in self.manifest_glob(req, mods, extension)]
 
     @openerpweb.jsonrequest
     def csslist(self, req, mods=None):

From 73e248cdda6d5bab9baa52e36c208ccf22171af5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 16:29:57 +0200
Subject: [PATCH 221/312] [FIX] problem in firefox, actions bar not working
 correctly

bzr revid: nicolas.vanhoren@openerp.com-20120726142957-3gsqbssdi1l6x7dl
---
 addons/web/static/src/js/chrome.js |  2 +-
 addons/web/static/src/xml/base.xml | 36 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index dfab007b5c5..e72ee5f2a93 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -906,7 +906,7 @@ instance.web.Client = instance.web.Widget.extend({
         this.$element.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
             var $toggle = $(this);
-            var $menu = $toggle.find('.oe_dropdown_menu');
+            var $menu = $toggle.parent().find('.oe_dropdown_menu');
             var state = $menu.is('.oe_opened');
             setTimeout(function() {
                 // Do not alter propagation
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 55353f0a748..350058d6d2b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -518,25 +518,25 @@
             <div class="oe_form_dropdown_section">
                 <button class="oe_dropdown_toggle oe_dropdown_arrow">
                     <t t-esc="section.label"/>
-                    <ul class="oe_dropdown_menu">
-                        <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
-                            <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
-                                <t t-raw="item.label"/>
-                            </a>
-                            <a t-if="section.name == 'files'" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a>
-                        </li>
-                        <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment">
-                            <t t-call="HiddenInputFile">
-                                <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-                                <t t-set="fileupload_action">/web/binary/upload_attachment</t>
-                                <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/>
-                                <input type="hidden" name="id" t-att-value="widget.model_id"/>
-                                <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
-                                <span>Add...</span>
-                            </t>
-                        </li>
-                    </ul>
                 </button>
+                <ul class="oe_dropdown_menu">
+                    <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
+                        <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
+                            <t t-raw="item.label"/>
+                        </a>
+                        <a t-if="section.name == 'files'" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a>
+                    </li>
+                    <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment">
+                        <t t-call="HiddenInputFile">
+                            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+                            <t t-set="fileupload_action">/web/binary/upload_attachment</t>
+                            <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/>
+                            <input type="hidden" name="id" t-att-value="widget.model_id"/>
+                            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+                            <span>Add...</span>
+                        </t>
+                    </li>
+                </ul>
             </div>
         </t>
     </div>

From 55015eafaa4a732dcf905cd4b94679abfaea1c43 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 16:41:35 +0200
Subject: [PATCH 222/312] [IMP] changed color of button in meetings view

bzr revid: nicolas.vanhoren@openerp.com-20120726144135-0qh3ceflieayllk7
---
 addons/base_calendar/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index c58c27a9959..77244addd9f 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -73,7 +73,7 @@
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
                 <header>
-                    <button name="case_open" string="Confirm" type="object" class="oe_highlight"
+                    <button name="case_open" string="Confirm" type="object"
                             states="draft"/>
                     <button name="case_close" string="Done" type="object"
                             states="open"/>

From 4a2ac856abb80a6bbf168ee3e56d699d04300d13 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 26 Jul 2012 13:55:50 +0200
Subject: [PATCH 223/312] [FIX] kanban group dropdown

bzr revid: al@openerp.com-20120726115550-mva3pz4lzsyavgw9
---
 addons/web_kanban/static/src/css/kanban.css  | 2 +-
 addons/web_kanban/static/src/css/kanban.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index a6f2cc7441b..5830cb33e0f 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -50,7 +50,7 @@
 .openerp .oe_kanban_view .oe_kanban_group_title {
   font-size: 16px;
   font-weight: bold;
-  min-height: 30px;
+  min-height: 32px;
   color: #333333;
   text-shadow: 0 1px 0 white;
 }
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 7175b398cbe..44b3251c8fb 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -73,7 +73,7 @@
     .oe_kanban_group_title
         font-size: 16px
         font-weight: bold
-        min-height: 30px
+        min-height: 32px
         color: #333333
         text-shadow: 0 1px 0 white
         > span

From a29023b3f2a253140d6eb6c158df9a910eb11979 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:30:26 +0200
Subject: [PATCH 224/312] [FIX] avoid fucking up ViewManager#start in process:
 correctly return _super() result

bzr revid: xmo@openerp.com-20120726143026-ttu6x6zq2vp106s9
---
 addons/web_process/static/src/js/process.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
index bb32d300be8..60259f26b64 100644
--- a/addons/web_process/static/src/js/process.js
+++ b/addons/web_process/static/src/js/process.js
@@ -3,12 +3,13 @@ openerp.web_process = function (instance) {
           _t = instance.web._t;
     instance.web.ViewManager.include({
         start: function() {
-            this._super();
+            var _super = this._super();
             this.process_check();
             this.process_help = this.action ? this.action.help : 'Help: Not Defined';
             this.model = this.dataset.model;
             if(this.action) this.process_model = this.action.res_model;
             else this.process_model = this.model;
+            return _super;
         },
         process_check: function() {
             var self = this,

From 18afaaa1c13c27145977d2b374814490230d6c09 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:31:05 +0200
Subject: [PATCH 225/312] [FIX] correctly call renderElement _super in
 dashboard

bzr revid: xmo@openerp.com-20120726143105-w817zv5o3ihvmjj5
---
 addons/web_dashboard/static/src/js/dashboard.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index a19151af33c..fea775d4ee8 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -226,6 +226,8 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         }
     },
     renderElement: function() {
+        this._super();
+
         var check = _.detect(this.node.children, function(column, column_index) {
             return _.detect(column.children,function(element){
                 return element.tag === "action"? element: false;

From 7ccf2ad2a5779dac1175c0191778ff9ee69eb7fb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:31:41 +0200
Subject: [PATCH 226/312] [FIX] if value may not be a promise, return the
 wrapped value if wrapping it anyway

bzr revid: xmo@openerp.com-20120726143141-4wbrqq29qqhvwhqw
---
 addons/web/static/src/js/views.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index ddf4050fa38..5af7e5bf616 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -396,7 +396,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             .find('.oe_view_manager_switch a').filter('[data-view-type="' + view_type + '"]')
             .parent().addClass('active');
 
-        $.when(view_promise).then(function () {
+        return $.when(view_promise).then(function () {
             _.each(_.keys(self.views), function(view_name) {
                 var controller = self.views[view_name].controller;
                 if (controller) {
@@ -418,7 +418,6 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                 }
             });
         });
-        return view_promise;
     },
     do_create_view: function(view_type) {
         // Lazy loading of views
@@ -1129,7 +1128,7 @@ instance.web.View = instance.web.Widget.extend({
         this.view_id = view_id;
         this.set_default_options(options);
     },
-    start: function() {
+    start: function () {
         return this.load_view();
     },
     load_view: function() {

From de1f6488a7ada9f2a1cd24c8f56d07af7ca53019 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:33:20 +0200
Subject: [PATCH 227/312] [CHG] there always is an editor in the editable
 listview, destroy just before creating the new one

bzr revid: xmo@openerp.com-20120726143320-4cdze45po1g581lu
---
 addons/web/static/src/js/view_list_editable.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index c7654479864..85e9e5a402e 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -96,9 +96,6 @@ openerp.web.list_editable = function (instance) {
         },
         on_loaded: function (data, grouped) {
             var self = this;
-            if (this.editor) {
-                this.editor.destroy();
-            }
             // tree/@editable takes priority on everything else if present.
             var result = this._super(data, grouped);
             if (this.editable()) {
@@ -118,6 +115,7 @@ openerp.web.list_editable = function (instance) {
                             self.start_edition();
                         }
                     });
+                this.editor.destroy();
                 // Editor is not restartable due to formview not being
                 // restartable
                 this.editor = this.make_editor();

From 3e4262266f99af4c927f60984108110a2f7e7f06 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:43:09 +0200
Subject: [PATCH 228/312] [REM] unused and useless line

bzr revid: xmo@openerp.com-20120726144309-olaini3pgjvb1j4j
---
 addons/web/static/src/js/view_form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 835527b3135..d38494112e5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3016,7 +3016,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
         this.views = views;
 
         this.viewmanager = new instance.web.form.One2ManyViewManager(this, this.dataset, views, {});
-        this.viewmanager.$element.addClass("oe_view_manager_one2many");
         this.viewmanager.o2m = self;
         var once = $.Deferred().then(function() {
             self.init_form_last_update.resolve();

From 9cde11f63d3fb3ac7a2c0d782c159302be2f95ed Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:44:20 +0200
Subject: [PATCH 229/312] [FIX] object may or may not have been started when
 destroy is run

bzr revid: xmo@openerp.com-20120726144420-7coh354993kj546a
---
 addons/web/static/src/js/view_form.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d38494112e5..ca0f2b77082 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -88,7 +88,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             w.off('focused blurred');
             w.destroy();
         });
-        this.$element.off('.formBlur');
+        if (this.$element) {
+            this.$element.off('.formBlur');
+        }
         this._super();
     },
     on_loaded: function(data) {

From a9ccdfae0305afa988284e59dc1a81694e0a26e3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:45:33 +0200
Subject: [PATCH 230/312] [FIX] use Widget#setElement and Widget#replaceElement
 rather than direct  setting

bzr revid: xmo@openerp.com-20120726144533-zev1o8kpugn1mkcz
---
 addons/web/static/src/js/view_form.js            | 4 ++--
 addons/web_kanban/static/src/js/kanban.js        | 4 +---
 addons/web_mobile/static/src/js/chrome_mobile.js | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ca0f2b77082..5378e74a1a4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4216,7 +4216,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
         this.selection.view = this.view;
         this.selection.set({force_readonly: this.get('effective_readonly')});
         this.selection.on("change:value", this, this.on_selection_changed);
-        this.selection.$element = $(".oe_form_view_reference_selection", this.$element);
+        this.selection.setElement(this.$(".oe_form_view_reference_selection"));
         this.selection.renderElement();
         this.selection.start();
         this.selection
@@ -4229,7 +4229,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
         this.m2o.view = this.view;
         this.m2o.set({force_readonly: this.get("effective_readonly")});
         this.m2o.on("change:value", this, this.data_changed);
-        this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element);
+        this.m2o.setElement(this.$(".oe_form_view_reference_m2o"));
         this.m2o.renderElement();
         this.m2o.start();
         this.m2o
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 5a22b9e5ba5..50360683c14 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -711,9 +711,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
         this.view.dataset.read_ids([this.id], this.view.fields_keys.concat(['__last_update'])).then(function(records) {
             if (records.length) {
                 self.set_record(records[0]);
-                var $render = $(self.render());
-                self.$element.replaceWith($render);
-                self.$element = $render;
+                this.replaceElement($(self.render()));
                 self.$element.data('widget', self);
                 self.bind_events();
                 self.group.compute_cards_auto_height();
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index a507e3b5943..029e4bce49b 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -48,8 +48,7 @@ instance.web_mobile.Login =  instance.web.OldWidget.extend({
         jQuery("#oe_header").children().remove();
         this.rpc("/web/database/get_list", {}, function(result) {
             self.db_list = result.db_list;
-            $('#'+self.element_id).html(self.render(self));
-            self.$element = $('#'+self.element_id);
+            this.setElement($('#'+self.element_id).html(self.render(self)));
             if(self.session.db!=""){
                 self.$element.find("#database").val(self.session.db);
             }

From 5c0324f3214d95c3a2d34db7d6d145700501c762 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:48:17 +0200
Subject: [PATCH 231/312] [IMP] Widget#setElement from init to reinstate
 $element always being there

That makes precious little sense, but a bunch of widgets actually
expect $element to exist before start() has been called.

Also extract creating a node from the widget's node description into a
private method, use that where possible.

bzr revid: xmo@openerp.com-20120726144817-20caa8jkvg39ycho
---
 addons/web/static/src/js/corelib.js   | 21 +++++++++++++++++----
 addons/web/static/src/js/coresetup.js |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index b80543a34d8..3fafcab26fb 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -514,6 +514,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
      */
     init: function(parent) {
         instance.web.CallbackEnabledMixin.init.call(this);
+        this.setElement(this._make_descriptive());
         this.setParent(parent);
     },
     /**
@@ -701,10 +702,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
             $el = $(_.str.trim(instance.web.qweb.render(
                 this.template, {widget: this})));
         } else {
-            var attrs = _.extend({}, this.attributes || {});
-            if (this.id) { attrs.id = this.id; }
-            if (this.className) { attrs['class'] = this.className; }
-            $el = $(this.make(this.tagName, attrs));
+            $el = this._make_descriptive();
         }
         this.replaceElement($el);
     },
@@ -737,6 +735,8 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      * @return {*} this
      */
     setElement: function (element) {
+        // NB: completely useless, as WidgetMixin#init creates a $element
+        // always
         if (this.$element) {
             this.undelegateEvents();
         }
@@ -766,6 +766,19 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
         }
         return el;
     },
+    /**
+     * Makes a potential root element from the declarative builder of the
+     * widget
+     *
+     * @return {jQuery}
+     * @private
+     */
+    _make_descriptive: function () {
+        var attrs = _.extend({}, this.attributes || {});
+        if (this.id) { attrs.id = this.id; }
+        if (this.className) { attrs['class'] = this.className; }
+        return $(this.make(this.tagName, attrs));
+    },
     delegateEvents: function () {
         var events = this.events;
         if (_.isEmpty(events)) { return; }
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index b86b0534e3b..181364ba533 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -21,7 +21,7 @@ instance.web.OldWidget = instance.web.Widget.extend({
         this.element_id = this.element_id || _.uniqueId('widget-');
 
         var tmp = document.getElementById(this.element_id);
-        this.setElement(tmp || this.make(this.tagName));
+        this.setElement(tmp || this._make_descriptive());
     },
     renderElement: function() {
         var rendered = this.render();

From 5fe4ff9c49e741c607ae33279552c6ae492f87ab Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:57:04 +0200
Subject: [PATCH 232/312] [FIX] move setElement init call from WidgetMixin to
 Widget

Widget is the one providing both setElement and _make_descriptive...

bzr revid: xmo@openerp.com-20120726145704-uzg7ufntvf24gnyd
---
 addons/web/static/src/js/corelib.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 3fafcab26fb..370fe74e63e 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -514,7 +514,6 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
      */
     init: function(parent) {
         instance.web.CallbackEnabledMixin.init.call(this);
-        this.setElement(this._make_descriptive());
         this.setParent(parent);
     },
     /**
@@ -689,6 +688,8 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      */
     init: function(parent) {
         instance.web.WidgetMixin.init.call(this,parent);
+        // FIXME: this should not be
+        this.setElement(this._make_descriptive());
         this.session = instance.connection;
     },
     /**

From 7285d434088289f9f24c0836ba7da614528a182d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:57:15 +0200
Subject: [PATCH 233/312] [IMP] APIs usage of calendar

bzr revid: xmo@openerp.com-20120726145715-5q1zu2gwmv8uvou5
---
 addons/web_calendar/static/src/js/calendar.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 59ca58bec86..ae92585f67e 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -492,15 +492,17 @@ instance.web_calendar.Sidebar = instance.web.Widget.extend({
     }
 });
 instance.web_calendar.SidebarFilter = instance.web.Widget.extend({
+    events: {
+        'change input:checkbox': 'on_filter_click'
+    },
     init: function(parent, view) {
         this._super(parent);
         this.view = view;
-        this.$element.delegate('input:checkbox', 'change', this.on_filter_click);
     },
     on_events_loaded: function(filters) {
         var selected_filters = this.view.selected_filters.slice(0);
         this.$element.html(QWeb.render('CalendarView.sidebar.responsible', { filters: filters }));
-        this.$element.find('div.oe_calendar_responsible input').each(function() {
+        this.$('div.oe_calendar_responsible input').each(function() {
             if (_.indexOf(selected_filters, $(this).val()) > -1) {
                 $(this).click();
             }
@@ -511,7 +513,7 @@ instance.web_calendar.SidebarFilter = instance.web.Widget.extend({
             responsibles = [],
             $e = $(e.target);
         this.view.selected_filters = [];
-        this.$element.find('div.oe_calendar_responsible input:checked').each(function() {
+        this.$('div.oe_calendar_responsible input:checked').each(function() {
             responsibles.push($(this).val());
             self.view.selected_filters.push($(this).val());
         });

From eafee2f60265a89567cf56d9b9b5161f93fbe663 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 16:59:10 +0200
Subject: [PATCH 234/312] [FUCK] remove note which makes no sense anymore

bzr revid: xmo@openerp.com-20120726145910-nn8vvu42n9634ycu
---
 doc/widget.rst | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/doc/widget.rst b/doc/widget.rst
index 02332382ce9..ddfe525227d 100644
--- a/doc/widget.rst
+++ b/doc/widget.rst
@@ -39,15 +39,9 @@ DOM Root
 A :js:class:`~openerp.web.Widget` is responsible for a section of the
 page materialized by the DOM root of the widget. The DOM root is
 available via the :js:attr:`~openerp.web.Widget.el` and
-:js:attr:`~openerp.web.Widget.$element` attributes, which are respectively
-the raw DOM Element and the jQuery wrapper around the DOM element.
-
-.. note::
-
-    both attributes are compatible with Backbone's equivalent, there
-    is also the :js:attr:`~openerp.web.Widget.$element` attribute
-    which aliases to :js:attr:`~openerp.web.Widget.$element` and remains
-    for backwards compatiblity reasons.
+:js:attr:`~openerp.web.Widget.$element` attributes, which are
+respectively the raw DOM Element and the jQuery wrapper around the DOM
+element.
 
 There are two main ways to define and generate this DOM root:
 

From b4565d0f48546c92a740881b21f08b8e6b9363c4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 17:43:46 +0200
Subject: [PATCH 235/312] [IMP] minor customization to partners view, added
 default_focus

bzr revid: nicolas.vanhoren@openerp.com-20120726154346-3094asen5mdo84nq
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 886a15d5d4d..b5b7c4366f9 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -106,7 +106,7 @@
                             (<field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
                         </div>
                         <h1>
-                            <field name="name"/>
+                            <field name="name" default_focus="1"/>
                         </h1>
                         <field name="category_id" widget="many2many_tags" placeholder="Select Tags"/>
                     </div>

From 781fbd3a2613f128c5bb0d0d6fc11c9e9231db72 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 26 Jul 2012 17:47:16 +0200
Subject: [PATCH 236/312] [FIX] corrected some old code about focus

bzr revid: nicolas.vanhoren@openerp.com-20120726154716-1sua5q2teqeba7r0
---
 addons/web/controllers/main.py        | 5 +++--
 addons/web/static/src/js/view_form.js | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 76eccbda159..da034aa88b6 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -194,8 +194,9 @@ class WebClient(openerpweb.Controller):
             if mods is not None:
                 path += '?mods=' + mods
             return [path]
-        sugar = req.httprequest.environ["QUERY_STRING"].count("no_sugar") == 0
-        if sugar:
+        no_sugar = req.httprequest.environ["QUERY_STRING"].count("no_sugar") >= 1
+        no_sugar = no_sugar or req.httprequest.environ.get('HTTP_REFERER', '').count("no_sugar") >= 1
+        if not no_sugar:
             return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in self.manifest_glob(req, mods, extension)]
         else:
             return [el[1] for el in self.manifest_glob(req, mods, extension)]
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3b53cf6f060..ec414461b64 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -647,11 +647,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             });
             var fields_order = self.fields_order.slice(0);
             if (self.default_focus_field) {
-                fields_order.unshift(self.default_focus_field);
+                fields_order.unshift(self.default_focus_field.name);
             }
             for (var i = 0; i < fields_order.length; i += 1) {
                 var field = self.fields[fields_order[i]];
-                if (!field.get('effective_invisible') && !field.get('effective_readonly') && field.focus() !== false) {
+                if (!field.get('effective_invisible') && !field.get('effective_readonly')) {
+                    field.focus();
                     break;
                 }
             }
@@ -986,7 +987,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     register_field: function(field, name) {
         this.fields[name] = field;
         this.fields_order.push(name);
-        if (field.node.attrs.default_focus == '1') {
+        if (JSON.parse(field.node.attrs.default_focus || "0")) {
             this.default_focus_field = field;
         }
 
@@ -1692,7 +1693,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
         this._super(view, node);
         this.force_disabled = false;
         this.string = (this.node.attrs.string || '').replace(/_/g, '');
-        if (this.node.attrs.default_focus == '1') {
+        if (JSON.parse(this.node.attrs.default_focus || "0")) {
             // TODO fme: provide enter key binding to widgets
             this.view.default_focus_button = this;
         }

From 99df5da6e723e3229219fb55a35e067ab0cd9478 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 17:55:10 +0200
Subject: [PATCH 237/312] [ADD] a row

bzr revid: xmo@openerp.com-20120726155510-vzc0m5nokt3451pn
---
 addons/web/static/src/js/view_form.js | 30 ++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ec414461b64..7f802be2100 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3035,6 +3035,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             }
             if(view.view_type === "list") {
                 _.extend(view.options, {
+                    addable: null,
                     selectable: self.multi_selection,
                     sortable: false,
                     import_enabled: false,
@@ -3042,7 +3043,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                 });
                 if (self.get("effective_readonly")) {
                     _.extend(view.options, {
-                        addable: null,
                         deletable: null,
                         reorderable: false,
                     });
@@ -3467,6 +3467,34 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         this._super.apply(this, arguments);
     }
 });
+instance.web.form.One2ManyList = instance.web.ListView.List.extend({
+    pad_table_to: function (count) {
+        this._super(count > 0 ? count - 1 : 0);
+
+        // magical invocation of wtf does that do
+        if (this.view.o2m.get('effective_readonly')) {
+            return;
+        }
+
+        var self = this;
+        var columns = _(this.columns).filter(function (column) {
+            return column.invisible !== '1';
+        }).length;
+        if (this.options.selectable) { columns++; }
+        if (this.options.deletable) { columns++; }
+        var $cell = $('<td>', {
+            colspan: columns,
+            'class': 'oe_form_field_one2many_list_row_add'
+        }).text(_t("Add a row"))
+            .click(function (e) {
+                e.preventDefault();
+                e.stopPropagation();
+                self.view.do_add_record();
+            });
+        this.$current.append(
+            $('<tr>').append($cell))
+    }
+});
 
 instance.web.form.One2ManyFormView = instance.web.FormView.extend({
     form_template: 'One2Many.formview',

From fcdf6690b4377d397ddc2d6054a086258cae3483 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 26 Jul 2012 17:57:42 +0200
Subject: [PATCH 238/312] [REM] unused (and pretty much useless) row parity
 classes in listview

bzr revid: xmo@openerp.com-20120726155742-sgvx3dgr4zl5gnvn
---
 addons/web/static/src/js/view_list.js | 25 -------------------------
 addons/web/static/src/xml/base.xml    |  3 +--
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 72df989259d..9c7bf88db1a 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -933,7 +933,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                     '[data-id=' + record.get('id') + ']');
                 var index = $row.data('index');
                 $row.remove();
-                self.refresh_zebra(index);
             },
             'reset': function () { return self.on_records_reset(); },
             'change': function (event, record, attribute, value, old_value) {
@@ -968,8 +967,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                                 '[data-id=' + previous_record.get('id') + ']');
                     $new_row.insertAfter($previous_sibling);
                 }
-
-                self.refresh_zebra(index, 1);
             }
         };
         _(this.record_callbacks).each(function (callback, event) {
@@ -1109,7 +1106,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
         this.$current
             .children('tr:not([data-id])').remove().end()
             .append(new Array(count - this.records.length + 1).join(row));
-        this.refresh_zebra(this.records.length);
     },
     /**
      * Gets the ids of all currently selected records, if any
@@ -1183,25 +1179,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
             render_cell: function () {
                 return self.render_cell.apply(self, arguments); }
         });
-    },
-    /**
-     * Fixes fixes the even/odd classes
-     *
-     * @param {Number} [from_index] index from which to resequence
-     * @param {Number} [offset = 0] selection offset for DOM, in case there are rows to ignore in the table
-     */
-    refresh_zebra: function (from_index, offset) {
-        offset = offset || 0;
-        from_index = from_index || 0;
-        var dom_offset = offset + from_index;
-        var sel = dom_offset ? ':gt(' + (dom_offset - 1) + ')' : null;
-        this.$current.children(sel).each(function (i, e) {
-            var index = from_index + i;
-            // reset record-index accelerators on rows and even/odd
-            var even = index%2 === 0;
-            $(e).toggleClass('even', even)
-                .toggleClass('odd', !even);
-        });
     }
 });
 instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.web.ListView.Groups# */{
@@ -1534,8 +1511,6 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                     }(dataset, record.get('id'), seq));
                     record.set('sequence', seq);
                 }
-
-                list.refresh_zebra();
             }
         });
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 350058d6d2b..29670c8e7de 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -645,10 +645,9 @@
 <t t-name="ListView.rows" t-foreach="records.length" t-as="index">
     <t t-call="ListView.row">
         <t t-set="record" t-value="records.at(index)"/>
-        <t t-set="row_parity" t-value="index_parity"/>
     </t>
 </t>
-<tr t-name="ListView.row" t-att-class="row_parity"
+<tr t-name="ListView.row"
         t-att-data-id="record.get('id')"
         t-att-style="view.style_for(record)">
     <t t-set="asData" t-value="record.toForm().data"/>

From 307854670128ed674b9d4cf20f58c1666899bd43 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 26 Jul 2012 18:00:39 +0200
Subject: [PATCH 239/312] [FIX] stock: We can't transfert a picking

bzr revid: stw@openerp.com-20120726160039-5nbjz5xkim42fe9w
---
 addons/stock/wizard/stock_partial_picking.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index f315c63834a..a57e720684f 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -98,9 +98,15 @@ class stock_partial_picking(osv.osv_memory):
         if context is None: context = {}
         res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
         picking_ids = context.get('active_ids', [])
-        if context['active_model'] == 'purchase.order':
+        active_model = context.get('active_model')
+
+        if active_model == 'purchase.order':
             for purchase_order in self.pool.get('purchase.order').browse(cr, uid, picking_ids, context=context):
                 picking_ids = [picking_id.id for picking_id in purchase_order.picking_ids]
+        elif active_model == 'sale.order':
+            for sale_order in self.pool.get('sale.order').browse(cr, uid, picking_ids, context=context):
+                picking_ids = [picking.id for picking in sale_order.picking_ids]
+
         if not picking_ids or len(picking_ids) != 1:
             # Partial Picking Processing may only be done for one picking at a time
             return res
@@ -108,7 +114,7 @@ class stock_partial_picking(osv.osv_memory):
         # (already seen in previous bug where context passed was containing ir.ui.menu as active_model and the menu 
         # ID as active_id). Though this should be fixed in clients now, this place is sensitive enough to ensure the
         # consistancy of the context.
-        assert context.get('active_model') in ('stock.picking', 'stock.picking.in', 'stock.picking.out', 'purchase.order'), 'Bad context propagation'
+        assert active_model in ('stock.picking', 'stock.picking.in', 'stock.picking.out', 'purchase.order', 'sale.order'), 'Bad context propagation'
         picking_id, = picking_ids
         if 'picking_id' in fields:
             res.update(picking_id=picking_id)

From 515372d8dc4429f72ce06f5f840b3b59224a9c77 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 26 Jul 2012 18:16:05 +0200
Subject: [PATCH 240/312] [FIX] correct Login widget to send event instead of
 creating a child client action

bzr revid: chs@openerp.com-20120726161605-wtwi5uzau37dc9iq
---
 addons/web/static/src/js/chrome.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index e72ee5f2a93..a1759397e21 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -584,7 +584,7 @@ instance.web.Login =  instance.web.Widget.extend({
                     localStorage.setItem('last_password_login_success', '');
                 }
             }
-            self.do_action("login_sucessful");
+            self.trigger('login_successful');
         },function () {
             self.$(".oe_login_pane").fadeIn("fast");
             self.$element.addClass("oe_login_invalid");
@@ -593,16 +593,6 @@ instance.web.Login =  instance.web.Widget.extend({
 });
 instance.web.client_actions.add("login", "instance.web.Login");
 
-instance.web.LoginSuccessful =  instance.web.Widget.extend({
-    init: function(parent) {
-        this._super(parent);
-    },
-    start: function() {
-        this.getParent().getParent().show_application();
-    },
-});
-instance.web.client_actions.add("login_sucessful", "instance.web.LoginSuccessful");
-
 instance.web.Menu =  instance.web.Widget.extend({
     template: 'Menu',
     init: function() {
@@ -979,10 +969,9 @@ instance.web.WebClient = instance.web.Client.extend({
         };
     },
     show_login: function() {
-        var self = this;
-        self.$('.oe_topbar').hide();
-        self.action_manager.do_action("login");
-        //self.login.appendTo(self.$element);
+        this.$('.oe_topbar').hide();
+        this.action_manager.do_action("login");
+        this.action_manager.inner_widget.on('login_successful', this, this.show_application);
     },
     show_application: function() {
         var self = this;

From 9128e37231194592b6468ffa7922bbb39b5d7a33 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 26 Jul 2012 18:16:38 +0200
Subject: [PATCH 241/312] [REF] refactor action popup

bzr revid: chs@openerp.com-20120726161638-zt8x0kfpxvst998r
---
 addons/web/static/src/js/views.js | 68 ++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 6b4bc44df64..10f44a54f11 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -214,21 +214,30 @@ instance.web.ActionManager = instance.web.Widget.extend({
         this.dialog_stop();
         this.clear_breadcrumbs();
     },
-    ir_actions_act_window: function (action, on_close) {
-        var self = this;
-        if (_(['base.module.upgrade', 'base.setup.installer'])
-                .contains(action.res_model)) {
-            var old_close = on_close;
-            on_close = function () {
-                instance.webclient.do_reload().then(old_close);
-            };
+
+    do_ir_actions_common: function(action, on_close) {
+        var self = this, klass, widget, add_breadcrumb;
+        if (action.type === 'ir.actions.client') {
+            var ClientWidget = instance.web.client_actions.get_object(action.tag);
+            widget = new ClientWidget(this, action.params);
+            klass = 'oe_act_client';
+            add_breadcrumb = function() {
+                self.push_breadcrumb({
+                    widget: widget,
+                    title: action.name
+                });
+            }
+        } else {
+            widget = new instance.web.ViewManagerAction(this, action);
+            klass = 'oe_act_window';
+            add_breadcrumb = widget.add_breadcrumb
         }
         if (action.target === 'new') {
             if (this.dialog === null) {
                 // These buttons will be overwrited by <footer> if any
                 this.dialog = new instance.web.Dialog(this, {
                     buttons: { "Close": function() { $(this).dialog("close"); }},
-                    dialogClass: 'oe_act_window'
+                    dialogClass: klass
                 });
                 if(on_close)
                     this.dialog.on_close.add(on_close);
@@ -236,7 +245,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 this.dialog_widget.destroy();
             }
             this.dialog.dialog_title = action.name;
-            this.dialog_widget = new instance.web.ViewManagerAction(this, action);
+            this.dialog_widget = widget;
             this.dialog_widget.appendTo(this.dialog.$element);
             this.dialog.open();
         } else  {
@@ -247,11 +256,34 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 });
             }
             this.inner_action = action;
-            var inner_widget = this.inner_widget = new instance.web.ViewManagerAction(this, action);
-            inner_widget.add_breadcrumb();
+            this.inner_widget = widget;
+            add_breadcrumb();
             this.inner_widget.appendTo(this.$element);
         }
     },
+
+    ir_actions_act_window: function (action, on_close) {
+        var self = this;
+        if (_(['base.module.upgrade', 'base.setup.installer'])
+                .contains(action.res_model)) {
+            var old_close = on_close;
+            on_close = function () {
+                instance.webclient.do_reload().then(old_close);
+            };
+        }
+        if (action.target !== 'new') {
+            if(action.menu_id) {
+                this.dialog_stop();
+                return this.getParent().do_action(action, function () {
+                    instance.webclient.menu.open_menu(action.menu_id);
+                });
+            }
+        }
+        return this.do_ir_actions_common(action, on_close);
+    },
+    ir_actions_client: function (action, on_close) {
+        return this.do_ir_actions_common(action, on_close);
+    },
     ir_actions_act_window_close: function (action, on_closed) {
         if (!this.dialog && on_closed) {
             on_closed();
@@ -267,18 +299,6 @@ instance.web.ActionManager = instance.web.Widget.extend({
             self.do_action(action, on_closed)
         });
     },
-    ir_actions_client: function (action) {
-        this.dialog_stop();
-        var ClientWidget = instance.web.client_actions.get_object(action.tag);
-        this.inner_widget = new ClientWidget(this, action.params);
-        this.push_breadcrumb({
-            widget: this.inner_widget,
-            title: action.name
-        });
-        this.inner_action = action;
-        this.do_push_state({});
-        this.inner_widget.appendTo(this.$element);
-    },
     ir_actions_report_xml: function(action, on_closed) {
         var self = this;
         instance.web.blockUI();

From 5e7f13205546b7100e05e41c45f5740355fb28b0 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 26 Jul 2012 18:17:32 +0200
Subject: [PATCH 242/312] [FIX] anonymous: adapt to Login client action

bzr revid: chs@openerp.com-20120726161732-objtaoe2dk54c2in
---
 addons/anonymous/static/src/js/anonymous.js | 29 +++++++--------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js
index c4dc412dda1..15c03a6ce63 100644
--- a/addons/anonymous/static/src/js/anonymous.js
+++ b/addons/anonymous/static/src/js/anonymous.js
@@ -1,29 +1,20 @@
 openerp.anonymous = function(instance) {
 
-    instance.web.client_actions.add("login", "instance.web.Login");
-
-    instance.web.WebClient.include({
-        show_login: function() {
-            var self = this, _super = this._super;
-            this.login.load_db_list().then(function() {
-                var dblist = self.login._db_list;
+    instance.web.Login.include({
+        start: function() {
+            var self = this;
+            return $.when(this._super()).pipe(function() {
+                var dblist = self._db_list;
                 if (dblist && dblist.length === 1) {
-                    self.login.remember_credentials = false;
+                    self.remember_credentials = false;
                     // XXX get login/pass from server (via a rpc call) ?
-                    self.login.do_login(dblist[0], 'anonymous', 'anonymous').fail(function() {
-                        _super.apply(self, []);
-                    });
-                } else {
-                    _super.apply(self, []);
+                    return self.do_login(dblist[0], 'anonymous', 'anonymous')
                 }
+
             });
         },
-        restart: function() {
-            return this.start();
-        }
     });
 
-
     instance.web.UserMenu.include({
         init: function(parent) {
             this._super(parent);
@@ -39,8 +30,8 @@ openerp.anonymous = function(instance) {
                 var p = self.getParent();
                 var am = p.action_manager;
                 p.$element.find('.oe_leftbar').hide();
-                am.do_action({type:'ir.actions.client', tag:'login'});
-                am.inner_widget.on('login', p, p.restart);
+                am.do_action({type:'ir.actions.client', tag:'login', target: 'new'});
+                am.dialog_widget.on('login', p, p.restart);
             });
         }
     });

From 0dee110ef690b80282f2a1e1a07736d7c43855c5 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 27 Jul 2012 05:23:04 +0000
Subject: [PATCH 243/312] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120727052304-iux3j0f0prqcs3qp
---
 addons/account_coda/i18n/mn.po  | 3739 +++++++++++++++++++++++++++++++
 addons/base_crypt/i18n/nl_BE.po |   47 +
 addons/product/i18n/ru.po       |   10 +-
 3 files changed, 3791 insertions(+), 5 deletions(-)
 create mode 100644 addons/account_coda/i18n/mn.po
 create mode 100644 addons/base_crypt/i18n/nl_BE.po

diff --git a/addons/account_coda/i18n/mn.po b/addons/account_coda/i18n/mn.po
new file mode 100644
index 00000000000..c0d9c03e589
--- /dev/null
+++ b/addons/account_coda/i18n/mn.po
@@ -0,0 +1,3739 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-07-26 08:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-27 05:22+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_21
+msgid "Cash withdrawal on card (PROTON)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_412
+msgid "Advice of expiry charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_11
+msgid "Your purchase of luncheon vouchers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_05
+msgid "Partial payment subscription"
+msgstr "Төлбөрийн гарын үсэг дутуу"
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_54
+msgid "Unexecutable transfer order"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_02
+msgid "Individual transfer order initiated by the bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_21
+msgid "Charges for preparing pay packets"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_9
+msgid "Detail of 7. The records in a separate application keep type 9."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_426
+msgid "Belgian broker's commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_031
+msgid "Charges foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_002
+msgid "Interest paid"
+msgstr "Төлсөн хүү"
+
+#. module: account_coda
+#: field:account.coda.trans.type,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_62
+msgid ""
+"cheques debited on account, but debit cancelled afterwards for lack of cover "
+"(double debit/contra-entry of transaction 01 or 05)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_05
+msgid "Bill claimed back"
+msgstr "Тооцоо хийхийг шаардах"
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_016
+msgid "BLIW/IBLC dues"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:911
+#, python-format
+msgid "CODA File is Imported  :"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_066
+msgid "Fixed loan advance - reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_05
+msgid "Purchase of foreign bank notes"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:277
+#: code:addons/account_coda/wizard/account_coda_import.py:469
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid CODA Transaction Family : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_030
+msgid "Account insurance"
+msgstr "Дансны баталгаа"
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_042
+msgid "Payment card costs"
+msgstr "Төлбөрийн картын үнэ"
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_212
+msgid "Warehousing fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:300
+#, python-format
+msgid ""
+"Cannot delete CODA Bank Statement '%s' of Journal '%s'.\n"
+"The associated Bank Statement has already been confirmed !\n"
+"Please undo this action first!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_66
+msgid "Financial centralization"
+msgstr "Санхүүгийн нэгтгэл"
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_420
+msgid "Retention charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_50
+msgid "Transfer in your favour"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_87
+#: model:account.coda.trans.code,description:account_coda.actcc_04_87
+#: model:account.coda.trans.code,description:account_coda.actcc_05_87
+#: model:account.coda.trans.code,description:account_coda.actcc_07_87
+#: model:account.coda.trans.code,description:account_coda.actcc_09_87
+#: model:account.coda.trans.code,description:account_coda.actcc_11_87
+#: model:account.coda.trans.code,description:account_coda.actcc_13_87
+#: model:account.coda.trans.code,description:account_coda.actcc_30_87
+#: model:account.coda.trans.code,description:account_coda.actcc_35_87
+#: model:account.coda.trans.code,description:account_coda.actcc_41_87
+#: model:account.coda.trans.code,description:account_coda.actcc_43_87
+#: model:account.coda.trans.code,description:account_coda.actcc_47_87
+msgid "Reimbursement of costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_56
+msgid "Remittance of supplier's bill with guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_002
+msgid "Communication of the bank"
+msgstr "Банкны харилцаа холбоо"
+
+#. module: account_coda
+#: field:coda.bank.statement.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_70
+msgid "Only with stockbrokers when they deliver the securities to the bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_413
+msgid "Acceptance charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:144
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_39
+msgid "Return of an irregular bill of exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_011
+msgid "VAT"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_09
+msgid "Debit of the agios to the account of the drawee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.comm.type:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_comm_type_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_comm_type_form
+msgid "CODA Structured Communication Types"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_50
+msgid "Spot sale of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_58
+msgid "Remittance of supplier's bill without guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_03
+msgid "Payment receipt card"
+msgstr "Төлбөрийн картны баримт"
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_207
+msgid "Non-conformity fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_022
+msgid "Priority costs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:268
+#: code:addons/account_coda/wizard/account_coda_import.py:460
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid CODA Transaction Type : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_045
+msgid "Handling costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_47_13
+msgid "Debit customer, payment of agios, interest, exchange commission, etc."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_039
+msgid "Telecommunications"
+msgstr "Харилцаа холбоо"
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:399
+#, python-format
+msgid "Delete operation not allowed !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_000
+msgid "Net amount"
+msgstr "Эцсийн дүн"
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_11
+msgid "Department store cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_206
+msgid "Surety fee/payment under reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_53
+msgid "Cash deposit at an ATM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_52
+msgid "Forward sale of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_05
+msgid ""
+"Debit of the subscriber for the complementary payment of partly-paid shares"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Багц төлбөрийн мэдээлэл"
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_33
+#: model:account.coda.trans.code,description:account_coda.actcc_00_83
+msgid "Value correction"
+msgstr "Утга буруу"
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_27
+msgid "For publications of the financial institution"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_01
+msgid "Payment of foreign bill"
+msgstr "Гадаад төлбөр тооцоо"
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_024
+msgid "Growth premium"
+msgstr ""
+
+#. module: account_coda
+#: selection:account.coda.trans.code,type:0
+msgid "Transaction Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_13
+msgid "Discount foreign supplier's bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_05
+msgid "Direct debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_47_11
+msgid "Bills of lading"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_00
+msgid "Undefined transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_62
+msgid "When reimbursed separately to the subscriber"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.category:0
+msgid "CODA Transaction Category"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_067
+msgid "Fixed loan advance - extension"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_07
+msgid "Your repayment instalment credits"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_13
+msgid "On the account of the head office"
+msgstr ""
+
+#. module: account_coda
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_115
+msgid "Terminal cash deposit"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:301
+#: code:addons/account_coda/wizard/account_coda_import.py:493
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid Structured Communication Type : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_43_01
+msgid ""
+"Debit of a cheque in foreign currency or in EUR in favour of a foreigner"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_54
+msgid "Discount abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_62
+msgid "Remittance of documents abroad - credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_35
+#: model:account.coda.trans.code,description:account_coda.actcc_00_85
+msgid "Correction"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:404
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        No partner record assigned: There are multiple partners with the "
+"same Bank Account Number '%s'!\n"
+"        Please correct the configuration and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_33
+#: model:account.coda.trans.code,description:account_coda.actcc_30_83
+msgid "Value (date) correction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_063
+msgid "Rounding differences"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:295
+#: code:addons/account_coda/wizard/account_coda_import.py:487
+#, python-format
+msgid "Transaction Category unknown, please consult your bank."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.code:0
+msgid "CODA Transaction Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_052
+msgid "Residence state tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_17
+msgid "Amount of the cheque; if any, charges receive code 37"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_120
+msgid "Correction of a transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_64
+#: model:account.coda.trans.code,description:account_coda.actcc_41_64
+msgid "Transfer to your account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_124
+msgid "Number of the credit card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_13
+msgid "Renting of safes"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,find_bbacom:0
+msgid ""
+"Partner lookup via the 'BBA' Structured Communication field of the Invoice."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_104
+msgid "Equivalent in EUR"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_50
+msgid "Remittance of foreign bill credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_03
+msgid "Your purchase by payment card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_1
+msgid ""
+"Amount as totalised by the customer; e.g. a file regrouping payments of "
+"wages or payments made to suppliers or a file regrouping collections for "
+"which the customer is debited or credited with one single amount. As a "
+"matter of principle, this type is also used when no detailed data is "
+"following (type 5)."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:519
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on information data record 3.3, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.type,type:0
+msgid "Transaction Type"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "Object to store CODA Data Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_029
+msgid "Protest charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_053
+#: model:account.coda.trans.code,description:account_coda.actcc_80_43
+msgid "Printing of forms"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_003
+msgid "Credit commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_58
+msgid "Remittance of foreign cheque credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_8
+msgid "Detail of 3."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_05_58
+msgid ""
+"(cancellation of an undue debit of the debtor at the initiative of the "
+"financial institution or the debtor for lack of cover)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_11
+msgid "Payable coupons/repayable securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_50
+msgid "Sale of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_51
+msgid "Transfer in your favour – initiated by the bank"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,coda_data:0
+#: field:account.coda.import,coda_data:0
+msgid "CODA File"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_38
+msgid "Provisionally unpaid"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_003
+msgid "RBP data"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_06
+msgid "Share option plan – exercising an option"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_051
+msgid "Withholding tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_006
+msgid "Information concerning the detail amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_37
+msgid "Costs relating to payment of foreign cheques"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,parent_id:0
+msgid "Family"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_66
+msgid "Retrocession of issue commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_68
+msgid "Credit after Proton payments"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:588
+#: code:addons/account_coda/wizard/account_coda_import.py:926
+#, python-format
+msgid "CODA Import failed !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_01
+msgid ""
+"Withdrawal by counter cheque or receipt; cash remitted by the bank clerk"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_01
+msgid "Short-term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_01
+msgid "Domestic or local SEPA credit transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_03
+msgid "Settlement credit cards"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_402
+msgid "Certification costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_015
+msgid "Correspondent charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_415
+#: model:account.coda.trans.code,description:account_coda.actcc_80_39
+msgid "Surety fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_017
+#: model:account.coda.trans.code,description:account_coda.actcc_80_23
+#: model:account.coda.trans.code,description:account_coda.actcc_80_41
+msgid "Research costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_07
+msgid "Collective transfer"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:912
+#, python-format
+msgid ""
+"\n"
+"\n"
+"Number of statements : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_05
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_07
+msgid ""
+"The principal will be debited for the total amount of the file entered."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:332
+#: code:addons/account_coda/wizard/account_coda_import.py:357
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on movement data record 2.3, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_52
+msgid "Payment in your favour"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_08
+msgid "Registering compensation for savings accounts"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_51
+msgid "Company issues paper in return for cash"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,journal:0
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_19
+msgid "Settlement of credit cards"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_87
+msgid "Reimbursement of cheque-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_50
+msgid "Settlement of instalment credit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_52
+msgid "Payment by a third person"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_60
+msgid "Remittance of documents abroad - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_52
+msgid "Loading GSM cards"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+#: field:coda.bank.statement.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_end_real:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_64
+msgid "Your issue"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:870
+#, python-format
+msgid ""
+"\n"
+"\n"
+"Bank Journal: %s\n"
+"CODA Version: %s\n"
+"CODA Sequence Number: %s\n"
+"Paper Statement Sequence Number: %s\n"
+"Bank Account: %s\n"
+"Account Holder Name: %s\n"
+"Date: %s, Starting Balance:  %.2f, Ending Balance: %.2f%s"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_01
+msgid ""
+"Purchase of domestic or foreign securities, including subscription rights, "
+"certificates, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_38
+msgid "Costs relating to incoming foreign and non-SEPA transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_52
+msgid "Whatever the currency of the security"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_069
+msgid "Forward arbitrage contracts : sum to be supplied by customer"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:388
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        There is no invoice matching the Structured Communication '%s'!\n"
+"        Please verify and adjust the invoice and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_407
+msgid "Costs Article 45"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_007
+msgid "Information concerning the detail cash"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+#: field:coda.bank.account,company_id:0
+#: field:coda.bank.statement,company_id:0
+#: field:coda.bank.statement.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_35
+msgid "Cash advance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_47
+msgid "Foreign commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_15
+msgid ""
+"Hire-purchase agreement under which the financial institution is the lessor"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_66
+msgid "Remittance of cheque by your branch - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_50
+msgid "Credit of the remitter"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.category,category:0
+msgid "Transaction Category"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_09
+msgid "Purchase of petrol coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_52
+msgid "Remittance of foreign bill credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_061
+#: model:account.coda.trans.code,description:account_coda.actcc_80_47
+msgid "Charging fees for transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_category
+msgid "CODA transaction category"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_21
+msgid "Other credit applications"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_009
+msgid "Travelling expenses"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_30
+msgid "Various transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_406
+msgid "Collection charges"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_50
+msgid "Cash payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_27
+msgid "Subscription fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_036
+msgid "Costs relating to a refused cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_101
+msgid "Credit transfer or cash payment with structured format communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_127
+msgid "European direct debit (SEPA)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_068
+msgid "Countervalue of an entry"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_010
+#: model:account.coda.trans.code,description:account_coda.actcc_80_31
+msgid "Writ service fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:635
+#, python-format
+msgid ""
+"\n"
+"The CODA Statement %s Starting Balance (%.2f) does not correspond with the "
+"previous Closing Balance (%.2f) in journal %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_13
+msgid "Your repurchase of issue"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_409
+msgid "Safe deposit charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_055
+msgid "Repayment loan or credit capital"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_05
+msgid "Settlement of fixed advance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_15
+msgid ""
+"Commission collected to the debit of the customer to whom the bank delivers "
+"a key which gives access to the night safe"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_059
+msgid "Default interest"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,coda_st_naming:0
+msgid ""
+"Define the rules to create the name of the Bank Statements generated by the "
+"CODA processing.\n"
+"E.g. %(code)s%(y)s/%(paper)s\n"
+"\n"
+"Variables:\n"
+"Bank Journal Code: %(code)s\n"
+"Current Year with Century: %(year)s\n"
+"Current Year without Century: %(y)s\n"
+"CODA sequence number: %(coda)s\n"
+"Paper Statement sequence number: %(paper)s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_108
+#: model:account.coda.trans.code,description:account_coda.actcc_35_01
+#: model:account.coda.trans.code,description:account_coda.actcc_35_50
+msgid "Closing"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_05
+msgid "Commercial paper claimed back"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_411
+msgid "Fixed collection charge"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_64
+msgid "Your winning lottery ticket"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_009
+msgid ""
+"Identification of the de ultimate ordering customer/debtor (SEPA SCT/SDD)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_05
+msgid "Card charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_03
+msgid "Payment card charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_54
+msgid "Remittance of commercial paper for discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_01
+msgid "Payment"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_07
+msgid "Purchase of gold/pieces"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_15
+msgid "Balance due insurance premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_11
+msgid "Debit of the issuer by the bank in charge of the financial service"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_58
+msgid "Remittance of cheques, vouchers, etc. credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_19
+#: model:account.coda.trans.code,description:account_coda.actcc_09_68
+msgid "Difference in payment"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,date:0
+msgid "Entry Date"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:193
+#, python-format
+msgid ""
+"\n"
+"Please check if the 'Bank Account Number', 'Currency' and 'Account "
+"Description' fields of your configuration record match with '%s', '%s' and "
+"'%s' !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_58
+msgid "Idem without guarantee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:139
+#, python-format
+msgid ""
+"\n"
+"CODA File with Filename '%s' and Creation Date '%s' has already been "
+"imported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_63
+msgid "Second credit of unpaid cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_065
+msgid "Interest payment advice"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,type:0
+#: field:coda.bank.account,state:0
+#: field:coda.bank.statement,type:0
+#: field:coda.bank.statement.line,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_112
+msgid "ATM payment (usually Eurocheque card)"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,description1:0
+msgid "Primary Account Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_126
+msgid "Term investments"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_100
+msgid ""
+"(SEPA) payment with a structured format communication applying the ISO "
+"standard 11649: Structured creditor reference to remittan"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:164
+#, python-format
+msgid ""
+"\n"
+"Foreign bank accounts with IBAN structure are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_100
+msgid "Gross amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_62
+msgid "Reversal of cheques"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:299
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_64
+#: model:account.coda.trans.code,comment:account_coda.actcc_41_13
+#: model:account.coda.trans.code,comment:account_coda.actcc_41_64
+msgid "Intracompany"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_01
+msgid "Spot purchase of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_429
+msgid "Foreign Stock Exchange tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_05
+#: model:account.coda.trans.code,description:account_coda.actcc_05_54
+msgid "Reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:868
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_405
+msgid "Bill guarantee commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_06
+msgid "Extension"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_008
+msgid "Identification of the de ultimate beneficiary/creditor (SEPA SCT/SDD)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_49
+msgid "Foreign counter transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_01
+msgid "Cash withdrawal"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_37
+msgid ""
+"Fixed right, either one-off or periodical; for details, see \"categories\""
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_05
+msgid "Loading Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_21
+msgid "Pay-packet charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,transfer_account:0
+msgid "Default Internal Transfer Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_074
+msgid "Mailing costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_07
+msgid "Unpaid foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_07
+msgid "Payment by GSM"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: selection:coda.bank.account,state:0
+#: view:coda.bank.statement:0
+#: selection:coda.bank.statement,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_50
+msgid "Credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_80
+msgid "Separately charged costs and provisions"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: field:coda.bank.account,currency:0
+#: field:coda.bank.statement,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_06
+msgid "Extension of maturity date"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_15
+msgid "Night safe"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_214
+msgid "Issue commission (delivery order)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_07
+msgid ""
+"Often by standing order or direct debit. In case of direct debit, family 13 "
+"is used."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_01
+msgid "Loading a GSM card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_021
+msgid "Costs for drawing up a bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_026
+msgid "Handling commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_201
+msgid "Advice notice commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_64
+#: model:account.coda.trans.code,description:account_coda.actcc_47_64
+msgid "Warrant"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_07
+msgid "Unpaid commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:120
+#: code:addons/account_coda/wizard/account_coda_import.py:130
+#: code:addons/account_coda/wizard/account_coda_import.py:159
+#: code:addons/account_coda/wizard/account_coda_import.py:168
+#: code:addons/account_coda/wizard/account_coda_import.py:174
+#: code:addons/account_coda/wizard/account_coda_import.py:198
+#: code:addons/account_coda/wizard/account_coda_import.py:272
+#: code:addons/account_coda/wizard/account_coda_import.py:281
+#: code:addons/account_coda/wizard/account_coda_import.py:305
+#: code:addons/account_coda/wizard/account_coda_import.py:440
+#: code:addons/account_coda/wizard/account_coda_import.py:464
+#: code:addons/account_coda/wizard/account_coda_import.py:473
+#: code:addons/account_coda/wizard/account_coda_import.py:497
+#, python-format
+msgid "Data Error!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_010
+msgid "Information pertaining to sale or purchase of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_54
+msgid "Your payment ATM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_123
+msgid "Fees and commissions"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:689
+#, python-format
+msgid ""
+"Free Communication:\n"
+" %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_15
+msgid "Purchase of an international bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,coda_st_naming:0
+msgid "Bank Statement Naming Policy"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_00
+#: model:account.coda.trans.code,description:account_coda.actcc_30_39
+#: model:account.coda.trans.code,description:account_coda.actcc_30_89
+msgid "Undefined transaction"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_06
+msgid "Costs chargeable to the remitter"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_205
+msgid ""
+"Documentary payment commission | Document commission | Drawdown fee | "
+"Negotiation fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_60
+msgid "Settlement of mortgage loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_01
+msgid "Purchase of securities"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import Log"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_07
+msgid "Domestic commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_034
+msgid "Reinvestment fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_12
+msgid "Costs for opening a bank guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_414
+msgid "Regularisation charges"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement.line,statement_id:0
+#: model:ir.actions.act_window,name:account_coda.act_account_bank_statement_goto_coda_bank_statement
+#: model:ir.model,name:account_coda.model_coda_bank_statement
+msgid "CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_15
+msgid "Your repayment hire-purchase and similar claims"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_62
+msgid "Reversal of cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_032
+msgid "Drawing up a circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Seq"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_52
+msgid "Payment night safe"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_bank_statement
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_006
+msgid "Various fees/commissions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_209
+msgid "Transfer commission"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_39
+#: model:account.coda.trans.code,description:account_coda.actcc_00_89
+msgid "Cancellation of a transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_3
+msgid ""
+"Simple amount with detailed data; e.g. in case of charges for cross-border "
+"credit transfers."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_15
+msgid "Your purchase of lottery tickets"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_05
+msgid "Collective payments of wages"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_17
+msgid "Collected for unsealed deposit of securities, and other parcels"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_004
+msgid "Counterparty’s banker"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:426
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        No matching partner record found!\n"
+"        Please adjust the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,journal:0
+msgid "Bank Journal for the Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Globalisation"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_54
+msgid "Fixed advance – capital and interest"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_11
+msgid "Payment documents abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_09
+msgid ""
+"Postage recouped to the debit of the customer (including forwarding charges)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_04
+msgid "Costs for holding a documentary cash credit"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_13
+msgid "Settlement of bank acceptances"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_200
+msgid "Overall documentary credit charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_25
+msgid "Renting of direct debit box"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_52
+msgid ""
+"Payment of coupons from a deposit or settlement of coupons delivered over "
+"the counter - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement.line,globalisation_level:0
+msgid ""
+"The value which is mentioned (1 to 9), specifies the hierarchy level of the "
+"globalisation of which this record is the first.\n"
+"The same code will be repeated at the end of the globalisation."
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,description2:0
+msgid "Secondary Account Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_211
+msgid "Credit arrangement fee | Additional credit arrangement fee"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_statements
+#: model:ir.ui.menu,name:account_coda.menu_coda_bank_statements
+msgid "CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_62
+msgid "Term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_70
+msgid "Sale of traveller’s cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,name:0
+#: field:coda.bank.statement,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,coda_creation_date:0
+msgid "CODA Creation Date"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:583
+#: code:addons/account_coda/wizard/account_coda_import.py:904
+#, python-format
+msgid ""
+"\n"
+"Unknown Error : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_035
+msgid "Charges foreign documentary bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_39
+msgid "Agios on guarantees given"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_070
+msgid "Forward arbitrage contracts : sum to be supplied by bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_56
+#: model:account.coda.trans.code,description:account_coda.actcc_11_56
+msgid "Reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_23
+msgid ""
+"Costs charged for all kinds of research (information on past transactions, "
+"address retrieval, ...)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_14
+msgid "Handling costs instalment credit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_6
+msgid ""
+"Detail of 2. Simple amount without detailed data. Normally, data of this "
+"kind comes after type 2. The customer may ask for a separate file containing "
+"the detailed data. In that case, one will speak of a ‘separate application’. "
+"The records in a separate application keep type 6."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_17
+msgid "Financial centralisation"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_404
+msgid "Discount commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_45
+msgid "Documentary credit charges"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:913
+#, python-format
+msgid ""
+"\n"
+"Number of errors : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_22
+msgid "Management/custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_51
+msgid "Tender"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_56
+msgid "Non-presented certified cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_408
+msgid "Cover commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_071
+msgid "Fixed loan advance - availability"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+#: field:account.coda.import,coda_fname:0
+msgid "CODA Filename"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_31
+msgid "E.g. for signing invoices"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_37
+msgid "Various costs for possessing or using a payment card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_37
+msgid "Costs related to commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_043
+#: model:account.coda.trans.code,description:account_coda.actcc_80_07
+msgid "Insurance costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_431
+msgid "Delivery of a copy"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,transfer_account:0
+msgid ""
+"Set here the default account that will be used for internal transfer between "
+"own bank accounts (e.g. transfer between current and deposit bank accounts)."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: view:coda.bank.account:0
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:580
+#: code:addons/account_coda/wizard/account_coda_import.py:897
+#, python-format
+msgid ""
+"\n"
+"System Error : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_60
+msgid "Non-presented circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,line_ids:0
+msgid "CODA Bank Statement lines"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.coda:0
+msgid "This CODA has already been imported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_19
+msgid "Documentary import credits"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:320
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on movement data record 2.2, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_001
+msgid "Data concerning the counterparty"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.comm.type:0
+msgid "CODA Structured Communication Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_07
+msgid "Contra-entry of a direct credit or of a discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_55
+msgid "Interest term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_007
+#: model:account.coda.trans.code,description:account_coda.actcc_80_37
+msgid "Access right to database"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_type
+msgid "CODA transaction type"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_37
+msgid "Costs relating to the payment of a foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_13
+msgid "Eurocheque written out abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_01
+msgid "Capital and/or interest (specified by the category)"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_17
+msgid "Charge for safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_102
+msgid ""
+"Credit transfer or cash payment with reconstituted structured format "
+"communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_86
+msgid "Payment after cession"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_14
+#: model:account.coda.trans.code,description:account_coda.actcc_47_14
+msgid "Warrant fallen due"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_imported_coda_files
+#: model:ir.ui.menu,name:account_coda.menu_imported_coda_files
+msgid "Imported CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_29
+msgid "Charges collected for: - commercial information - sundry information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_15
+msgid "In case of subscription before the interest due date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_43
+msgid "Foreign cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_62
+msgid "Sale of gold/pieces under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_51
+msgid "The bank takes the initiative for crediting the customer’s account."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_05
+msgid "Full or partial reimbursement of a fixed advance at maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_26
+msgid "Travel insurance premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_416
+msgid "Charges for the deposit of security"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_04
+msgid "At home as well as abroad"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:192
+#, python-format
+msgid ""
+"\n"
+"No matching CODA Bank Account Configuration record found !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_50
+msgid "Remittance of commercial paper - credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Search CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_410
+msgid "Reclamation charges"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,help:account_coda.action_coda_bank_statements
+msgid ""
+"The CODA Bank Statements contain the information encoded in their "
+"originating CODA file in a human readable format. The Bank Statements "
+"associated with a CODA contain the subset of the CODA Bank Statement data "
+"that is required for the creation of the Accounting Entries."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_114
+msgid "POS credit - individual transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_70
+msgid "Settlement of discount bank acceptance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_02
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_08
+msgid "Eurozone = countries which have the euro as their official currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_02
+msgid "The bank takes the initiative for debiting the customer’s account."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_58
+msgid "Reversal"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: selection:coda.bank.account,state:0
+#: view:coda.bank.statement:0
+#: selection:coda.bank.statement,type:0
+msgid "Info"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_02
+msgid "Costs relating to electronic output"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.coda.comm.type:0
+msgid "The Structured Communication Code must be unique !"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:57
+#, python-format
+msgid "Wizard in incorrect state. Please hit the Cancel button!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_418
+msgid "Endorsement commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_005
+msgid "Renting of letterbox"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_13
+msgid "Commission for renting a safe deposit box"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_39
+msgid "To be used for issued circular cheques given in consignment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_11
+msgid "Securities"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Free Communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_2
+msgid ""
+"Amount as totalised by the bank; e.g. : the total amount of a series of "
+"credit transfers with a structured communication As a matter of principle, "
+"this type will also be used when no detailed data (type 6 or 7) is following."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_37
+msgid "Cheque-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_033
+msgid "Charges for a foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_13
+msgid "Cash withdrawal by your branch or agents"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_049
+msgid "Fiscal stamps/stamp duty"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_58
+msgid ""
+"Also for vouchers, postal orders, anything but bills of exchange, "
+"acquittances, promissory notes, etc."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Select Your File :"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_06
+msgid "Damage relating to bills and cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_09
+msgid "Unpaid voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_13
+msgid "Unissued part (see 64)"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+#: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_1
+#: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_2
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Import CODA File"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:289
+#: code:addons/account_coda/wizard/account_coda_import.py:481
+#, python-format
+msgid "Transaction Code unknown, please consult your bank."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_55
+msgid "Fixed advance – interest only"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.type:0
+msgid "CODA Transaction Type"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_level:0
+msgid "Globalisation Level"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_020
+msgid "Costs of physical delivery"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_60
+msgid "Sale of foreign bank notes"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_52
+msgid "Remittance of commercial paper - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the Bank "
+"Account without removing it."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_54
+msgid "Among other things advances or promissory notes"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_10
+msgid "Purchase of Smartcard"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:664
+#, python-format
+msgid ""
+"Transaction Type: %s - %s\n"
+"Transaction Family: %s - %s\n"
+"Transaction Code: %s - %s\n"
+"Transaction Category: %s - %s\n"
+"Structured Communication Type: %s - %s\n"
+"Communication: %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_208
+msgid "Commitment fee deferred payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_005
+msgid "Data concerning the correspondent"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_66
+msgid "For professionals such as insurances and stockbrokers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_19
+msgid ""
+"Collected for securities, gold, pass-books, etc. placed in safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_19
+msgid ""
+"Used in case of payments accepted under reserve of count, result of "
+"overcrediting"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:630
+#, python-format
+msgid ""
+"\n"
+"Configuration Error in journal %s!\n"
+"Please verify the Default Debit and Credit Account settings."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_09
+msgid "Agio on supplier's bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_213
+msgid "Financing fee"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement.line.global,coda_statement_line_ids:0
+msgid "CODA Bank Statement Lines"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:170
+#, python-format
+msgid ""
+"\n"
+"Unsupported bank account structure !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_037
+msgid "Commission for handling charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_03
+msgid "Subscription to securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_425
+msgid "Foreign broker's commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_7
+msgid ""
+"Detail of 2. Simple account with detailed data The records in a separate "
+"application keep type 7."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_125
+#: model:account.coda.trans.code,description:account_coda.actcf_13
+#: view:coda.bank.statement.line:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:155
+#, python-format
+msgid ""
+"\n"
+"Foreign bank accounts with BBAN structure are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_09
+msgid "Counter transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_coda_bank_statement_line
+msgid "CODA Bank Statement Line"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_17
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_66
+msgid ""
+"In case of centralisation by the bank, type 2 will be allotted to this "
+"transaction. This total can be followed by the detailed movement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_057
+msgid "Interest subsidy"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_41
+msgid "International credit transfers - non-SEPA credit transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_87
+msgid "Overall amount, VAT included"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_01
+msgid "Payment of a foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "General"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:856
+#, python-format
+msgid ""
+"\n"
+"Incorrect ending Balance in CODA Statement %s for Bank Account %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_04
+msgid "Issues"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_37
+msgid ""
+"If any, detail in the category (e.g. costs for presentation for acceptance, "
+"etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_17
+msgid "Purchase of fiscal stamps"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_01
+#: model:account.coda.trans.code,description:account_coda.actcc_41_50
+msgid "Transfer"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "View Bank Statement(s)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_20
+msgid "Drawing up a certificate"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_013
+msgid "Payment commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_01
+msgid ""
+"Bills of exchange, acquittances, promissory notes; debit of the drawee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "View CODA Bank Statement(s)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_15
+msgid "Your purchase bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_05
+msgid "Payment of voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_68
+msgid "Documentary export credits"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,find_bbacom:0
+msgid "Lookup Invoice"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_03
+msgid "Cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_56
+msgid "Unexecutable reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_03
+msgid "Unpaid debt"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_52
+msgid ""
+"First credit of cheques, vouchers, luncheon vouchers, postal orders, credit "
+"under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_05
+msgid ""
+"Bill claimed back at the drawer's request (bill claimed back before maturity "
+"date)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_11
+msgid ""
+"Costs chargeable to clients who ask to have their correspondence kept at "
+"their disposal at the bank's counter"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_64
+msgid ""
+"Amount paid to the issuer by the bank in charge of the placement (firm "
+"underwriting or not); also used for the payment in full of partly-paid "
+"shares, see transaction 05"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_15
+msgid "Cheque drawn by the bank on itself, usually with charges."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_072
+msgid "Countervalue of commission to third party"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_01
+msgid "Individual transfer order"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:436
+#, python-format
+msgid ""
+"\n"
+"Movement data records of type 2.%s are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_02
+msgid "Payment by means of a payment card within the Eurozone"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_01
+msgid ""
+"Credit transfer given by the customer on paper or electronically, even if "
+"the execution date of this transfer is in the future. Domestic payments as "
+"well as euro payments meeting the requirements."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_35
+msgid "Closing (periodical settlements for interest, costs,…)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_51
+msgid "Unloading Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_019
+msgid "Tax on physical delivery"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,statement_id:0
+msgid "Associated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_08
+msgid ""
+"Debit of the remitter when the drawee pays in advance directly to the "
+"remitter (regards bank acceptances)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_103
+msgid "number (e.g. of the cheque, of the card, etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_24
+msgid "Participation in and management of interest refund system"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_58
+msgid "Payment by your branch/agents"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_25
+#: model:account.coda.trans.code,description:account_coda.actcc_43_70
+msgid "Purchase of traveller’s cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_39
+msgid "Your issue circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_09
+msgid ""
+"For professionals (stockbrokers) only, whoever the issuer may be (Belgian or "
+"foreigner)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_33
+msgid ""
+"Costs not specified otherwise, often with a manual communication (e.g. for "
+"collecting, ordering funds). VAT excluded = type 0 VAT included = type 3 (at "
+"least 3 articles)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_023
+msgid "Exercising fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:934
+#, python-format
+msgid "Import CODA File result"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_111
+msgid "POS credit – Globalisation"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:577
+#, python-format
+msgid ""
+"\n"
+"Application Error : "
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,description1:0
+#: help:coda.bank.account,description2:0
+msgid ""
+"The Primary or Secondary Account Description should match the corresponding "
+"Account Description in the CODA file."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_17
+msgid "Management fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_03
+msgid "Cash withdrawal by card (ATM)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_16
+msgid "Bank confirmation to revisor or accountant"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_04
+msgid "Cards"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.type:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_type_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_type_form
+msgid "CODA Transaction Types"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_50
+msgid "Credit after a payment at a terminal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_02
+msgid "Long-term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_05
+#: model:account.coda.trans.code,description:account_coda.actcc_30_54
+msgid "Capital and/or interest term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_68
+msgid "Credit of a payment via electronic purse"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_028
+msgid "Fidelity premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_39
+msgid "Provisionally unpaid due to other reason than manual presentation"
+msgstr ""
+
+#. module: account_coda
+#: constraint:coda.bank.account:0
+msgid ""
+"\n"
+"\n"
+"Configuration Error! \n"
+"The Bank Account Currency should match the Journal Currency !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_35
+msgid ""
+"Costs charged for calculating the amount of the tax to be paid (e.g. "
+"Fiscomat)."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_014
+msgid "Collection commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_52
+msgid "Remittance of foreign cheque credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_03
+msgid "See annexe III : communication 124"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:420
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        The bank account '%s' is not defined for the partner '%s'!\n"
+"        Please correct the configuration and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_113
+msgid "ATM/POS debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_03
+msgid "Forward purchase of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_50
+msgid "Credit of a payment via terminal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_52
+msgid "Credit provider"
+msgstr ""
+
+#. module: account_coda
+#: selection:account.coda.trans.code,type:0
+msgid "Transaction Family"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_68
+msgid "In case coupons attached to a purchased security are missing"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:57
+#: code:addons/account_coda/wizard/account_coda_import.py:325
+#: code:addons/account_coda/wizard/account_coda_import.py:337
+#: code:addons/account_coda/wizard/account_coda_import.py:362
+#: code:addons/account_coda/wizard/account_coda_import.py:513
+#: code:addons/account_coda/wizard/account_coda_import.py:524
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement,type:0
+msgid ""
+"No Bank Statements are associated with CODA Bank Statements of type 'Info'."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_58
+msgid ""
+"Takes priority over transaction 52 (hence a payment made by an agent in a "
+"night safe = 58 and not 52)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_121
+msgid "Commercial bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_11
+msgid "Costs for the safe custody of correspondence"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_041
+msgid "Credit card costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_56
+msgid "Subsidy"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_06
+msgid "Payment with tank card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_107
+msgid "Direct debit – DOM’80"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_60
+msgid "Reversal of voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_87
+msgid "Costs refunded"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_17
+msgid "Financial centralisation (debit)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_02
+msgid "Payment to the bank on maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_025
+msgid "Individual entry for exchange charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_004
+#: model:account.coda.trans.code,description:account_coda.actcc_80_09
+msgid "Postage"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_50
+msgid ""
+"For own account - the comment for the client is given in the communication; "
+"also for mixed payments (cash + cheques) - not to be communicated to the "
+"clients; for payments made by a third person: see family 01"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_68
+msgid ""
+"In case of payment accepted under reserve of count; result of undercrediting "
+"- see also transaction 19"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,bank_id:0
+msgid ""
+"Bank Account Number.\n"
+"The CODA import function will find its CODA processing parameters on this "
+"number."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_05
+msgid "Payment of wages, etc."
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:coda.bank.account:0
+msgid ""
+"The combination of Bank Account, Account Description and Currency must be "
+"unique !"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_10
+msgid "Renewal of agreed maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_55
+msgid "Income from payments by GSM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_19
+msgid "Regularisation costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_13
+#: model:account.coda.trans.code,description:account_coda.actcc_41_13
+msgid "Transfer from your account"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,currency:0
+#: help:coda.bank.statement,currency:0
+msgid "The currency of the CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_07
+msgid "Collective transfers"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:116
+#, python-format
+msgid ""
+"\n"
+"CODA V%s statements are not supported, please contact your bank!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_427
+msgid "Belgian Stock Exchange tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_12
+msgid "Safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_001
+msgid "Interest received"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_105
+msgid "original amount of the transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_09
+msgid "Your semi-standing order"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:508
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on information data record 3.2, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_09
+#: model:account.coda.trans.code,description:account_coda.actcc_11_70
+msgid "Settlement of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_01
+msgid "Debit customer who is loading"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_047
+msgid "Charges extension bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_18
+msgid "Trade information"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_203
+msgid ""
+"Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | "
+"Confirmation reservation commission | Additional reservation commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_027
+msgid "Charges for unpaid bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_204
+msgid "Amendment fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_11
+msgid "Your semi-standing order – payment to employees"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "CODA Processing"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_11
+msgid "Your repayment mortgage loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_37
+#: model:account.coda.trans.code,description:account_coda.actcc_01_37
+#: model:account.coda.trans.code,description:account_coda.actcc_04_37
+#: model:account.coda.trans.code,description:account_coda.actcc_05_37
+#: model:account.coda.trans.code,description:account_coda.actcc_09_37
+#: model:account.coda.trans.code,description:account_coda.actcc_11_37
+#: model:account.coda.trans.code,description:account_coda.actcc_30_37
+#: model:account.coda.trans.code,description:account_coda.actcc_35_37
+#: model:account.coda.trans.code,description:account_coda.actcc_80_35
+msgid "Costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_050
+msgid "Capital term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_05
+msgid "Payment of holiday pay, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_25
+msgid ""
+"Commission for the renting of boxes put at the disposal for the "
+"correspondence"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_008
+#: model:account.coda.trans.code,description:account_coda.actcc_80_29
+msgid "Information charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_03
+msgid ""
+"Credit transfer for which the order has been given once and which is carried "
+"out again at regular intervals without any change."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_0
+msgid ""
+"Simple amount without detailed data; e.g. : an individual credit transfer "
+"(free of charges)."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,find_partner:0
+msgid "Partner lookup via Bank Account Number."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_403
+msgid "Minimum discount rate"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_56
+msgid "Remittance of guaranteed foreign supplier's bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_02
+msgid "Tenders"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_07
+msgid "Unpaid foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_03
+msgid ""
+"Bonds, shares, tap issues of CDs, with or without payment of interest, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_66
+msgid "Repurchase of petrol coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_058
+msgid "Capital premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_15
+#: model:account.coda.trans.code,description:account_coda.actcc_11_62
+msgid "Interim interest on subscription"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_202
+msgid "Advising commission | Additional advising commission"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,find_partner:0
+msgid "Lookup Partner"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_statement_line
+#: model:ir.ui.menu,name:account_coda.coda_bank_statement_line
+msgid "CODA Statement Lines"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_amount:0
+msgid "Globalisation Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_13
+msgid ""
+"Transfer from one account to another account of the same customer at the "
+"bank's or the customer's initiative (intracompany)."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:890
+#, python-format
+msgid ""
+"\n"
+"Error ! "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_code
+msgid "CODA transaction code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_52
+msgid "Credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:125
+#, python-format
+msgid ""
+"\n"
+"The CODA creation date doesn't fall within a defined Accounting Period!\n"
+"Please create the Accounting Period for date %s."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_50
+msgid "Except Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_011
+msgid "Information pertaining to coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_122
+msgid "Bills - calculation of interest"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.code:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_code_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_code_form
+msgid "CODA Transaction Codes"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,state:0
+msgid ""
+"No Bank Statements will be generated for CODA Bank Statements from Bank "
+"Accounts of type 'Info'."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_49_03
+msgid "ATM withdrawal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_012
+msgid "Exchange commission"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_account_form
+#: model:ir.model,name:account_coda.model_coda_bank_account
+#: model:ir.ui.menu,name:account_coda.menu_action_coda_bank_account_form
+msgid "CODA Bank Account Configuration"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:724
+#, python-format
+msgid ""
+"Partner name: %s \n"
+"Partner Account Number: %s\n"
+"Transaction Type: %s - %s\n"
+"Transaction Family: %s - %s\n"
+"Transaction Code: %s - %s\n"
+"Transaction Category: %s - %s\n"
+"Structured Communication Type: %s - %s\n"
+"Communication: %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_04
+msgid "Cash withdrawal from an ATM"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_end:0
+msgid "Balance"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_statement_id:0
+msgid "Associated CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_37
+msgid "Credit-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_manage_coda
+msgid "CODA Configuration"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_39
+msgid "Debit of the drawer after credit under usual reserve or discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_66
+msgid "Financial centralisation (credit)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_08
+msgid "Payment in advance"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_19
+msgid "Special charge for safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_01
+msgid "Payment of your cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_43_07
+msgid "Foreign cheque remitted for collection that returns unpaid"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_07
+msgid ""
+"- insurance costs of account holders against fatal accidents - passing-on of "
+"several insurance costs"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,awaiting_account:0
+msgid ""
+"Set here the default account that will be used if the partner cannot be "
+"unambiguously identified."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:280
+#, python-format
+msgid "No CODA Bank Statement found for this Bank Statement!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_07
+msgid "Definitely unpaid cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_08
+msgid "Payment by means of a payment card outside the Eurozone"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_106
+msgid ""
+"Method of calculation (VAT, withholding tax on income, commission, etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_comm_type
+msgid "CODA structured communication type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_64
+msgid "Reversal of settlement of credit card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_58
+msgid ""
+"Repayable securities from a deposit or delivered at the counter - credit "
+"under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_5
+msgid ""
+"Detail of 1. Standard procedure is no detailing. However, the customer may "
+"ask for detailed data to be included into his file after the overall record "
+"(type 1)."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.comm.type,description:0
+#: field:account.coda.trans.category,description:0
+#: field:account.coda.trans.code,description:0
+#: field:account.coda.trans.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_01
+msgid "Payment commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_419
+msgid "Bank service fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_37
+msgid "Costs relating to outgoing foreign transfers and non-SEPA transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_17
+msgid "Your certified cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_400
+msgid "Acceptance fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_68
+msgid "Compensation for missing coupon"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_33
+msgid "Miscellaneous fees and commissions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_03
+#: model:account.coda.trans.code,description:account_coda.actcc_41_03
+msgid "Standing order"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Customer"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_49
+#: model:account.coda.trans.code,description:account_coda.actcc_01_99
+#: model:account.coda.trans.code,description:account_coda.actcc_03_49
+#: model:account.coda.trans.code,description:account_coda.actcc_03_99
+#: model:account.coda.trans.code,description:account_coda.actcc_04_49
+#: model:account.coda.trans.code,description:account_coda.actcc_04_99
+#: model:account.coda.trans.code,description:account_coda.actcc_05_49
+#: model:account.coda.trans.code,description:account_coda.actcc_05_99
+#: model:account.coda.trans.code,description:account_coda.actcc_07_49
+#: model:account.coda.trans.code,description:account_coda.actcc_07_99
+#: model:account.coda.trans.code,description:account_coda.actcc_09_49
+#: model:account.coda.trans.code,description:account_coda.actcc_09_99
+#: model:account.coda.trans.code,description:account_coda.actcc_11_49
+#: model:account.coda.trans.code,description:account_coda.actcc_11_99
+#: model:account.coda.trans.code,description:account_coda.actcc_13_49
+#: model:account.coda.trans.code,description:account_coda.actcc_13_99
+#: model:account.coda.trans.code,description:account_coda.actcc_30_49
+#: model:account.coda.trans.code,description:account_coda.actcc_30_99
+#: model:account.coda.trans.code,description:account_coda.actcc_35_49
+#: model:account.coda.trans.code,description:account_coda.actcc_35_99
+#: model:account.coda.trans.code,description:account_coda.actcc_41_49
+#: model:account.coda.trans.code,description:account_coda.actcc_41_99
+#: model:account.coda.trans.code,description:account_coda.actcc_43_49
+#: model:account.coda.trans.code,description:account_coda.actcc_43_99
+#: model:account.coda.trans.code,description:account_coda.actcc_47_49
+#: model:account.coda.trans.code,description:account_coda.actcc_47_99
+#: model:account.coda.trans.code,description:account_coda.actcc_80_49
+#: model:account.coda.trans.code,description:account_coda.actcc_80_99
+msgid "Cancellation or correction"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: field:coda.bank.account,bank_id:0
+#: field:coda.bank.statement,coda_bank_account_id:0
+#: view:coda.bank.statement.line:0
+#: field:coda.bank.statement.line,coda_bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_56
+msgid "Interest or capital subsidy"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_62
+msgid "Unpaid postal order"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_428
+msgid "Interest accrued"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.comm.type,code:0
+msgid "Structured Communication Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_401
+msgid "Visa charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_210
+msgid "Commitment fee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.category:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_category_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_category_form
+msgid "CODA Transaction Categories"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,coda_id:0
+#: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_coda
+msgid "CODA Data File"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "CODA Statement Line"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_073
+msgid "Costs of ATM abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_018
+msgid "Tental guarantee charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_430
+msgid "Recovery of foreign tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_01
+msgid "Guarantee card charges"
+msgstr ""
diff --git a/addons/base_crypt/i18n/nl_BE.po b/addons/base_crypt/i18n/nl_BE.po
new file mode 100644
index 00000000000..138cd6d9d16
--- /dev/null
+++ b/addons/base_crypt/i18n/nl_BE.po
@@ -0,0 +1,47 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-26 17:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-27 05:23+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "U kunt geen twee gebruikers met dezelfde login maken."
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"De gekozen firma behoort niet tot de toegelaten bedrijven voor deze "
+"gebruiker."
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Please specify the password !"
+msgstr "Gelieve een wachtwoord op te geven"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Error"
+msgstr "Fout"
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index c4862d6d5ea..d1e9fe3c169 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:23+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2012-07-26 16:28+0000\n"
+"Last-Translator: Michael Otcheskih <otma@mail.ru>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:01+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-27 05:22+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -891,7 +891,7 @@ msgstr "В разработке"
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Несоответствие категорий единиц измерения!"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template

From 6e625b12b74133e74db8bf7c01dc035c80d1277a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 27 Jul 2012 10:52:45 +0200
Subject: [PATCH 244/312] [FIX] mrp: in mrp orders, you may want to build
 occasionally products that are set with a different supply method than
 'produce'. In particular, in a multi-company invironement where a company is
 manufacturing products for another... As suggested in the bug report, i
 replaced the domain to filer only products that have at least one BoM defined

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

bzr revid: qdp-launchpad@openerp.com-20120727085245-jp8zw8ub01rp9oj3
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2d3e90c341a..be33b0e4e81 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -653,7 +653,7 @@
                 <sheet>
                     <label for="product_id" class="oe_edit_only"/>
                     <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_inline"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False)]" class="oe_inline"/>
                     </h1>
                     <label for="product_qty" class="oe_edit_only"/>
                     <h2>

From 610f9b508bf837a72cc34ccd8d3b85b38dca560f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 27 Jul 2012 11:10:29 +0200
Subject: [PATCH 245/312] [FIX] stock: type field of stock.picking should
 always be readonly and set by the domain

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

bzr revid: qdp-launchpad@openerp.com-20120727091029-thc4afv79r3jbtgd
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 6d8f6bb6fec..9752f0c78f4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -619,7 +619,7 @@ class stock_picking(osv.osv):
         'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
         'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Shipping type specify, goods coming in or going out."),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."),
         'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Location', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Keep empty if you produce at the location where the finished products are needed." \

From 45951a0a49d1bec94789a3e8f703a4d179152178 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 27 Jul 2012 11:34:01 +0200
Subject: [PATCH 246/312] [FIX] I AM IN YUR TRNK FIXIN YUR BUGS.

bzr revid: vmt@openerp.com-20120727093401-fao4a7dvpa3fkcjn
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 10f44a54f11..2e22b8b64c5 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -230,7 +230,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         } else {
             widget = new instance.web.ViewManagerAction(this, action);
             klass = 'oe_act_window';
-            add_breadcrumb = widget.add_breadcrumb
+            add_breadcrumb = widget.proxy('add_breadcrumb');
         }
         if (action.target === 'new') {
             if (this.dialog === null) {

From 4fca220ff1776eff7829102b4fe8f09fa3157f50 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 27 Jul 2012 11:55:17 +0200
Subject: [PATCH 247/312] Fixed focus problems

bzr revid: nicolas.vanhoren@openerp.com-20120727095517-xxpinz8iw5zisvaj
---
 addons/web/static/src/js/view_form.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 7f802be2100..2aa265efbe8 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -267,7 +267,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         if (this.$pager) {
             this.$pager.show();
         }
-        this.$element.show().css('visibility', 'hidden');
         this.$element.add(this.$buttons).removeClass('oe_form_dirty');
 
         var shown = this.has_been_loaded;
@@ -286,7 +285,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             if (options.editable) {
                 self.to_edit_mode();
             }
-            self.$element.css('visibility', 'visible');
         });
     },
     do_hide: function () {
@@ -2062,7 +2060,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
         return this.get('value') === '' || this._super();
     },
     focus: function() {
-        this.delay_focus(this.$element.find('input:first'));
+        this.$element.find('input:first')[0].focus();
     }
 });
 

From 922f565eb7d889a1bb917f3c7ab24e7d0fb8f39a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 27 Jul 2012 14:24:40 +0200
Subject: [PATCH 248/312] [FIX] mrp: fix of the fix made 2 commits ago about
 the domain products in mrp orders.

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

bzr revid: qdp-launchpad@openerp.com-20120727122440-sju60sv1dqsr1tlm
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index be33b0e4e81..3177d578997 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -653,7 +653,7 @@
                 <sheet>
                     <label for="product_id" class="oe_edit_only"/>
                     <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False)]" class="oe_inline"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
                     </h1>
                     <label for="product_qty" class="oe_edit_only"/>
                     <h2>

From e3793fd82f74d4c027b559f13a9e4b46953db117 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 27 Jul 2012 14:25:39 +0200
Subject: [PATCH 249/312] [IMP] in the contact form, the e-mail field is always
 visible and if the current user isn't anonymous, will prefilled with his
 e-mail also replace placeholders by labels

bzr revid: abo@openerp.com-20120727122539-5009v5nbsez26eel
---
 addons/portal_crm/wizard/contact.py       | 61 +++++++++++++++++------
 addons/portal_crm/wizard/contact_view.xml | 18 +++----
 2 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 3cf2adac98d..505bb62bb16 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -1,4 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
 
 class crm_contact_us(osv.TransientModel):
     """ Create new leads through the "contact us" form """
@@ -9,13 +31,32 @@ class crm_contact_us(osv.TransientModel):
         'company_ids' : fields.many2many('res.company', string='Companies', readonly=True),
     }
 
-    """ Little trick to display companies in our wizard view """
     def _get_companies(self, cr, uid, context=None):
+        """
+        Fetch companies in order to display them in the wizard view
+
+        @return a list of ids of the companies
+        """
         r = self.pool.get('res.company').search(cr, uid, [], context=context)
         return r
 
+    def _get_current_user_email(self, cr, uid, context=None):
+        """
+        If the user is logged in (i.e. not anonymous), get the user's email to
+        pre-fill the email_from field.
+
+        @return current user's email if the user isn't "anonymous", None otherwise
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+
+        if (user.login != 'anonymous'):
+            return user.user_email
+        else:
+            return None
+
     _defaults = {
-        'company_ids' : _get_companies
+        'email_from' : _get_current_user_email,
+        'company_ids' : _get_companies,
     }
 
     def create(self, cr, uid, values, context=None):
@@ -33,21 +74,11 @@ class crm_contact_us(osv.TransientModel):
         models implied (like mail.thread, among others, that performs a read
         when its create() method is called (in method message_get_subscribers()),
         it is quite complicated to set proper rights for this object.
-        Therefore, user #1 will perform the creation until a better workaround
-        is figured out.
+        Therefore, user SUPERUSER_ID will perform the creation until a better
+        workaround is figured out.
         """
         values['contact_name'] = values['name']
-
-        """
-        The email_from field only makes sense if the form is submitted by an
-        anonymous user; otherwise it should be the current user's email.
-        """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-
-        if (user.login != 'anonymous'):
-            values['email_from'] = user.user_email
-
-        crm_lead.create(cr, 1, dict(values,user_id=False), context)
+        crm_lead.create(cr, SUPERUSER_ID, dict(values,user_id=False), context)
 
         """
         Create an empty record in the portal_crm.crm_contact_us table.
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 5414c8d6ccc..96d55722752 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -15,16 +15,14 @@
                           <tr>
                             <td width="70%%">
                                 <div class="oe_portal_crm_contact_form">
-                                    <field name="name" placeholder="Name"/>
-                                    <field name="partner_name" placeholder="Company"/>
-                                    <!--
-                                        The email field only makes sense for the anonymous user.
-                                        In other cases, it's auto-filled in the python code.
-                                    -->
-                                    <field name="email_from" placeholder="Email" groups="anonymous.group_anonymous"/>
-                                    <field name="phone" placeholder="Phone"/>
-                                    <field name="description" placeholder="Your question"/>
-                                    <button string="Submit" name="submit" type="object"/>
+                                    <group>
+                                        <field name="name"/>
+                                        <field name="partner_name"/>
+                                        <field name="email_from"/>
+                                        <field name="phone"/>
+                                        <field name="description"/>
+                                        <button string="Submit" name="submit" type="object"/>
+                                    </group>
                                 </div>
                             </td>
                             <td>

From 094ecdc453562dd092725c1b23602df74902debe Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 27 Jul 2012 15:26:53 +0200
Subject: [PATCH 250/312] [FIX] problem with drop downs

bzr revid: nicolas.vanhoren@openerp.com-20120727132653-47y0alrcwtwkwmyv
---
 addons/web/static/src/js/chrome.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index a1759397e21..7c4cdf969f1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -896,7 +896,8 @@ instance.web.Client = instance.web.Widget.extend({
         this.$element.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
             var $toggle = $(this);
-            var $menu = $toggle.parent().find('.oe_dropdown_menu');
+            var $menu = $toggle.siblings('.oe_dropdown_menu');
+            $menu = $menu.size() >= 1 ? $menu : $toggle.find('.oe_dropdown_menu');
             var state = $menu.is('.oe_opened');
             setTimeout(function() {
                 // Do not alter propagation

From faefa5b4e704e5e8d0a4c658772b13791f7921dd Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 27 Jul 2012 16:03:53 +0200
Subject: [PATCH 251/312] [IMP] put groups attribute on delivery orders' form
 view in order to hide shipping type and auto picking from portal users

bzr revid: abo@openerp.com-20120727140353-0pi01egg5n7rbb8d
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c4655e5502c..098b6ea14c8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -867,8 +867,8 @@
                             <group>
                                 <group>
                                     <field name="move_type"/>
-                                    <field name="type"/>
-                                    <field name="auto_picking"/>
+                                    <field name="type" groups="base.group_user"/>
+                                    <field name="auto_picking" groups="base.group_user"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>

From b9606f611b9d1d7a7bd9a4be2c91f89dd2316342 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 27 Jul 2012 16:27:37 +0200
Subject: [PATCH 252/312] [IMP] rename portal_hr_employee_view.xml into
 hr_employee_view.xml

bzr revid: abo@openerp.com-20120727142737-322wskysn6rdk2da
---
 addons/portal_hr_employees/__openerp__.py                       | 2 +-
 addons/portal_hr_employees/hr_employee.py                       | 2 +-
 .../{portal_hr_employee_view.xml => hr_employee_view.xml}       | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename addons/portal_hr_employees/{portal_hr_employee_view.xml => hr_employee_view.xml} (100%)

diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py
index b7c25c2274f..ec883e78acf 100644
--- a/addons/portal_hr_employees/__openerp__.py
+++ b/addons/portal_hr_employees/__openerp__.py
@@ -32,7 +32,7 @@ portal_crm (which creates the contact page) are installed.
     'author': 'OpenERP SA',
     'depends': ['hr','portal_crm'],
     'data': [
-        'portal_hr_employee_view.xml',
+        'hr_employee_view.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py
index a4630ba3b3e..2247dc11a60 100644
--- a/addons/portal_hr_employees/hr_employee.py
+++ b/addons/portal_hr_employees/hr_employee.py
@@ -40,7 +40,7 @@ class crm_contact_us(osv.TransientModel):
     }
 
 class hr_employee(osv.osv):
-    _description = "Portal CRM employee"
+    _description = "Portal employee"
     _inherit = 'hr.employee'
 
     """
diff --git a/addons/portal_hr_employees/portal_hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
similarity index 100%
rename from addons/portal_hr_employees/portal_hr_employee_view.xml
rename to addons/portal_hr_employees/hr_employee_view.xml

From f90f7460bf8cbb361a7635d6c1587757b36cf4e7 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 27 Jul 2012 16:53:02 +0200
Subject: [PATCH 253/312] [IMP] put the employee's portal visibility selection
 in a separate tab

bzr revid: abo@openerp.com-20120727145302-8h18zcqcobsiiblh
---
 addons/portal_hr_employees/hr_employee_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index 8278bd81c14..849157ad44a 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -9,10 +9,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='active_group']" position="after">
-                    <group string="Employee's visibility">
-                        <field name="visibility"/>
-                    </group>
+                <xpath expr="//page[last()]" position="after">
+                    <page string="Portal Settings">
+                        <group>
+                            <field name="visibility"/>
+                        </group>
+                    </page>
                 </xpath>
             </field>
         </record>

From 3bbc7e0efc3b1b001e805ab9cfa2e0ae100e2952 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 27 Jul 2012 16:53:37 +0200
Subject: [PATCH 254/312] [ADD] the possibility to show or hide events in the
 portal

bzr revid: abo@openerp.com-20120727145337-69ey9rcb070kaatj
---
 addons/portal/__init__.py    |  1 +
 addons/portal/__openerp__.py |  1 +
 addons/portal/event.py       | 39 ++++++++++++++++++++++++++++++++++++
 addons/portal/event_view.xml | 23 +++++++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 100644 addons/portal/event.py
 create mode 100644 addons/portal/event_view.xml

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 65b924183e1..8d7e0fdef46 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -22,6 +22,7 @@
 import portal
 import wizard
 import res_user
+import event
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 6dd22a46ca2..58896c4bed9 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -39,6 +39,7 @@ very handy when used in combination with the module 'share'.
     """,
     'website': 'http://www.openerp.com',
     'data': [
+        'event_view.xml',
         'security/portal_security.xml',
         'security/ir.model.access.csv',
         'portal_view.xml',
diff --git a/addons/portal/event.py b/addons/portal/event.py
new file mode 100644
index 00000000000..4d7286b7395
--- /dev/null
+++ b/addons/portal/event.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class event_event(osv.osv):
+    _description = "Portal event"
+    _inherit = 'event.event'
+
+    """
+    ``visibility``: defines if the employee appears on the portal's contact page
+                    - 'public' means the event will appear for everyone (anonymous)
+                    - 'private' means the event won't appear
+    """
+    _columns = {
+        'visibility': fields.selection([('public', 'Public'),('private', 'Private')],
+            string='Visibility', help='Event\'s visibility in the portal\'s contact page'),
+    }
+    _defaults = {
+        'visibility': 'private',
+    }
diff --git a/addons/portal/event_view.xml b/addons/portal/event_view.xml
new file mode 100644
index 00000000000..6966add58e8
--- /dev/null
+++ b/addons/portal/event_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- add visibility field to the event form view -->
+        <record id="view_employee_form" model="ir.ui.view">
+            <field name="name">portal.event.form</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="event.view_event_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[last()]" position="after">
+                    <page string="Portal Settings">
+                        <group>
+                            <field name="visibility"/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 93cb71c2260cb3b4de1f8b6f0dbe0181db445151 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 27 Jul 2012 17:09:55 +0200
Subject: [PATCH 255/312] [IMP] once more small improvement to cache-control

bzr revid: nicolas.vanhoren@openerp.com-20120727150955-5xx79v2lc8qsk77a
---
 addons/web/common/http.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index a70ef53a91c..f1426d76d27 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -426,10 +426,13 @@ class DisableCacheMiddleware(object):
             referer = environ.get('HTTP_REFERER', '')
             parsed = urlparse.urlparse(referer)
             debug = parsed.query.count('debug') >= 1
-            filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and (k=='Cache-Control' or k=='Expires')))]
+            nh = dict(headers)
+            if 'Last-Modified' in nh: del nh['Last-Modified']
             if debug:
-                filtered_headers.append(('Cache-Control', 'no-cache'))
-            start_response(status, filtered_headers)
+                if 'Expires' in nh: del nh['Expires']
+                if 'Etag' in nh: del nh['Etag']
+                nh['Cache-Control'] = 'no-cache'
+            start_response(status, nh.items())
         return self.app(environ, start_wrapped)
 
 class Root(object):

From ffb10a71f69681cfb9bdcb8428613b675ab2d3fa Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 27 Jul 2012 17:25:07 +0200
Subject: [PATCH 256/312] [FIX] typo

bzr revid: abo@openerp.com-20120727152507-ssp55zd4wsyc2cqf
---
 addons/portal/event.py                    | 4 ++--
 addons/portal_hr_employees/hr_employee.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/portal/event.py b/addons/portal/event.py
index 4d7286b7395..6faf83eff36 100644
--- a/addons/portal/event.py
+++ b/addons/portal/event.py
@@ -22,11 +22,11 @@
 from osv import osv, fields
 
 class event_event(osv.osv):
-    _description = "Portal event"
+    _description = 'Portal event'
     _inherit = 'event.event'
 
     """
-    ``visibility``: defines if the employee appears on the portal's contact page
+    ``visibility``: defines if the event appears on the portal's event page
                     - 'public' means the event will appear for everyone (anonymous)
                     - 'private' means the event won't appear
     """
diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py
index 2247dc11a60..b54e544a744 100644
--- a/addons/portal_hr_employees/hr_employee.py
+++ b/addons/portal_hr_employees/hr_employee.py
@@ -40,7 +40,7 @@ class crm_contact_us(osv.TransientModel):
     }
 
 class hr_employee(osv.osv):
-    _description = "Portal employee"
+    _description = 'Portal employee'
     _inherit = 'hr.employee'
 
     """

From 0919b90c45e2923fc9005ec68683d5db3b960cb8 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 27 Jul 2012 17:47:27 +0200
Subject: [PATCH 257/312] [ADD] record rule to hide private events

bzr revid: abo@openerp.com-20120727154727-m7f0urztszju678q
---
 addons/portal_event/security/portal_security.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index d4d5269e1c5..3d47cbddbe6 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -2,11 +2,10 @@
 <openerp>
     <data noupdate="1">
 
-        <!-- Add a 'public' flag to the events and only show these ones to portal users -->
         <record id="portal_event_rule" model="ir.rule">
-            <field name="name">Personal Events</field>
+            <field name="name">Visible Events</field>
             <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">[]</field>
+            <field name="domain_force">[('visibility', '=', 'public')]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
 

From 5d53bf598217f7906200ab83c35294e2f51acf02 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 27 Jul 2012 17:50:39 +0200
Subject: [PATCH 258/312] [IMP] properly name each portal record rule

bzr revid: abo@openerp.com-20120727155039-i1scp2ajd1g08xmn
---
 addons/portal_claim/security/portal_security.xml    |  2 +-
 addons/portal_event/security/portal_security.xml    |  4 ++--
 addons/portal_project/security/portal_security.xml  |  2 +-
 .../security/portal_security.xml                    |  4 ++--
 addons/portal_sale/security/portal_security.xml     | 13 ++++++-------
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index feff94ed43c..e902bd043ad 100644
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
-            <field name="name">Personal Claims</field>
+            <field name="name">Portal Personal Claims</field>
             <field ref="crm_claim.model_crm_claim" name="model_id"/>
             <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 3d47cbddbe6..6a3ed0ac786 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -3,14 +3,14 @@
     <data noupdate="1">
 
         <record id="portal_event_rule" model="ir.rule">
-            <field name="name">Visible Events</field>
+            <field name="name">Portal Visible Events</field>
             <field ref="event.model_event_event" name="model_id"/>
             <field name="domain_force">[('visibility', '=', 'public')]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
 
         <record id="portal_registration_rule" model="ir.rule">
-            <field name="name">Personal Registrations</field>
+            <field name="name">Portal Personal Registrations</field>
             <field ref="event.model_event_registration" name="model_id"/>
             <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index f9983861c68..b995c79bbbc 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="portal_task_rule" model="ir.rule">
-            <field name="name">Personal Task</field>
+            <field name="name">Portal Personal Task</field>
             <field ref="project.model_project_task" name="model_id"/>
             <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml
index 1bae1ef8e8c..4ef8da5e4b6 100644
--- a/addons/portal_project_issue/security/portal_security.xml
+++ b/addons/portal_project_issue/security/portal_security.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    
+
         <record id="portal_issue_rule" model="ir.rule">
-            <field name="name">Personal Issues</field>
+            <field name="name">Portal Personal Issues</field>
             <field ref="project_issue.model_project_issue" name="model_id"/>
             <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index 43e6867dfd9..9eb90224b5a 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -1,39 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1"> 
+    <data noupdate="1">
 
         <!-- Sale Portal Access Rules -->
-
         <record id="portal_sale_order_user_rule" model="ir.rule">
-            <field name="name">Personal Quotations/Sales Orders</field>
+            <field name="name">Portal Personal Quotations/Sales Orders</field>
             <field ref="sale.model_sale_order" name="model_id"/>
             <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
-            <field name="name">Personal Delivery Orders</field>
+            <field name="name">Portal Personal Delivery Orders</field>
             <field ref="stock.model_stock_picking" name="model_id"/>
             <field name="domain_force">[('partner_id','child_of',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
 
         <record id="portal_account_invoice_user_rule" model="ir.rule">
-            <field name="name">Personal Account Invoices</field>
+            <field name="name">Portal Personal Account Invoices</field>
             <field ref="account.model_account_invoice" name="model_id"/>
             <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
 
         <record id="portal_personal_payment" model="ir.rule">
-            <field name="name">Personal Payments</field>
+            <field name="name">Portal Personal Payments</field>
             <field ref="account_voucher.model_account_voucher" name="model_id"/>
             <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
 
         <record id="portal_personal_contact" model="ir.rule">
-            <field name="name">Personal Contacts</field>
+            <field name="name">Portal Personal Contacts</field>
             <field ref="base.model_res_partner" name="model_id"/>
             <field name="domain_force">[('id','child_of',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>

From 0c581831b8938b8ef7f8f55adb90be496a89848c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 29 Jul 2012 04:38:02 +0000
Subject: [PATCH 259/312] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
---
 addons/account/i18n/nl_BE.po                  |   42 +-
 addons/account/i18n/pt_BR.po                  |  308 +-
 addons/account_analytic_default/i18n/nl_BE.po |   68 +-
 addons/account_asset/i18n/nl_BE.po            |   14 +-
 addons/account_asset/i18n/pt_BR.po            |  171 +-
 addons/account_check_writing/i18n/pt_BR.po    |  212 +
 addons/account_coda/i18n/nl_BE.po             | 3739 +++++++++++++++++
 addons/account_followup/i18n/pt_BR.po         |   78 +-
 addons/account_sequence/i18n/nl_BE.po         |  227 +
 addons/account_voucher/i18n/pt_BR.po          |   88 +-
 addons/analytic/i18n/pt_BR.po                 |   31 +-
 addons/analytic_user_function/i18n/pt_BR.po   |    9 +-
 addons/anonymization/i18n/pt_BR.po            |   14 +-
 addons/audittrail/i18n/pt_BR.po               |   18 +-
 addons/base_action_rule/i18n/pt_BR.po         |   20 +-
 addons/base_iban/i18n/pt_BR.po                |   23 +-
 addons/base_setup/i18n/ja.po                  |   42 +-
 addons/base_setup/i18n/pt_BR.po               |   41 +-
 addons/base_vat/i18n/ja.po                    |   10 +-
 addons/base_vat/i18n/pt_BR.po                 |   22 +-
 addons/caldav/i18n/pt_BR.po                   |   18 +-
 addons/crm/i18n/pt_BR.po                      |   84 +-
 addons/crm_partner_assign/i18n/pt_BR.po       |  104 +-
 addons/document/i18n/pt_BR.po                 |   48 +-
 addons/document_webdav/i18n/pt_BR.po          |   37 +-
 addons/email_template/i18n/pt_BR.po           |  197 +-
 addons/fetchmail/i18n/pt_BR.po                |   81 +-
 addons/google_base_account/i18n/pt_BR.po      |  122 +
 addons/hr_payroll/i18n/nb.po                  | 1119 +++++
 addons/hr_timesheet_sheet/i18n/pt_BR.po       |    8 +-
 addons/import_google/i18n/pt_BR.po            |   53 +-
 addons/membership/i18n/pt_BR.po               |   57 +-
 addons/mrp/i18n/pt_BR.po                      |   91 +-
 addons/mrp_operations/i18n/mn.po              |  857 ++++
 addons/plugin_outlook/i18n/pt_BR.po           |   18 +-
 addons/plugin_thunderbird/i18n/pt_BR.po       |   14 +-
 addons/process/i18n/pt_BR.po                  |   10 +-
 addons/product/i18n/pt_BR.po                  |   71 +-
 addons/product_margin/i18n/pt_BR.po           |   12 +-
 addons/product_visible_discount/i18n/pt_BR.po |   15 +-
 addons/project_scrum/i18n/pt_BR.po            |   40 +-
 addons/purchase_analytic_plans/i18n/pt_BR.po  |   10 +-
 .../purchase_double_validation/i18n/pt_BR.po  |   12 +-
 addons/sale/i18n/pt_BR.po                     |  200 +-
 addons/sale_crm/i18n/pt_BR.po                 |   22 +-
 addons/sale_journal/i18n/pt_BR.po             |   17 +-
 addons/sale_margin/i18n/pt_BR.po              |   10 +-
 addons/sale_order_dates/i18n/pt_BR.po         |   10 +-
 addons/users_ldap/i18n/pt_BR.po               |   29 +-
 49 files changed, 7757 insertions(+), 786 deletions(-)
 create mode 100644 addons/account_check_writing/i18n/pt_BR.po
 create mode 100644 addons/account_coda/i18n/nl_BE.po
 create mode 100644 addons/account_sequence/i18n/nl_BE.po
 create mode 100644 addons/google_base_account/i18n/pt_BR.po
 create mode 100644 addons/hr_payroll/i18n/nb.po
 create mode 100644 addons/mrp_operations/i18n/mn.po

diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 770abf9dce5..6a19e582ed3 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-07-22 16:28+0000\n"
-"Last-Translator: Niels Huylebroeck <Unknown>\n"
+"PO-Revision-Date: 2012-07-27 12:48+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-28 04:57+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -444,7 +444,7 @@ msgstr "Totaal credit"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr ""
+msgstr "Afpunting ongedaan maken"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -1611,7 +1611,7 @@ msgstr "Onbelast"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr ""
+msgstr "Naar volgende relatie"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2854,7 +2854,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax Codes"
-msgstr ""
+msgstr "Btw-codes"
 
 #. module: account
 #: view:account.account:0
@@ -3226,7 +3226,7 @@ msgstr "Sjablonen boekhoudplan"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Stel uw boekhouding in"
 
 #. module: account
 #: view:report.account.sales:0
@@ -4402,7 +4402,7 @@ msgstr "Afpunten met afschrijving"
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by Type"
-msgstr ""
+msgstr "Rekeningen per type"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4444,7 +4444,7 @@ msgstr "res_config_contents"
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate Transactions"
-msgstr ""
+msgstr "Afpuntingen ongedaan maken"
 
 #. module: account
 #: help:account.chart.template,visible:0
@@ -4645,7 +4645,7 @@ msgstr "Bewerkingsdatum"
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation Transactions"
-msgstr ""
+msgstr "Afpuntingen ongedaan maken"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -4780,7 +4780,7 @@ msgstr "Betaald"
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure?"
-msgstr ""
+msgstr "Bent u zeker?"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5177,7 +5177,7 @@ msgstr "Btw-rekening"
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation Result"
-msgstr ""
+msgstr "Afpuntresultaat"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
@@ -6169,7 +6169,7 @@ msgstr "Verkoop-btw (%)"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "Maak een rekening op basis van deze sjabloon"
 
 #. module: account
 #: view:account.account.type:0
@@ -7310,7 +7310,7 @@ msgstr "Hoofdrekeningsjabloon"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure your Chart of Accounts"
-msgstr ""
+msgstr "Installeer uw boekhoudplan"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -8205,7 +8205,7 @@ msgstr "Omgekeerde analytische balans -"
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr ""
+msgstr "Bank afpunten"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8394,7 +8394,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes Included Prices"
-msgstr ""
+msgstr "Bereken code voor prijzen inclusief btw"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1030
@@ -9071,7 +9071,7 @@ msgstr "Verkopen van dit jaar per type"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr ""
+msgstr "Analytisch dagboek voor periode"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -9539,7 +9539,7 @@ msgstr "U moet een bankrekening instellen in het afpuntjournaal."
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
-msgstr ""
+msgstr "Afpunttransacties"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -9644,7 +9644,7 @@ msgstr "Vervaldatum"
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard Entries"
-msgstr ""
+msgstr "Standaardboekingen"
 
 #. module: account
 #: help:account.journal,type:0
@@ -10598,7 +10598,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on Invoices"
-msgstr ""
+msgstr "Omschrijving op facturen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 48b27e67be2..885a88d84c4 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 14:05+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3235,7 +3235,7 @@ msgstr "Modelo de plano de contas"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Defina suas opções Contábeis"
 
 #. module: account
 #: view:report.account.sales:0
@@ -4222,6 +4222,10 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"Você não pode fazer essa modificação em uma entrada confirmada! Você pode "
+"apenas mudar alguns campos não legais ou você deve primeiro desconfirmar a "
+"entrada de diário em primeiro lugar\" \n"
+"%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
@@ -4472,6 +4476,10 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Marque como False se você não quer que este template seja usado no "
+"configurador que gera o Plano de Contas dos modelos, isto é útil quando você "
+"deseja criar as contas desse modelo somente quando for carregar os modelos "
+"filhos."
 
 #. module: account
 #: view:account.use.model:0
@@ -4816,6 +4824,9 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Erro de configuração!\n"
+"Você não pode definir um filho a uma conta com tipo interno diferente de "
+"\"Visualização\"! "
 
 #. module: account
 #: code:addons/account/account.py:923
@@ -5120,6 +5131,10 @@ msgid ""
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Esta lógica ajuda você a escolher se você quer propor para o usuário "
+"codificar as taxas de compra e venda ou escolher de um conjunto de impostos. "
+" Esta última escolha pressupõe que o conjunto de imposto definido para o "
+"modelo escolhido está completa"
 
 #. module: account
 #: view:account.financial.report:0
@@ -5748,7 +5763,7 @@ msgstr "Sub-contas"
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Mova nome (id) %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6091,6 +6106,9 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Erro de configuração!\n"
+"Você não pode definir um filho a uma conta com tipo interno diferente de "
+"\"Visualização\"! "
 
 #. module: account
 #: help:res.partner.bank,journal_id:0
@@ -6211,6 +6229,10 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"Este logica ajuda você a escolher se você quer propor ao usuário para "
+"codificar as vendas e as taxas de compra ou use os campos usuais m2o. Esta "
+"última escolha pressupõe que o conjunto de imposto definido para o modelo "
+"escolhido está completa"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -6230,7 +6252,7 @@ msgstr "Faturas em Aberto e Pagos"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "Mostrar plano filho"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -6662,7 +6684,7 @@ msgstr "Criar lançamentos recorrentes manuais no diário escolhido."
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Moeda da conta do diário relacionada."
 
 #. module: account
 #: code:addons/account/account.py:1563
@@ -6787,7 +6809,7 @@ msgstr "Criar lançamento"
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Ganhos e perdas (conta de Despesa)"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6914,6 +6936,9 @@ msgid ""
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
+"Você não pode fazer essa modificação em uma entrada reconciliada! Você pode "
+"apenas mudar alguns campos não legais ou você deve desconciliar primeiro!\n"
+"%s"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7054,6 +7079,9 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para "
+"fazer pagamentos válidos"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7186,7 +7214,7 @@ msgstr "Documento de Origem"
 #: code:addons/account/account.py:1432
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr ""
+msgstr "Você não pode excluir um lançamento do diário publicado \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -7360,7 +7388,7 @@ msgstr "Entradas Postadas"
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "Para porcentagem introduzir um razão entre 0-1."
 
 #. module: account
 #: report:account.invoice:0
@@ -7590,7 +7618,7 @@ msgstr "Os prazos para gerar entradas de abertura não foram encontrados"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Origem/Visualização"
 
 #. module: account
 #: code:addons/account/account.py:3121
@@ -7660,7 +7688,7 @@ msgstr "Multi-Moedas"
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Data de Vencimento"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -7706,6 +7734,11 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Este campo opcional te permite criar um link para um modelo específico de "
+"plano de contas que pode ser diferente do que o superior pertence. Isto "
+"permite a você definir o plano de contas que amplia e completa com algumas "
+"novas contas (você não precisa definir toda uma estrutura que é comum aos "
+"dois várias vezes)."
 
 #. module: account
 #: view:account.move:0
@@ -7758,6 +7791,7 @@ msgstr "Cancelar Faturas Selecionadas"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Este campo é usado para gerar relatórios legais: de lucros e perdas, balanço."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -7767,6 +7801,10 @@ msgid ""
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
 msgstr ""
+"Termos de pagamento define as condições para pagamento de um cliente ou "
+"fornecedor em um ou mais pagamentos. Lembretes periódicos irão usar os "
+"termos de pagamento em cada aviso. Cada cliente ou fornecedor pode ser "
+"associado para um desses termos de pagamento."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7897,7 +7935,7 @@ msgstr "Quantidade ideal de entradas."
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "Relatório"
 
 #. module: account
 #: view:account.state.open:0
@@ -7947,7 +7985,7 @@ msgstr "    7 Dias    "
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Balanço computado"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -8032,7 +8070,7 @@ msgstr "Status da Linha de Movimento"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr ""
+msgstr "Reconciliar movimentação de linha de conta"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -8075,7 +8113,7 @@ msgstr "Selecione uma moeda para ser usada na fatura"
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr ""
+msgstr "A conta bancária  definida no plano de contas não possui um código"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
@@ -8092,7 +8130,7 @@ msgstr "Sem Linhas na Fatura !"
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Tipo de Relatório"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8121,6 +8159,8 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
+"Escolha o Ano Fiscal que você deseja remover entradas de diário de  "
+"Fechamento de ano"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -8153,6 +8193,12 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"Um plano de contas normal tem uma estrutura definida por uma legislação "
+"mínima obrigatória no país. A estrutura do plano de contas analítico deve "
+"refletir sua própria necessidade empresarial em termos de relatórios de "
+"receitas/despesas. Eles são geralmente estruturados por contratos, projetos, "
+"produtos ou departamentos. A maioria das operações do OpenErp (faturas, "
+"planilhas de tempo, despesas, etc) geram uma entrada em uma conta relacionada"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -8251,6 +8297,15 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * 'Cotação' é usada quando um usuário está criando uma fatura nova e sem "
+"confirmação.             \n"
+"* 'Pro-forma' quando uma fatura está em Pro-forma ela não possui um código "
+"de fatura.             \n"
+"* 'Aberto' é quando um usuário cria uma fatura, um número de fatura é "
+"gerado. Ficará em Aberto enquanto o usuário não pagar a fatura\n"
+"* 'Pago' é definido automaticamente quando a fatura for paga. Suas entradas "
+"nos diários podem ou não ser reconciliadas.   \n"
+"* 'Cancelado' é usado quando o usuário cancela a fatura."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -8281,6 +8336,7 @@ msgstr ""
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
 msgstr ""
+"Não encontramos um plano de contas para esta empresa, você deve criar um."
 
 #. module: account
 #: view:account.invoice:0
@@ -8290,7 +8346,7 @@ msgstr "Pro-forma"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "J.C. /Nome da movimentação"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -8359,6 +8415,8 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Valor Total (na moeda da empresa) para as transações mantidas em uma moeda "
+"secundária para esta conta."
 
 #. module: account
 #: report:account.invoice:0
@@ -8395,6 +8453,8 @@ msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
 msgstr ""
+"Você não pode cancelar uma fatura que foi parcialmente paga! Você precisa "
+"desconciliar as entradas de pagamento primeiro!"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -8425,7 +8485,7 @@ msgstr "Valor do Imposto/Base"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Percent"
-msgstr ""
+msgstr "  Avaliação: Percentual"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8516,18 +8576,18 @@ msgstr "Conciliação parcial"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Balanço invertido da conta analítica"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Relatório de Conta Comum"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "current month"
-msgstr ""
+msgstr "mês atual"
 
 #. module: account
 #: code:addons/account/account.py:1052
@@ -8536,6 +8596,8 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create one."
 msgstr ""
+"Nenhum período definido para esta data: %s !\n"
+"Por favor, crie um."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -8563,7 +8625,7 @@ msgstr "Tipos de Conta"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
-msgstr ""
+msgstr "  Valor total: n.a"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8595,11 +8657,17 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Este botão só aparece quando a situação da fatura for 'Paga' (mostrando que "
+"foi paga e totalmente reconciliada) e o valor gerado automaticamente "
+"'Reconciliado' for falso (representando que não é mais o caso). Em outras "
+"palavras, a fatura foi desconciliada e não cabe mais usar a situação 'paga' "
+". Você deve clicar neste botão e re-abrir e então continuar o processo "
+"normal depois de resolver as exceções que possa ter gerado"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Situação do Fechamento do Ano Fiscal"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -8635,6 +8703,8 @@ msgstr ""
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"Para fechar um período você precisa primeiro criar as entradas de diário "
+"relacionadas."
 
 #. module: account
 #: view:account.entries.report:0
@@ -8652,7 +8722,7 @@ msgstr "A conta do parceiro usada para esta fatura"
 #: code:addons/account/account.py:3296
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "Imposto %.2f%%"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8763,6 +8833,8 @@ msgstr "Faturas Não Pagas"
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
+"O termo de pagamento do fornecedor não possui uma linha de prazo de "
+"pagamento!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8827,17 +8899,17 @@ msgstr "Nome do diário"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Próxima entrada a reconciliar"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Menor Texto"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Faturamento & Pagamentos"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8889,6 +8961,9 @@ msgid ""
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
+"Você não pode validar uma entrada sem balanço!\n"
+"Tenha certeza de que você configurou os termos de pagamento corretamente!\n"
+"A última linha de prazo de pagamento deve ser do tipo \"Balanço\"!"
 
 #. module: account
 #: view:account.account:0
@@ -8966,7 +9041,7 @@ msgstr "Endereço do contato"
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Modelo errado!"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -8987,6 +9062,11 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"Para contas que são tipicamente mais debitadas do que creditadas e que você "
+"deseja exibir como valores negativos nos relatórios, você deve inverter o "
+"sinal do balanço; ex.: Conta de despesa. O mesmo aplica para contas que são "
+"tipicamente mais creditadas do que debitadas e você deseja exibir como "
+"valores positivos nos relatórios; ex.: Contas de recebimento."
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -9028,7 +9108,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:808
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Defina a sequencia do diário referente a essa fatura."
 
 #. module: account
 #: view:account.move:0
@@ -9041,7 +9121,7 @@ msgstr "Nota Interna"
 #. module: account
 #: view:report.account.sales:0
 msgid "This year's Sales by type"
-msgstr ""
+msgstr "Vendas deste ano, por tipo"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -9095,7 +9175,7 @@ msgstr "Linhas de lançamentos"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr ""
+msgstr "Reveja as suas contas financeiras"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
@@ -9136,7 +9216,7 @@ msgstr "Pagamento registrado"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Situação do fechamento de Ano Fiscal e períodos"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9176,7 +9256,7 @@ msgstr "Caros Ser/Senhora,"
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Mostrar Detalhes"
 
 #. module: account
 #: code:addons/account/account.py:3118
@@ -9221,7 +9301,7 @@ msgstr "Fim do Período"
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "Relatórios Financeiros"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9305,7 +9385,7 @@ msgstr "Documento: demonstrativo da conta cliente"
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "Categoria P&L / BS"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -9481,12 +9561,12 @@ msgstr ""
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr ""
+msgstr "Entradas analíticas dos últimos 365 dias"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "No. A/C"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -9522,7 +9602,7 @@ msgstr "Conciliação de transações"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "Relatório Comum"
 
 #. module: account
 #: view:account.account:0
@@ -9543,7 +9623,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Faturas de clientes e fornecedores"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -9583,6 +9663,8 @@ msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
 msgstr ""
+"Nenhum período de abertura/fechamento definido, por favor crie um e defina o "
+"balanço inicial!"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9631,6 +9713,11 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"Escolha 'Venda' para diários de faturas de clientes. Escolha 'Compra' para "
+"diários de faturas de fornecedores. Escolha 'Dinheiro' ou 'Banco' para "
+"diários que são usados nos pagamentos de clientes ou fornecedores. Escolha "
+"'Geral' para diários de operações diversas. Escolha 'Situação de "
+"Abertura/Fechamento' para entradas geradas em um novo ano fiscal."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -9683,6 +9770,8 @@ msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"Indica que a fatura foi paga e a entrada do diário foi reconciliada com um "
+"ou mais diários de pagamentos"
 
 #. module: account
 #: view:account.invoice:0
@@ -9720,6 +9809,13 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
+"Um período é um período fiscal em que a contabilidade deve ser registrada "
+"para atividades relacionadas. Períodos mensais costumam ser o padrão, mas "
+"dependendo do seu pais ou necessidades da empresa, você também pode definir "
+"períodos trimestrais. Após fechar um período é impossível adicionar novas "
+"entradas, todas as novas entradas deverão ser feitas no período seguinte. "
+"Feche um período quando você não desejar mais gravar novas entradas e quer "
+"bloquear o período para o cálculo de impostos"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9755,7 +9851,7 @@ msgstr "Ativo"
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Comparação"
 
 #. module: account
 #: code:addons/account/account_invoice.py:372
@@ -9828,7 +9924,7 @@ msgstr ""
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Ganhos e perdas (conta Lucro)"
 
 #. module: account
 #: constraint:account.account:0
@@ -9837,6 +9933,9 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Erro de Configuração!\n"
+"Você não pode selecionar um tipo de conta com um método de deferimento "
+"diferente de \"Não conciliado\" para contas do tipo \"Pagáveis/Recebíveis\" "
 
 #. module: account
 #: view:account.model:0
@@ -9873,7 +9972,7 @@ msgstr "Geral"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr ""
+msgstr "Entradas analíticas dos últimos 30 dias"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9930,7 +10029,7 @@ msgstr "Abril"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Lucro (Prejuízo) para relatório"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -9954,7 +10053,7 @@ msgstr ""
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Título 2 (em negrito)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9995,6 +10094,8 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"Quando um novo statement for criado, a situação será 'Rascunho'.\n"
+"E após a confirmação do banco a situação será \"Confirmada\"."
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -10115,7 +10216,7 @@ msgstr "Sequências de ano fiscal"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Não há detalhes"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:102
@@ -10126,14 +10227,14 @@ msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Você não pode criar ítens de diário em uma conta fechada."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Perdas ou Ganhos não realizados"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -10146,12 +10247,12 @@ msgstr "Estado"
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr ""
+msgstr "Enviar automaticamente as Faturas confirmadas"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Verificação total"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -10279,7 +10380,7 @@ msgstr "Esvaziar as contas ? "
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "O diário e o período escolhido tem que pertencer à mesma empresa."
 
 #. module: account
 #: view:account.invoice:0
@@ -10303,11 +10404,13 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
+"Esta conta será usada para para estimar o estoque de saída da categoria de "
+"produtos usando o preço de custo"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Crie seu Plano de Contas através de um modelo"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -10379,7 +10482,7 @@ msgstr "Débito"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Título 3 (em negrito, menor)"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
@@ -10394,7 +10497,7 @@ msgstr "Erro ! Você não pode criar templates recursivos para contas."
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Número da Entrada de Diário"
 
 #. module: account
 #: view:account.subscription:0
@@ -10408,6 +10511,8 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
 msgstr ""
+"Você não pode mudar o tipo de conta de 'Fechado' para nenhum outro tipo que "
+"contém entradas de diário!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
@@ -10433,7 +10538,7 @@ msgstr "Intervalo"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Itens de diário relacionados a um diário de compras."
 
 #. module: account
 #: help:account.account,type:0
@@ -10444,6 +10549,11 @@ msgid ""
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"O 'Tipo Interno' é usado para recursos disponíveis em diferentes tipo de "
+"contas: visualizações não podem conter itens de diário, consolidações são "
+"contas que possuem contas filhas de consolidações multi-empresas, "
+"pagáveis/recebíveis são para contas de parceiros (para cálculo de "
+"débito/crédito), fechado para contas de depreciação."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -10485,7 +10595,7 @@ msgstr "Imprimir diários analíticos"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Agrupar por mês da fatura"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -10519,6 +10629,8 @@ msgstr "A outra moeda opcional se este for um lançamento multi-moeda"
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
 msgstr ""
+"Importar da declaração no sistema a partir de uma fatura do fornecedor ou "
+"cliente"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -10551,7 +10663,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on Invoices"
-msgstr ""
+msgstr "Descrição nas Faturas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -10578,7 +10690,7 @@ msgstr "Conta inválida!"
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Entradas classificadas por"
 
 #. module: account
 #: help:account.move,state:0
@@ -10589,6 +10701,11 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
 msgstr ""
+"Todas as entradas de diário criadas manualmente ficam na situação 'Não "
+"publicadas', mas você pode definir uma opção para pular esta situação no "
+"diário relacionado. Neste caso, elas se comportarão como entradas de diário "
+"automaticamente pelo sistema na validação do documento (faturas, extratos "
+"bancários...) e serão criadas na situação 'Publicadas'."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -10719,6 +10836,76 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Olá ${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"Uma nova fatura está disponível para ${object.partner_id.name}:\n"
+"       | Número da Fatura: *${object.number}*\n"
+"       | Total da Fatura: *${object.amount_total} "
+"${object.currency_id.name}*\n"
+"       | Data da Fatura: ${object.date_invoice}\n"
+"       % if object.origin:\n"
+"       | Referente a: ${object.origin}\n"
+"       % endif\n"
+"       | Seu contato: ${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"Você pode ver a fatura, fazer o download e pagar online usando o seguinte "
+"link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"             "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"É possível pagar diretamente através do Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"Se você tiver alguma dúvida por favor entre em contato conosco.\n"
+"\n"
+"\n"
+"Obrigado por escolher ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
@@ -13102,3 +13289,6 @@ msgstr ""
 
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "Instale o seu Plano de Contas"
+
+#~ msgid "Description On Invoices"
+#~ msgstr "Descrição em Faturas"
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index d03870fbbcd..7c1480da05c 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-04-24 15:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-07-27 12:58+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:06+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-28 04:57+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -23,43 +23,46 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytical account)"
 msgstr ""
+"Kies een relatie die de standaard voorgestelde analytische rekening gebruikt "
+"(vb. maak een nieuwe verkoopfactuur of verkooporder voor deze relatie; de "
+"analytische rekening wordt nu voorgesteld)."
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr ""
+msgstr "Analytische regels"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,analytic_id:0
 msgid "Analytical Account"
-msgstr ""
+msgstr "Analytische rekening"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Current"
-msgstr ""
+msgstr "Huidig"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groeperen op..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytical Account"
-msgstr ""
+msgstr "Standaard einddatum voor deze analytische rekening"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Pickinglijst"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr ""
+msgstr "Voorwaarden"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,company_id:0
@@ -68,67 +71,74 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
 msgstr ""
+"Kies een bedrijf dat de standaard voorgestelde analytische rekening gebruikt "
+"(vb. maak een nieuwe verkoopfactuur of verkooporder voor dit bedrijf; de "
+"analytische rekening wordt nu voorgesteld)."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
-msgstr ""
+msgstr "Standaard begindatum voor deze analytische rekening"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Analytische verdeelsleutels"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
-msgstr ""
+msgstr "Boekingen"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
+"Kies een gebruiker die de standaard voorgestelde analytische rekening "
+"gebruikt."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 msgid "Analytic Defaults"
-msgstr ""
+msgstr "Analytische standaardwaarden"
 
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "De referentie moet uniek zijn per bedrijf."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Analytical defaults whose end date is greater than today or None"
 msgstr ""
+"Analytische standaardwaarden waarvoor de einddatum groter is dan vandaag of "
+"zonder einddatum."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -137,49 +147,53 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytical account)"
 msgstr ""
+"Kies een product dat de standaard voorgestelde analytische rekening gebruikt "
+"(vb. maak een nieuwe verkoopfactuur of verkooporder met dit product; de "
+"analytische rekening wordt nu voorgesteld)."
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgorde"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Factuurlijn"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytische rekening"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr ""
+msgstr "Rekeningen"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
+"Bepaalt de volgorde waarin analytische verdeelsleutels worden weergegeven."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Verkooporderlijn"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index 1a86b954203..8d3acf0fb9e 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-27 13:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-27 13:02+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-28 04:57+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -437,12 +437,12 @@ msgstr "Tijdmethode"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Analytische info"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Looptijd van afschrijving aanpassen"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -617,7 +617,7 @@ msgstr "Prorata temporis"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Boekhoudkundige informatie"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
diff --git a/addons/account_asset/i18n/pt_BR.po b/addons/account_asset/i18n/pt_BR.po
index a0a2f38e3cd..b01d5a7e0c1 100644
--- a/addons/account_asset/i18n/pt_BR.po
+++ b/addons/account_asset/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-18 02:46+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 14:07+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:38+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -68,6 +68,8 @@ msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
 "from the purchase date instead of the first January"
 msgstr ""
+"Indica que a primeira entrada de depreciação para este ativo foi feita pela "
+"data de entrada em vez de primeiro de Janeiro"
 
 #. module: account_asset
 #: field:account.asset.history,name:0
@@ -221,7 +223,7 @@ msgstr "Referência"
 #. module: account_asset
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Comunicação estruturada BBA inválida !"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -281,7 +283,7 @@ msgstr "Método de Cálculo"
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "State here the time during 2 depreciations, in months"
-msgstr ""
+msgstr "Declare aqui o tempo entre 2 depreciações, em meses."
 
 #. module: account_asset
 #: constraint:account.asset.asset:0
@@ -289,6 +291,8 @@ msgid ""
 "Prorata temporis can be applied only for time method \"number of "
 "depreciations\"."
 msgstr ""
+"Pro rata temporis só pode ser aplicada para o método \"número de "
+"depreciações\"."
 
 #. module: account_asset
 #: help:account.asset.history,method_time:0
@@ -299,6 +303,10 @@ msgid ""
 "Ending Date: Choose the time between 2 depreciations and the date the "
 "depreciations won't go beyond."
 msgstr ""
+"O método usado para computar as datas e números das linhas de depreciações.\n"
+"Número de Depreciações: Defina o número de depreciações entre 2 "
+"depreciações.\n"
+"Data Final: Escolha o tempo entre 2 depreciações e a data não irá além"
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
@@ -318,7 +326,7 @@ msgstr "Tempo em meses entre duas depreciações."
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -330,12 +338,12 @@ msgstr "Modificar Ativos"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Other Information"
-msgstr ""
+msgstr "Outras Informações"
 
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
 msgid "Salvage Value"
-msgstr ""
+msgstr "Valor de Salvamento"
 
 #. module: account_asset
 #: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
@@ -365,7 +373,7 @@ msgstr "Ativos em estados fechados"
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
 msgid "Parent Asset"
-msgstr ""
+msgstr "Ativo Relacionado"
 
 #. module: account_asset
 #: view:account.asset.history:0
@@ -386,7 +394,7 @@ msgstr "Estado"
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Linha de Fatura"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -395,11 +403,14 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"A conta selecionada utiliza as entradas no diário para fornecer uma moeda "
+"secundária. Você deve remover a moeda secundária na conta ou selecione uma "
+"visão multi-moeda no diário."
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -409,7 +420,7 @@ msgstr "Conselho de depreciação"
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Itens do Diário"
 
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
@@ -426,12 +437,12 @@ msgstr "Método tempo"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Informações Analíticas"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Ativos para modificar a duração"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -439,6 +450,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"A data da entrada no diário não está no período definido! Você deve alterar "
+"a data ou remover essa restrição do diário."
 
 #. module: account_asset
 #: field:account.asset.asset,note:0 field:account.asset.category,note:0
@@ -453,6 +466,9 @@ msgid ""
 "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
 "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
 msgstr ""
+"Escolha um método para calcular a quantidade de linhas de depreciação.\n"
+"  * Linear: Calculada na base de: Valor Bruto / Número de Depreciações\n"
+"  * Decrescente: Calculado com base em: valor remanescente Fator * degressivo"
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -465,16 +481,21 @@ msgid ""
 "  * Ending Date: Choose the time between 2 depreciations and the date the "
 "depreciations won't go beyond."
 msgstr ""
+"Escolha um método para calcular as datas e números de depreciações.\n"
+"  * Número de depreciações: Define um número de linhas de depreciação entre "
+"2 depreciações.\n"
+"  * Data Final: Escolha um período entre 2 depreciações e a data não irá "
+"além disso."
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr ""
+msgstr "Ativos em uso"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Closed"
-msgstr ""
+msgstr "Fechado"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -485,154 +506,155 @@ msgstr "Parceiro"
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
 msgid "Amount of Depreciation Lines"
-msgstr ""
+msgstr "Quantidade de Linhas de Depreciação"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Posted depreciation lines"
-msgstr ""
+msgstr "Linhas de depreciação publicadas"
 
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Empresa deve ser a mesma para a sua conta relacionada e período."
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr ""
+msgstr "Ativos Filhos"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of depreciation"
-msgstr ""
+msgstr "Data de depreciação"
 
 #. module: account_asset
 #: field:account.asset.history,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: account_asset
 #: field:account.asset.history,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current month"
-msgstr ""
+msgstr "Ativos adquiridos no mês atual"
 
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
+"Você não pode criar ítens de diário em uma conta tipo \"Visualizar\"."
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Extendidos..."
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
 msgid "Compute"
-msgstr ""
+msgstr "Calcular"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Search Asset Category"
-msgstr ""
+msgstr "Escolha a Categoria do Ativo"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
-msgstr ""
+msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: account_asset
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_close
 msgid "Close asset"
-msgstr ""
+msgstr "Fechar ativo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
 msgid "State of Asset"
-msgstr ""
+msgstr "Situação do Ativo"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,name:0
 msgid "Depreciation Name"
-msgstr ""
+msgstr "Nome da Depreciação"
 
 #. module: account_asset
 #: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: account_asset
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "O número da fatura deve ser único por Empresa!"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "General"
-msgstr ""
+msgstr "Gerais"
 
 #. module: account_asset
 #: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
 msgid "Prorata Temporis"
-msgstr ""
+msgstr "Prorata Temporis"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Informação Contábil"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
 msgid "Review Asset Categories"
-msgstr ""
+msgstr "Reveja as Categorias de Ativos"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:account.asset.category:0
 msgid "Depreciation Method"
-msgstr ""
+msgstr "Método de Depreciação"
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
 #: field:asset.asset.report,purchase_date:0
 msgid "Purchase Date"
-msgstr ""
+msgstr "Data de Compra"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
 #: selection:account.asset.category,method:0
 msgid "Degressive"
-msgstr ""
+msgstr "Decrescente"
 
 #. module: account_asset
 #: help:asset.depreciation.confirmation.wizard,period_id:0
@@ -640,48 +662,50 @@ msgid ""
 "Choose the period for which you want to automatically post the depreciation "
 "lines of running assets"
 msgstr ""
+"Escolha o período em que você deseja publicar as linhas de depreciação de "
+"ativos automaticamente"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Current"
-msgstr ""
+msgstr "Atual"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Amount to Depreciate"
-msgstr ""
+msgstr "Valor a Depreciar"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
 msgid "Skip Draft State"
-msgstr ""
+msgstr "Pular a Situação de Esboço"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:account.asset.category:0
 #: view:account.asset.history:0
 msgid "Depreciation Dates"
-msgstr ""
+msgstr "Datas de Depreciação"
 
 #. module: account_asset
 #: field:account.asset.asset,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Moeda"
 
 #. module: account_asset
 #: field:account.asset.category,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Diário"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciated_value:0
 msgid "Amount Already Depreciated"
-msgstr ""
+msgstr "Valor já Depreciado"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0 field:asset.asset.report,move_check:0
 msgid "Posted"
-msgstr ""
+msgstr "Lançado"
 
 #. module: account_asset
 #: help:account.asset.asset,state:0
@@ -692,11 +716,16 @@ msgid ""
 "You can manually close an asset when the depreciation is over. If the last "
 "line of depreciation is posted, the asset automatically goes in that state."
 msgstr ""
+"Quando um ativo é criado, a situação é 'Provisória'\n"
+"Se o ativo é confirmado, a situação muda para 'Em andamento' e a depreciação "
+"pode ser lançada na contabilidade.\n"
+"Você pode fechar um ativo quando a depreciação acabar. Se a última linha da "
+"depreciação for lançada, o ativo automaticamente muda para esta situação."
 
 #. module: account_asset
 #: field:account.asset.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -704,11 +733,13 @@ msgid ""
 "Check this if you want to automatically confirm the assets of this category "
 "when created by invoices."
 msgstr ""
+"Marque se você deseja confirmar automaticamente os bens dessa categoria "
+"quando criado por faturas."
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Definir como Provisório"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
@@ -719,35 +750,35 @@ msgstr "Linear"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mês-1"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
 msgid "Asset depreciation line"
-msgstr ""
+msgstr "Linha de depreciação de bem"
 
 #. module: account_asset
 #: field:account.asset.asset,category_id:0 view:account.asset.category:0
 #: field:asset.asset.report,asset_category_id:0
 #: model:ir.model,name:account_asset.model_account_asset_category
 msgid "Asset category"
-msgstr ""
+msgstr "Categoria de Ativo"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in last month"
-msgstr ""
+msgstr "Bens adquiridos mês passado"
 
 #. module: account_asset
 #: code:addons/account_asset/wizard/wizard_asset_compute.py:49
 #, python-format
 msgid "Created Asset Moves"
-msgstr ""
+msgstr "Movimentação de Bens"
 
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Você não pode criar ítens de diário em uma conta fechada."
 
 #. module: account_asset
 #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
@@ -756,11 +787,14 @@ msgid ""
 "search can also be used to personalise your Assets reports and so, match "
 "this analysis to your needs;"
 msgstr ""
+"Através deste relatório, você pode ter uma visão geral de toda a "
+"depreciação. A ferramenta de busca também pode ser usada para personalizar "
+"seus relatórios de Ativos, use isto para analisar suas necessidades"
 
 #. module: account_asset
 #: help:account.asset.category,method_period:0
 msgid "State here the time between 2 depreciations, in months"
-msgstr ""
+msgstr "Defina aqui o tempo entre 2 depreciações, em meses"
 
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
@@ -771,22 +805,22 @@ msgstr ""
 #: selection:account.asset.history,method_time:0
 #: field:asset.modify,method_number:0
 msgid "Number of Depreciations"
-msgstr ""
+msgstr "Número de Depreciações"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Create Move"
-msgstr ""
+msgstr "Criar Movimentação"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Post Depreciation Lines"
-msgstr ""
+msgstr "Lançar Linhas de Depreciação"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Confirm Asset"
-msgstr ""
+msgstr "Confirmar Ativo"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
@@ -799,3 +833,6 @@ msgstr "Hierarquia do ativo"
 
 #~ msgid "Analytic information"
 #~ msgstr "Informação Analítica"
+
+#~ msgid "Accounting information"
+#~ msgstr "Informações Contábeis"
diff --git a/addons/account_check_writing/i18n/pt_BR.po b/addons/account_check_writing/i18n/pt_BR.po
new file mode 100644
index 00000000000..b7834127db5
--- /dev/null
+++ b/addons/account_check_writing/i18n/pt_BR.po
@@ -0,0 +1,212 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-07-28 21:24+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:38+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Cheque no topo"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"O formulário de pagamento em cheque te permite rastrear os pagamentos que "
+"você faz para seus fornecedores, especialmente por cheque. Quando você "
+"selecionar um fornecedor, o método de pagamento e o valor do pagamento, o "
+"OpenErp irá propor a reconciliação de seu pagamento com as faturas em aberto "
+"de seu fornecedor. Você poderá imprimir o cheque"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Imprimir Cheque"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cheque no meio"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Cheque no topo é compativel com Quicken, QuickBooks e Microsoft Money. "
+"Cheque no meio é compativel com Peactree, ACCPAC e DacEasy. Cheque no rodapé "
+"é compatível com Peachtree, ACCPAC e DacEasy apenas."
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cheque no rodapé"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Você não pode criar empresas recursivas."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Verifique se este diário é usado para escrever cheques."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permite escrever Cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Escrever Cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Desconto"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Valor Original"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuração"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permite escrever cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pagamento"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheques pré-impressos"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "O nome da empresa deve ser exclusivo!"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Data de Vencimento"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr "Layout padrão dos cheques"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Erro de configuração! A moeda escolhida deve ser compartilhada pelas contas "
+"padrão também."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo Devedor"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Valor do Cheque"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprovante Contábil"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "O nome do diário deve ser único por empresa !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "O código do diário deve ser único por empresa!"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Valor por extenso"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo em Aberto"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Escolha o layout do cheque"
+
+#~ msgid "Default Check layout"
+#~ msgstr "Modelo de Cheque Padrão"
diff --git a/addons/account_coda/i18n/nl_BE.po b/addons/account_coda/i18n/nl_BE.po
new file mode 100644
index 00000000000..ab7bc61aa2b
--- /dev/null
+++ b/addons/account_coda/i18n/nl_BE.po
@@ -0,0 +1,3739 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-07-27 13:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-28 04:57+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_21
+msgid "Cash withdrawal on card (PROTON)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_412
+msgid "Advice of expiry charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_11
+msgid "Your purchase of luncheon vouchers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_05
+msgid "Partial payment subscription"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_54
+msgid "Unexecutable transfer order"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_02
+msgid "Individual transfer order initiated by the bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_21
+msgid "Charges for preparing pay packets"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_9
+msgid "Detail of 7. The records in a separate application keep type 9."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_426
+msgid "Belgian broker's commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_031
+msgid "Charges foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_002
+msgid "Interest paid"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.type,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_62
+msgid ""
+"cheques debited on account, but debit cancelled afterwards for lack of cover "
+"(double debit/contra-entry of transaction 01 or 05)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_05
+msgid "Bill claimed back"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_016
+msgid "BLIW/IBLC dues"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:911
+#, python-format
+msgid "CODA File is Imported  :"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_066
+msgid "Fixed loan advance - reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_05
+msgid "Purchase of foreign bank notes"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:277
+#: code:addons/account_coda/wizard/account_coda_import.py:469
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid CODA Transaction Family : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_030
+msgid "Account insurance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_042
+msgid "Payment card costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_212
+msgid "Warehousing fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:300
+#, python-format
+msgid ""
+"Cannot delete CODA Bank Statement '%s' of Journal '%s'.\n"
+"The associated Bank Statement has already been confirmed !\n"
+"Please undo this action first!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_66
+msgid "Financial centralization"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_420
+msgid "Retention charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_50
+msgid "Transfer in your favour"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_87
+#: model:account.coda.trans.code,description:account_coda.actcc_04_87
+#: model:account.coda.trans.code,description:account_coda.actcc_05_87
+#: model:account.coda.trans.code,description:account_coda.actcc_07_87
+#: model:account.coda.trans.code,description:account_coda.actcc_09_87
+#: model:account.coda.trans.code,description:account_coda.actcc_11_87
+#: model:account.coda.trans.code,description:account_coda.actcc_13_87
+#: model:account.coda.trans.code,description:account_coda.actcc_30_87
+#: model:account.coda.trans.code,description:account_coda.actcc_35_87
+#: model:account.coda.trans.code,description:account_coda.actcc_41_87
+#: model:account.coda.trans.code,description:account_coda.actcc_43_87
+#: model:account.coda.trans.code,description:account_coda.actcc_47_87
+msgid "Reimbursement of costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_56
+msgid "Remittance of supplier's bill with guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_002
+msgid "Communication of the bank"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_70
+msgid "Only with stockbrokers when they deliver the securities to the bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_413
+msgid "Acceptance charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:144
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_39
+msgid "Return of an irregular bill of exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_011
+msgid "VAT"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_09
+msgid "Debit of the agios to the account of the drawee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.comm.type:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_comm_type_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_comm_type_form
+msgid "CODA Structured Communication Types"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_50
+msgid "Spot sale of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_58
+msgid "Remittance of supplier's bill without guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_03
+msgid "Payment receipt card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_207
+msgid "Non-conformity fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_022
+msgid "Priority costs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:268
+#: code:addons/account_coda/wizard/account_coda_import.py:460
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid CODA Transaction Type : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_045
+msgid "Handling costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_47_13
+msgid "Debit customer, payment of agios, interest, exchange commission, etc."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_039
+msgid "Telecommunications"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:399
+#, python-format
+msgid "Delete operation not allowed !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_000
+msgid "Net amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_11
+msgid "Department store cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_206
+msgid "Surety fee/payment under reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_53
+msgid "Cash deposit at an ATM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_52
+msgid "Forward sale of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_05
+msgid ""
+"Debit of the subscriber for the complementary payment of partly-paid shares"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_33
+#: model:account.coda.trans.code,description:account_coda.actcc_00_83
+msgid "Value correction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_27
+msgid "For publications of the financial institution"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_01
+msgid "Payment of foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_024
+msgid "Growth premium"
+msgstr ""
+
+#. module: account_coda
+#: selection:account.coda.trans.code,type:0
+msgid "Transaction Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_13
+msgid "Discount foreign supplier's bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_05
+msgid "Direct debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_47_11
+msgid "Bills of lading"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_00
+msgid "Undefined transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_62
+msgid "When reimbursed separately to the subscriber"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.category:0
+msgid "CODA Transaction Category"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_067
+msgid "Fixed loan advance - extension"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_07
+msgid "Your repayment instalment credits"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_13
+msgid "On the account of the head office"
+msgstr ""
+
+#. module: account_coda
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_115
+msgid "Terminal cash deposit"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:301
+#: code:addons/account_coda/wizard/account_coda_import.py:493
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid Structured Communication Type : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_43_01
+msgid ""
+"Debit of a cheque in foreign currency or in EUR in favour of a foreigner"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_54
+msgid "Discount abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_62
+msgid "Remittance of documents abroad - credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_35
+#: model:account.coda.trans.code,description:account_coda.actcc_00_85
+msgid "Correction"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:404
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        No partner record assigned: There are multiple partners with the "
+"same Bank Account Number '%s'!\n"
+"        Please correct the configuration and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_33
+#: model:account.coda.trans.code,description:account_coda.actcc_30_83
+msgid "Value (date) correction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_063
+msgid "Rounding differences"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:295
+#: code:addons/account_coda/wizard/account_coda_import.py:487
+#, python-format
+msgid "Transaction Category unknown, please consult your bank."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.code:0
+msgid "CODA Transaction Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_052
+msgid "Residence state tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_17
+msgid "Amount of the cheque; if any, charges receive code 37"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_120
+msgid "Correction of a transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_64
+#: model:account.coda.trans.code,description:account_coda.actcc_41_64
+msgid "Transfer to your account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_124
+msgid "Number of the credit card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_13
+msgid "Renting of safes"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,find_bbacom:0
+msgid ""
+"Partner lookup via the 'BBA' Structured Communication field of the Invoice."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_104
+msgid "Equivalent in EUR"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_50
+msgid "Remittance of foreign bill credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_03
+msgid "Your purchase by payment card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_1
+msgid ""
+"Amount as totalised by the customer; e.g. a file regrouping payments of "
+"wages or payments made to suppliers or a file regrouping collections for "
+"which the customer is debited or credited with one single amount. As a "
+"matter of principle, this type is also used when no detailed data is "
+"following (type 5)."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:519
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on information data record 3.3, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.type,type:0
+msgid "Transaction Type"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "Object to store CODA Data Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_029
+msgid "Protest charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_053
+#: model:account.coda.trans.code,description:account_coda.actcc_80_43
+msgid "Printing of forms"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_003
+msgid "Credit commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_58
+msgid "Remittance of foreign cheque credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_8
+msgid "Detail of 3."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_05_58
+msgid ""
+"(cancellation of an undue debit of the debtor at the initiative of the "
+"financial institution or the debtor for lack of cover)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_11
+msgid "Payable coupons/repayable securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_50
+msgid "Sale of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_51
+msgid "Transfer in your favour – initiated by the bank"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,coda_data:0
+#: field:account.coda.import,coda_data:0
+msgid "CODA File"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_38
+msgid "Provisionally unpaid"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_003
+msgid "RBP data"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_06
+msgid "Share option plan – exercising an option"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_051
+msgid "Withholding tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_006
+msgid "Information concerning the detail amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_37
+msgid "Costs relating to payment of foreign cheques"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,parent_id:0
+msgid "Family"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_66
+msgid "Retrocession of issue commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_68
+msgid "Credit after Proton payments"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:588
+#: code:addons/account_coda/wizard/account_coda_import.py:926
+#, python-format
+msgid "CODA Import failed !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_01
+msgid ""
+"Withdrawal by counter cheque or receipt; cash remitted by the bank clerk"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_01
+msgid "Short-term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_01
+msgid "Domestic or local SEPA credit transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_03
+msgid "Settlement credit cards"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_402
+msgid "Certification costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_015
+msgid "Correspondent charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_415
+#: model:account.coda.trans.code,description:account_coda.actcc_80_39
+msgid "Surety fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_017
+#: model:account.coda.trans.code,description:account_coda.actcc_80_23
+#: model:account.coda.trans.code,description:account_coda.actcc_80_41
+msgid "Research costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_07
+msgid "Collective transfer"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:912
+#, python-format
+msgid ""
+"\n"
+"\n"
+"Number of statements : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_05
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_07
+msgid ""
+"The principal will be debited for the total amount of the file entered."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:332
+#: code:addons/account_coda/wizard/account_coda_import.py:357
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on movement data record 2.3, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_52
+msgid "Payment in your favour"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_08
+msgid "Registering compensation for savings accounts"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_51
+msgid "Company issues paper in return for cash"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,journal:0
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_19
+msgid "Settlement of credit cards"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_87
+msgid "Reimbursement of cheque-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_50
+msgid "Settlement of instalment credit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_52
+msgid "Payment by a third person"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_60
+msgid "Remittance of documents abroad - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_52
+msgid "Loading GSM cards"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+#: field:coda.bank.statement.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_end_real:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_64
+msgid "Your issue"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:870
+#, python-format
+msgid ""
+"\n"
+"\n"
+"Bank Journal: %s\n"
+"CODA Version: %s\n"
+"CODA Sequence Number: %s\n"
+"Paper Statement Sequence Number: %s\n"
+"Bank Account: %s\n"
+"Account Holder Name: %s\n"
+"Date: %s, Starting Balance:  %.2f, Ending Balance: %.2f%s"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_01
+msgid ""
+"Purchase of domestic or foreign securities, including subscription rights, "
+"certificates, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_38
+msgid "Costs relating to incoming foreign and non-SEPA transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_52
+msgid "Whatever the currency of the security"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_069
+msgid "Forward arbitrage contracts : sum to be supplied by customer"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:388
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        There is no invoice matching the Structured Communication '%s'!\n"
+"        Please verify and adjust the invoice and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_407
+msgid "Costs Article 45"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_007
+msgid "Information concerning the detail cash"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+#: field:coda.bank.account,company_id:0
+#: field:coda.bank.statement,company_id:0
+#: field:coda.bank.statement.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_35
+msgid "Cash advance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_47
+msgid "Foreign commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_15
+msgid ""
+"Hire-purchase agreement under which the financial institution is the lessor"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_66
+msgid "Remittance of cheque by your branch - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_50
+msgid "Credit of the remitter"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.category,category:0
+msgid "Transaction Category"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_09
+msgid "Purchase of petrol coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_52
+msgid "Remittance of foreign bill credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_061
+#: model:account.coda.trans.code,description:account_coda.actcc_80_47
+msgid "Charging fees for transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_category
+msgid "CODA transaction category"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_21
+msgid "Other credit applications"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_009
+msgid "Travelling expenses"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_30
+msgid "Various transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_406
+msgid "Collection charges"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_50
+msgid "Cash payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_27
+msgid "Subscription fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_036
+msgid "Costs relating to a refused cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_101
+msgid "Credit transfer or cash payment with structured format communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_127
+msgid "European direct debit (SEPA)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_068
+msgid "Countervalue of an entry"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_010
+#: model:account.coda.trans.code,description:account_coda.actcc_80_31
+msgid "Writ service fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:635
+#, python-format
+msgid ""
+"\n"
+"The CODA Statement %s Starting Balance (%.2f) does not correspond with the "
+"previous Closing Balance (%.2f) in journal %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_13
+msgid "Your repurchase of issue"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_409
+msgid "Safe deposit charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_055
+msgid "Repayment loan or credit capital"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_05
+msgid "Settlement of fixed advance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_15
+msgid ""
+"Commission collected to the debit of the customer to whom the bank delivers "
+"a key which gives access to the night safe"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_059
+msgid "Default interest"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,coda_st_naming:0
+msgid ""
+"Define the rules to create the name of the Bank Statements generated by the "
+"CODA processing.\n"
+"E.g. %(code)s%(y)s/%(paper)s\n"
+"\n"
+"Variables:\n"
+"Bank Journal Code: %(code)s\n"
+"Current Year with Century: %(year)s\n"
+"Current Year without Century: %(y)s\n"
+"CODA sequence number: %(coda)s\n"
+"Paper Statement sequence number: %(paper)s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_108
+#: model:account.coda.trans.code,description:account_coda.actcc_35_01
+#: model:account.coda.trans.code,description:account_coda.actcc_35_50
+msgid "Closing"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_05
+msgid "Commercial paper claimed back"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_411
+msgid "Fixed collection charge"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_64
+msgid "Your winning lottery ticket"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_009
+msgid ""
+"Identification of the de ultimate ordering customer/debtor (SEPA SCT/SDD)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_05
+msgid "Card charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_03
+msgid "Payment card charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_54
+msgid "Remittance of commercial paper for discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_01
+msgid "Payment"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_07
+msgid "Purchase of gold/pieces"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_15
+msgid "Balance due insurance premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_11
+msgid "Debit of the issuer by the bank in charge of the financial service"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_58
+msgid "Remittance of cheques, vouchers, etc. credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_19
+#: model:account.coda.trans.code,description:account_coda.actcc_09_68
+msgid "Difference in payment"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,date:0
+msgid "Entry Date"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:193
+#, python-format
+msgid ""
+"\n"
+"Please check if the 'Bank Account Number', 'Currency' and 'Account "
+"Description' fields of your configuration record match with '%s', '%s' and "
+"'%s' !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_58
+msgid "Idem without guarantee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:139
+#, python-format
+msgid ""
+"\n"
+"CODA File with Filename '%s' and Creation Date '%s' has already been "
+"imported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_63
+msgid "Second credit of unpaid cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_065
+msgid "Interest payment advice"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,type:0
+#: field:coda.bank.account,state:0
+#: field:coda.bank.statement,type:0
+#: field:coda.bank.statement.line,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_112
+msgid "ATM payment (usually Eurocheque card)"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,description1:0
+msgid "Primary Account Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_126
+msgid "Term investments"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_100
+msgid ""
+"(SEPA) payment with a structured format communication applying the ISO "
+"standard 11649: Structured creditor reference to remittan"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:164
+#, python-format
+msgid ""
+"\n"
+"Foreign bank accounts with IBAN structure are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_100
+msgid "Gross amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_62
+msgid "Reversal of cheques"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:299
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_64
+#: model:account.coda.trans.code,comment:account_coda.actcc_41_13
+#: model:account.coda.trans.code,comment:account_coda.actcc_41_64
+msgid "Intracompany"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_01
+msgid "Spot purchase of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_429
+msgid "Foreign Stock Exchange tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_05
+#: model:account.coda.trans.code,description:account_coda.actcc_05_54
+msgid "Reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:868
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_405
+msgid "Bill guarantee commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_06
+msgid "Extension"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_008
+msgid "Identification of the de ultimate beneficiary/creditor (SEPA SCT/SDD)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_49
+msgid "Foreign counter transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_01
+msgid "Cash withdrawal"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_37
+msgid ""
+"Fixed right, either one-off or periodical; for details, see \"categories\""
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_05
+msgid "Loading Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_21
+msgid "Pay-packet charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,transfer_account:0
+msgid "Default Internal Transfer Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_074
+msgid "Mailing costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_07
+msgid "Unpaid foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_07
+msgid "Payment by GSM"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: selection:coda.bank.account,state:0
+#: view:coda.bank.statement:0
+#: selection:coda.bank.statement,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_50
+msgid "Credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_80
+msgid "Separately charged costs and provisions"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: field:coda.bank.account,currency:0
+#: field:coda.bank.statement,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_06
+msgid "Extension of maturity date"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_15
+msgid "Night safe"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_214
+msgid "Issue commission (delivery order)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_07
+msgid ""
+"Often by standing order or direct debit. In case of direct debit, family 13 "
+"is used."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_01
+msgid "Loading a GSM card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_021
+msgid "Costs for drawing up a bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_026
+msgid "Handling commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_201
+msgid "Advice notice commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_64
+#: model:account.coda.trans.code,description:account_coda.actcc_47_64
+msgid "Warrant"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_07
+msgid "Unpaid commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:120
+#: code:addons/account_coda/wizard/account_coda_import.py:130
+#: code:addons/account_coda/wizard/account_coda_import.py:159
+#: code:addons/account_coda/wizard/account_coda_import.py:168
+#: code:addons/account_coda/wizard/account_coda_import.py:174
+#: code:addons/account_coda/wizard/account_coda_import.py:198
+#: code:addons/account_coda/wizard/account_coda_import.py:272
+#: code:addons/account_coda/wizard/account_coda_import.py:281
+#: code:addons/account_coda/wizard/account_coda_import.py:305
+#: code:addons/account_coda/wizard/account_coda_import.py:440
+#: code:addons/account_coda/wizard/account_coda_import.py:464
+#: code:addons/account_coda/wizard/account_coda_import.py:473
+#: code:addons/account_coda/wizard/account_coda_import.py:497
+#, python-format
+msgid "Data Error!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_010
+msgid "Information pertaining to sale or purchase of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_54
+msgid "Your payment ATM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_123
+msgid "Fees and commissions"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:689
+#, python-format
+msgid ""
+"Free Communication:\n"
+" %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_15
+msgid "Purchase of an international bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,coda_st_naming:0
+msgid "Bank Statement Naming Policy"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_00
+#: model:account.coda.trans.code,description:account_coda.actcc_30_39
+#: model:account.coda.trans.code,description:account_coda.actcc_30_89
+msgid "Undefined transaction"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_06
+msgid "Costs chargeable to the remitter"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_205
+msgid ""
+"Documentary payment commission | Document commission | Drawdown fee | "
+"Negotiation fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_60
+msgid "Settlement of mortgage loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_01
+msgid "Purchase of securities"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import Log"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_07
+msgid "Domestic commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_034
+msgid "Reinvestment fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_12
+msgid "Costs for opening a bank guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_414
+msgid "Regularisation charges"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement.line,statement_id:0
+#: model:ir.actions.act_window,name:account_coda.act_account_bank_statement_goto_coda_bank_statement
+#: model:ir.model,name:account_coda.model_coda_bank_statement
+msgid "CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_15
+msgid "Your repayment hire-purchase and similar claims"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_62
+msgid "Reversal of cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_032
+msgid "Drawing up a circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Seq"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_52
+msgid "Payment night safe"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_bank_statement
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_006
+msgid "Various fees/commissions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_209
+msgid "Transfer commission"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_39
+#: model:account.coda.trans.code,description:account_coda.actcc_00_89
+msgid "Cancellation of a transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_3
+msgid ""
+"Simple amount with detailed data; e.g. in case of charges for cross-border "
+"credit transfers."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_15
+msgid "Your purchase of lottery tickets"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_05
+msgid "Collective payments of wages"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_17
+msgid "Collected for unsealed deposit of securities, and other parcels"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_004
+msgid "Counterparty’s banker"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:426
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        No matching partner record found!\n"
+"        Please adjust the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,journal:0
+msgid "Bank Journal for the Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Globalisation"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_54
+msgid "Fixed advance – capital and interest"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_11
+msgid "Payment documents abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_09
+msgid ""
+"Postage recouped to the debit of the customer (including forwarding charges)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_04
+msgid "Costs for holding a documentary cash credit"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_13
+msgid "Settlement of bank acceptances"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_200
+msgid "Overall documentary credit charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_25
+msgid "Renting of direct debit box"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_52
+msgid ""
+"Payment of coupons from a deposit or settlement of coupons delivered over "
+"the counter - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement.line,globalisation_level:0
+msgid ""
+"The value which is mentioned (1 to 9), specifies the hierarchy level of the "
+"globalisation of which this record is the first.\n"
+"The same code will be repeated at the end of the globalisation."
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,description2:0
+msgid "Secondary Account Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_211
+msgid "Credit arrangement fee | Additional credit arrangement fee"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_statements
+#: model:ir.ui.menu,name:account_coda.menu_coda_bank_statements
+msgid "CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_62
+msgid "Term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_70
+msgid "Sale of traveller’s cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,name:0
+#: field:coda.bank.statement,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,coda_creation_date:0
+msgid "CODA Creation Date"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:583
+#: code:addons/account_coda/wizard/account_coda_import.py:904
+#, python-format
+msgid ""
+"\n"
+"Unknown Error : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_035
+msgid "Charges foreign documentary bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_39
+msgid "Agios on guarantees given"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_070
+msgid "Forward arbitrage contracts : sum to be supplied by bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_56
+#: model:account.coda.trans.code,description:account_coda.actcc_11_56
+msgid "Reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_23
+msgid ""
+"Costs charged for all kinds of research (information on past transactions, "
+"address retrieval, ...)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_14
+msgid "Handling costs instalment credit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_6
+msgid ""
+"Detail of 2. Simple amount without detailed data. Normally, data of this "
+"kind comes after type 2. The customer may ask for a separate file containing "
+"the detailed data. In that case, one will speak of a ‘separate application’. "
+"The records in a separate application keep type 6."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_17
+msgid "Financial centralisation"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_404
+msgid "Discount commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_45
+msgid "Documentary credit charges"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:913
+#, python-format
+msgid ""
+"\n"
+"Number of errors : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_22
+msgid "Management/custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_51
+msgid "Tender"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_56
+msgid "Non-presented certified cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_408
+msgid "Cover commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_071
+msgid "Fixed loan advance - availability"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+#: field:account.coda.import,coda_fname:0
+msgid "CODA Filename"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_31
+msgid "E.g. for signing invoices"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_37
+msgid "Various costs for possessing or using a payment card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_37
+msgid "Costs related to commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_043
+#: model:account.coda.trans.code,description:account_coda.actcc_80_07
+msgid "Insurance costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_431
+msgid "Delivery of a copy"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,transfer_account:0
+msgid ""
+"Set here the default account that will be used for internal transfer between "
+"own bank accounts (e.g. transfer between current and deposit bank accounts)."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: view:coda.bank.account:0
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:580
+#: code:addons/account_coda/wizard/account_coda_import.py:897
+#, python-format
+msgid ""
+"\n"
+"System Error : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_60
+msgid "Non-presented circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,line_ids:0
+msgid "CODA Bank Statement lines"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.coda:0
+msgid "This CODA has already been imported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_19
+msgid "Documentary import credits"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:320
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on movement data record 2.2, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_001
+msgid "Data concerning the counterparty"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.comm.type:0
+msgid "CODA Structured Communication Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_07
+msgid "Contra-entry of a direct credit or of a discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_55
+msgid "Interest term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_007
+#: model:account.coda.trans.code,description:account_coda.actcc_80_37
+msgid "Access right to database"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_type
+msgid "CODA transaction type"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_37
+msgid "Costs relating to the payment of a foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_13
+msgid "Eurocheque written out abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_01
+msgid "Capital and/or interest (specified by the category)"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_17
+msgid "Charge for safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_102
+msgid ""
+"Credit transfer or cash payment with reconstituted structured format "
+"communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_86
+msgid "Payment after cession"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_14
+#: model:account.coda.trans.code,description:account_coda.actcc_47_14
+msgid "Warrant fallen due"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_imported_coda_files
+#: model:ir.ui.menu,name:account_coda.menu_imported_coda_files
+msgid "Imported CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_29
+msgid "Charges collected for: - commercial information - sundry information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_15
+msgid "In case of subscription before the interest due date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_43
+msgid "Foreign cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_62
+msgid "Sale of gold/pieces under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_51
+msgid "The bank takes the initiative for crediting the customer’s account."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_05
+msgid "Full or partial reimbursement of a fixed advance at maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_26
+msgid "Travel insurance premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_416
+msgid "Charges for the deposit of security"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_04
+msgid "At home as well as abroad"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:192
+#, python-format
+msgid ""
+"\n"
+"No matching CODA Bank Account Configuration record found !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_50
+msgid "Remittance of commercial paper - credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Search CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_410
+msgid "Reclamation charges"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,help:account_coda.action_coda_bank_statements
+msgid ""
+"The CODA Bank Statements contain the information encoded in their "
+"originating CODA file in a human readable format. The Bank Statements "
+"associated with a CODA contain the subset of the CODA Bank Statement data "
+"that is required for the creation of the Accounting Entries."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_114
+msgid "POS credit - individual transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_70
+msgid "Settlement of discount bank acceptance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_02
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_08
+msgid "Eurozone = countries which have the euro as their official currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_02
+msgid "The bank takes the initiative for debiting the customer’s account."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_58
+msgid "Reversal"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: selection:coda.bank.account,state:0
+#: view:coda.bank.statement:0
+#: selection:coda.bank.statement,type:0
+msgid "Info"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_02
+msgid "Costs relating to electronic output"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.coda.comm.type:0
+msgid "The Structured Communication Code must be unique !"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:57
+#, python-format
+msgid "Wizard in incorrect state. Please hit the Cancel button!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_418
+msgid "Endorsement commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_005
+msgid "Renting of letterbox"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_13
+msgid "Commission for renting a safe deposit box"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_39
+msgid "To be used for issued circular cheques given in consignment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_11
+msgid "Securities"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Free Communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_2
+msgid ""
+"Amount as totalised by the bank; e.g. : the total amount of a series of "
+"credit transfers with a structured communication As a matter of principle, "
+"this type will also be used when no detailed data (type 6 or 7) is following."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_37
+msgid "Cheque-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_033
+msgid "Charges for a foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_13
+msgid "Cash withdrawal by your branch or agents"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_049
+msgid "Fiscal stamps/stamp duty"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_58
+msgid ""
+"Also for vouchers, postal orders, anything but bills of exchange, "
+"acquittances, promissory notes, etc."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Select Your File :"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_06
+msgid "Damage relating to bills and cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_09
+msgid "Unpaid voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_13
+msgid "Unissued part (see 64)"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+#: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_1
+#: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_2
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Import CODA File"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:289
+#: code:addons/account_coda/wizard/account_coda_import.py:481
+#, python-format
+msgid "Transaction Code unknown, please consult your bank."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_55
+msgid "Fixed advance – interest only"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.type:0
+msgid "CODA Transaction Type"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_level:0
+msgid "Globalisation Level"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_020
+msgid "Costs of physical delivery"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_60
+msgid "Sale of foreign bank notes"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_52
+msgid "Remittance of commercial paper - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the Bank "
+"Account without removing it."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_54
+msgid "Among other things advances or promissory notes"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_10
+msgid "Purchase of Smartcard"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:664
+#, python-format
+msgid ""
+"Transaction Type: %s - %s\n"
+"Transaction Family: %s - %s\n"
+"Transaction Code: %s - %s\n"
+"Transaction Category: %s - %s\n"
+"Structured Communication Type: %s - %s\n"
+"Communication: %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_208
+msgid "Commitment fee deferred payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_005
+msgid "Data concerning the correspondent"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_66
+msgid "For professionals such as insurances and stockbrokers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_19
+msgid ""
+"Collected for securities, gold, pass-books, etc. placed in safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_19
+msgid ""
+"Used in case of payments accepted under reserve of count, result of "
+"overcrediting"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:630
+#, python-format
+msgid ""
+"\n"
+"Configuration Error in journal %s!\n"
+"Please verify the Default Debit and Credit Account settings."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_09
+msgid "Agio on supplier's bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_213
+msgid "Financing fee"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement.line.global,coda_statement_line_ids:0
+msgid "CODA Bank Statement Lines"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:170
+#, python-format
+msgid ""
+"\n"
+"Unsupported bank account structure !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_037
+msgid "Commission for handling charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_03
+msgid "Subscription to securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_425
+msgid "Foreign broker's commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_7
+msgid ""
+"Detail of 2. Simple account with detailed data The records in a separate "
+"application keep type 7."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_125
+#: model:account.coda.trans.code,description:account_coda.actcf_13
+#: view:coda.bank.statement.line:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:155
+#, python-format
+msgid ""
+"\n"
+"Foreign bank accounts with BBAN structure are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_09
+msgid "Counter transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_coda_bank_statement_line
+msgid "CODA Bank Statement Line"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_17
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_66
+msgid ""
+"In case of centralisation by the bank, type 2 will be allotted to this "
+"transaction. This total can be followed by the detailed movement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_057
+msgid "Interest subsidy"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_41
+msgid "International credit transfers - non-SEPA credit transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_87
+msgid "Overall amount, VAT included"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_01
+msgid "Payment of a foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "General"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:856
+#, python-format
+msgid ""
+"\n"
+"Incorrect ending Balance in CODA Statement %s for Bank Account %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_04
+msgid "Issues"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_37
+msgid ""
+"If any, detail in the category (e.g. costs for presentation for acceptance, "
+"etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_17
+msgid "Purchase of fiscal stamps"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_01
+#: model:account.coda.trans.code,description:account_coda.actcc_41_50
+msgid "Transfer"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "View Bank Statement(s)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_20
+msgid "Drawing up a certificate"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_013
+msgid "Payment commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_01
+msgid ""
+"Bills of exchange, acquittances, promissory notes; debit of the drawee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "View CODA Bank Statement(s)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_15
+msgid "Your purchase bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_05
+msgid "Payment of voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_68
+msgid "Documentary export credits"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,find_bbacom:0
+msgid "Lookup Invoice"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_03
+msgid "Cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_56
+msgid "Unexecutable reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_03
+msgid "Unpaid debt"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_52
+msgid ""
+"First credit of cheques, vouchers, luncheon vouchers, postal orders, credit "
+"under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_05
+msgid ""
+"Bill claimed back at the drawer's request (bill claimed back before maturity "
+"date)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_11
+msgid ""
+"Costs chargeable to clients who ask to have their correspondence kept at "
+"their disposal at the bank's counter"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_64
+msgid ""
+"Amount paid to the issuer by the bank in charge of the placement (firm "
+"underwriting or not); also used for the payment in full of partly-paid "
+"shares, see transaction 05"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_15
+msgid "Cheque drawn by the bank on itself, usually with charges."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_072
+msgid "Countervalue of commission to third party"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_01
+msgid "Individual transfer order"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:436
+#, python-format
+msgid ""
+"\n"
+"Movement data records of type 2.%s are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_02
+msgid "Payment by means of a payment card within the Eurozone"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_01
+msgid ""
+"Credit transfer given by the customer on paper or electronically, even if "
+"the execution date of this transfer is in the future. Domestic payments as "
+"well as euro payments meeting the requirements."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_35
+msgid "Closing (periodical settlements for interest, costs,…)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_51
+msgid "Unloading Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_019
+msgid "Tax on physical delivery"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,statement_id:0
+msgid "Associated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_08
+msgid ""
+"Debit of the remitter when the drawee pays in advance directly to the "
+"remitter (regards bank acceptances)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_103
+msgid "number (e.g. of the cheque, of the card, etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_24
+msgid "Participation in and management of interest refund system"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_58
+msgid "Payment by your branch/agents"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_25
+#: model:account.coda.trans.code,description:account_coda.actcc_43_70
+msgid "Purchase of traveller’s cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_39
+msgid "Your issue circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_09
+msgid ""
+"For professionals (stockbrokers) only, whoever the issuer may be (Belgian or "
+"foreigner)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_33
+msgid ""
+"Costs not specified otherwise, often with a manual communication (e.g. for "
+"collecting, ordering funds). VAT excluded = type 0 VAT included = type 3 (at "
+"least 3 articles)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_023
+msgid "Exercising fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:934
+#, python-format
+msgid "Import CODA File result"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_111
+msgid "POS credit – Globalisation"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:577
+#, python-format
+msgid ""
+"\n"
+"Application Error : "
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,description1:0
+#: help:coda.bank.account,description2:0
+msgid ""
+"The Primary or Secondary Account Description should match the corresponding "
+"Account Description in the CODA file."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_17
+msgid "Management fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_03
+msgid "Cash withdrawal by card (ATM)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_16
+msgid "Bank confirmation to revisor or accountant"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_04
+msgid "Cards"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.type:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_type_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_type_form
+msgid "CODA Transaction Types"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_50
+msgid "Credit after a payment at a terminal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_02
+msgid "Long-term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_05
+#: model:account.coda.trans.code,description:account_coda.actcc_30_54
+msgid "Capital and/or interest term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_68
+msgid "Credit of a payment via electronic purse"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_028
+msgid "Fidelity premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_39
+msgid "Provisionally unpaid due to other reason than manual presentation"
+msgstr ""
+
+#. module: account_coda
+#: constraint:coda.bank.account:0
+msgid ""
+"\n"
+"\n"
+"Configuration Error! \n"
+"The Bank Account Currency should match the Journal Currency !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_35
+msgid ""
+"Costs charged for calculating the amount of the tax to be paid (e.g. "
+"Fiscomat)."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_014
+msgid "Collection commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_52
+msgid "Remittance of foreign cheque credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_03
+msgid "See annexe III : communication 124"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:420
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        The bank account '%s' is not defined for the partner '%s'!\n"
+"        Please correct the configuration and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_113
+msgid "ATM/POS debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_03
+msgid "Forward purchase of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_50
+msgid "Credit of a payment via terminal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_52
+msgid "Credit provider"
+msgstr ""
+
+#. module: account_coda
+#: selection:account.coda.trans.code,type:0
+msgid "Transaction Family"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_68
+msgid "In case coupons attached to a purchased security are missing"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:57
+#: code:addons/account_coda/wizard/account_coda_import.py:325
+#: code:addons/account_coda/wizard/account_coda_import.py:337
+#: code:addons/account_coda/wizard/account_coda_import.py:362
+#: code:addons/account_coda/wizard/account_coda_import.py:513
+#: code:addons/account_coda/wizard/account_coda_import.py:524
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement,type:0
+msgid ""
+"No Bank Statements are associated with CODA Bank Statements of type 'Info'."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_58
+msgid ""
+"Takes priority over transaction 52 (hence a payment made by an agent in a "
+"night safe = 58 and not 52)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_121
+msgid "Commercial bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_11
+msgid "Costs for the safe custody of correspondence"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_041
+msgid "Credit card costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_56
+msgid "Subsidy"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_06
+msgid "Payment with tank card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_107
+msgid "Direct debit – DOM’80"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_60
+msgid "Reversal of voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_87
+msgid "Costs refunded"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_17
+msgid "Financial centralisation (debit)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_02
+msgid "Payment to the bank on maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_025
+msgid "Individual entry for exchange charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_004
+#: model:account.coda.trans.code,description:account_coda.actcc_80_09
+msgid "Postage"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_50
+msgid ""
+"For own account - the comment for the client is given in the communication; "
+"also for mixed payments (cash + cheques) - not to be communicated to the "
+"clients; for payments made by a third person: see family 01"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_68
+msgid ""
+"In case of payment accepted under reserve of count; result of undercrediting "
+"- see also transaction 19"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,bank_id:0
+msgid ""
+"Bank Account Number.\n"
+"The CODA import function will find its CODA processing parameters on this "
+"number."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_05
+msgid "Payment of wages, etc."
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:coda.bank.account:0
+msgid ""
+"The combination of Bank Account, Account Description and Currency must be "
+"unique !"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_10
+msgid "Renewal of agreed maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_55
+msgid "Income from payments by GSM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_19
+msgid "Regularisation costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_13
+#: model:account.coda.trans.code,description:account_coda.actcc_41_13
+msgid "Transfer from your account"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,currency:0
+#: help:coda.bank.statement,currency:0
+msgid "The currency of the CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_07
+msgid "Collective transfers"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:116
+#, python-format
+msgid ""
+"\n"
+"CODA V%s statements are not supported, please contact your bank!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_427
+msgid "Belgian Stock Exchange tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_12
+msgid "Safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_001
+msgid "Interest received"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_105
+msgid "original amount of the transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_09
+msgid "Your semi-standing order"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:508
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on information data record 3.2, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_09
+#: model:account.coda.trans.code,description:account_coda.actcc_11_70
+msgid "Settlement of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_01
+msgid "Debit customer who is loading"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_047
+msgid "Charges extension bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_18
+msgid "Trade information"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_203
+msgid ""
+"Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | "
+"Confirmation reservation commission | Additional reservation commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_027
+msgid "Charges for unpaid bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_204
+msgid "Amendment fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_11
+msgid "Your semi-standing order – payment to employees"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "CODA Processing"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_11
+msgid "Your repayment mortgage loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_37
+#: model:account.coda.trans.code,description:account_coda.actcc_01_37
+#: model:account.coda.trans.code,description:account_coda.actcc_04_37
+#: model:account.coda.trans.code,description:account_coda.actcc_05_37
+#: model:account.coda.trans.code,description:account_coda.actcc_09_37
+#: model:account.coda.trans.code,description:account_coda.actcc_11_37
+#: model:account.coda.trans.code,description:account_coda.actcc_30_37
+#: model:account.coda.trans.code,description:account_coda.actcc_35_37
+#: model:account.coda.trans.code,description:account_coda.actcc_80_35
+msgid "Costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_050
+msgid "Capital term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_05
+msgid "Payment of holiday pay, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_25
+msgid ""
+"Commission for the renting of boxes put at the disposal for the "
+"correspondence"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_008
+#: model:account.coda.trans.code,description:account_coda.actcc_80_29
+msgid "Information charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_03
+msgid ""
+"Credit transfer for which the order has been given once and which is carried "
+"out again at regular intervals without any change."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_0
+msgid ""
+"Simple amount without detailed data; e.g. : an individual credit transfer "
+"(free of charges)."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,find_partner:0
+msgid "Partner lookup via Bank Account Number."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_403
+msgid "Minimum discount rate"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_56
+msgid "Remittance of guaranteed foreign supplier's bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_02
+msgid "Tenders"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_07
+msgid "Unpaid foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_03
+msgid ""
+"Bonds, shares, tap issues of CDs, with or without payment of interest, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_66
+msgid "Repurchase of petrol coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_058
+msgid "Capital premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_15
+#: model:account.coda.trans.code,description:account_coda.actcc_11_62
+msgid "Interim interest on subscription"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_202
+msgid "Advising commission | Additional advising commission"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,find_partner:0
+msgid "Lookup Partner"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_statement_line
+#: model:ir.ui.menu,name:account_coda.coda_bank_statement_line
+msgid "CODA Statement Lines"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_amount:0
+msgid "Globalisation Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_13
+msgid ""
+"Transfer from one account to another account of the same customer at the "
+"bank's or the customer's initiative (intracompany)."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:890
+#, python-format
+msgid ""
+"\n"
+"Error ! "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_code
+msgid "CODA transaction code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_52
+msgid "Credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:125
+#, python-format
+msgid ""
+"\n"
+"The CODA creation date doesn't fall within a defined Accounting Period!\n"
+"Please create the Accounting Period for date %s."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_50
+msgid "Except Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_011
+msgid "Information pertaining to coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_122
+msgid "Bills - calculation of interest"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.code:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_code_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_code_form
+msgid "CODA Transaction Codes"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,state:0
+msgid ""
+"No Bank Statements will be generated for CODA Bank Statements from Bank "
+"Accounts of type 'Info'."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_49_03
+msgid "ATM withdrawal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_012
+msgid "Exchange commission"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_account_form
+#: model:ir.model,name:account_coda.model_coda_bank_account
+#: model:ir.ui.menu,name:account_coda.menu_action_coda_bank_account_form
+msgid "CODA Bank Account Configuration"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:724
+#, python-format
+msgid ""
+"Partner name: %s \n"
+"Partner Account Number: %s\n"
+"Transaction Type: %s - %s\n"
+"Transaction Family: %s - %s\n"
+"Transaction Code: %s - %s\n"
+"Transaction Category: %s - %s\n"
+"Structured Communication Type: %s - %s\n"
+"Communication: %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_04
+msgid "Cash withdrawal from an ATM"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_end:0
+msgid "Balance"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_statement_id:0
+msgid "Associated CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_37
+msgid "Credit-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_manage_coda
+msgid "CODA Configuration"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_39
+msgid "Debit of the drawer after credit under usual reserve or discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_66
+msgid "Financial centralisation (credit)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_08
+msgid "Payment in advance"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_19
+msgid "Special charge for safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_01
+msgid "Payment of your cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_43_07
+msgid "Foreign cheque remitted for collection that returns unpaid"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_07
+msgid ""
+"- insurance costs of account holders against fatal accidents - passing-on of "
+"several insurance costs"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,awaiting_account:0
+msgid ""
+"Set here the default account that will be used if the partner cannot be "
+"unambiguously identified."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:280
+#, python-format
+msgid "No CODA Bank Statement found for this Bank Statement!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_07
+msgid "Definitely unpaid cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_08
+msgid "Payment by means of a payment card outside the Eurozone"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_106
+msgid ""
+"Method of calculation (VAT, withholding tax on income, commission, etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_comm_type
+msgid "CODA structured communication type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_64
+msgid "Reversal of settlement of credit card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_58
+msgid ""
+"Repayable securities from a deposit or delivered at the counter - credit "
+"under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_5
+msgid ""
+"Detail of 1. Standard procedure is no detailing. However, the customer may "
+"ask for detailed data to be included into his file after the overall record "
+"(type 1)."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.comm.type,description:0
+#: field:account.coda.trans.category,description:0
+#: field:account.coda.trans.code,description:0
+#: field:account.coda.trans.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_01
+msgid "Payment commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_419
+msgid "Bank service fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_37
+msgid "Costs relating to outgoing foreign transfers and non-SEPA transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_17
+msgid "Your certified cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_400
+msgid "Acceptance fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_68
+msgid "Compensation for missing coupon"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_33
+msgid "Miscellaneous fees and commissions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_03
+#: model:account.coda.trans.code,description:account_coda.actcc_41_03
+msgid "Standing order"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Customer"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_49
+#: model:account.coda.trans.code,description:account_coda.actcc_01_99
+#: model:account.coda.trans.code,description:account_coda.actcc_03_49
+#: model:account.coda.trans.code,description:account_coda.actcc_03_99
+#: model:account.coda.trans.code,description:account_coda.actcc_04_49
+#: model:account.coda.trans.code,description:account_coda.actcc_04_99
+#: model:account.coda.trans.code,description:account_coda.actcc_05_49
+#: model:account.coda.trans.code,description:account_coda.actcc_05_99
+#: model:account.coda.trans.code,description:account_coda.actcc_07_49
+#: model:account.coda.trans.code,description:account_coda.actcc_07_99
+#: model:account.coda.trans.code,description:account_coda.actcc_09_49
+#: model:account.coda.trans.code,description:account_coda.actcc_09_99
+#: model:account.coda.trans.code,description:account_coda.actcc_11_49
+#: model:account.coda.trans.code,description:account_coda.actcc_11_99
+#: model:account.coda.trans.code,description:account_coda.actcc_13_49
+#: model:account.coda.trans.code,description:account_coda.actcc_13_99
+#: model:account.coda.trans.code,description:account_coda.actcc_30_49
+#: model:account.coda.trans.code,description:account_coda.actcc_30_99
+#: model:account.coda.trans.code,description:account_coda.actcc_35_49
+#: model:account.coda.trans.code,description:account_coda.actcc_35_99
+#: model:account.coda.trans.code,description:account_coda.actcc_41_49
+#: model:account.coda.trans.code,description:account_coda.actcc_41_99
+#: model:account.coda.trans.code,description:account_coda.actcc_43_49
+#: model:account.coda.trans.code,description:account_coda.actcc_43_99
+#: model:account.coda.trans.code,description:account_coda.actcc_47_49
+#: model:account.coda.trans.code,description:account_coda.actcc_47_99
+#: model:account.coda.trans.code,description:account_coda.actcc_80_49
+#: model:account.coda.trans.code,description:account_coda.actcc_80_99
+msgid "Cancellation or correction"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: field:coda.bank.account,bank_id:0
+#: field:coda.bank.statement,coda_bank_account_id:0
+#: view:coda.bank.statement.line:0
+#: field:coda.bank.statement.line,coda_bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_56
+msgid "Interest or capital subsidy"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_62
+msgid "Unpaid postal order"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_428
+msgid "Interest accrued"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.comm.type,code:0
+msgid "Structured Communication Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_401
+msgid "Visa charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_210
+msgid "Commitment fee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.category:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_category_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_category_form
+msgid "CODA Transaction Categories"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,coda_id:0
+#: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_coda
+msgid "CODA Data File"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "CODA Statement Line"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_073
+msgid "Costs of ATM abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_018
+msgid "Tental guarantee charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_430
+msgid "Recovery of foreign tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_01
+msgid "Guarantee card charges"
+msgstr ""
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index eccc8dc7068..ec7ce444aaf 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-21 01:12+0000\n"
-"Last-Translator: Cintia Sayuri Sato - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 20:47+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -43,6 +43,7 @@ msgstr "Acompanhamento"
 msgid ""
 "Check if you want to print followups without changing followups level."
 msgstr ""
+"Marque se deseja mostrar as cobranças sem modificar o nível de cobrança."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -67,6 +68,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Prezado %(partner_name)s,\n"
+"\n"
+"Necessitamos de uma atenção especial em relação a sua conta, pois apesar de "
+"termos enviado um lembrete não confirmamos o pagamento.\n"
+"\n"
+"É essencial que seja feito um pagamento imediato, caso contrário não "
+"poderemos mais continuar fornecendo sua empresa com bens e serviços.\n"
+"\n"
+"Por favor tome as medidas apropriadas para efetuar esse pagamento nos "
+"próximos 8 dias.\n"
+"\n"
+"Se houver algum problema para efetuar o pagamento da fatura que nós não "
+"estejamos cientes, por favor não deixe de entrar em contato com nosso "
+"departamento financeiro para que possamos resolver isso o mais breve "
+"possível.\n"
+"\n"
+"Os detalhes do pagamento em aberto seguem abaixo.\n"
+"\n"
+"Atenciosamente,\n"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -283,6 +304,18 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Prezado %(partner_name)s,\n"
+"\n"
+"Não detectamos o pagamento de sua fatura, por favor tome as medidas "
+"necessárias para efetuar o pagamento nos próximos 8 dias.\n"
+"\n"
+"Se tiver algum problema com a fatura ou o pagamento não deixe de entrar em "
+"contato com nosso departamento financeiro.\n"
+"\n"
+"Se o pagamento já foi feito, por favor desconsidere essa mensagem.\n"
+"\n"
+"Atenciosamente,\n"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
@@ -520,7 +553,7 @@ msgstr "Relatório de Acompanhamento"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "Passos para Cobrança"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -552,7 +585,7 @@ msgstr "Máximo Nível de Acompanhamento"
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "Rever as Cobranças de Pagamento"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -567,6 +600,10 @@ msgid ""
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"Defina níveis de cobrança e suas mensagens relacionadas. Para cada passo, "
+"especifique a mensagem e o dia de atraso. Use a legenda para saber o código "
+"usado e adaptar o conteúdo do email para o bom contexto (bom nome e data "
+"boa) e você pode gerenciar mensagens em diversos idiomas."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -581,6 +618,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"O E-Mail não foi enviado aos seguintes Parceiros, E-mail não disponível!\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -596,7 +636,7 @@ msgstr "%(date)s: Data Atual"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Incluindo os itens de diário marcados como em protesto"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -612,7 +652,7 @@ msgstr "Descrição"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "Apenas uma cobrança por Empresa"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -630,6 +670,8 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"Não altere a mensagem de texto se você deseja enviar o email no idioma do "
+"parceiro, ou configurar pela Empresa"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -704,6 +746,22 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Prezado %(partner_name)s,\n"
+"\n"
+"Apesar de diversas mensagens, ainda não confirmamos o pagamento de sua "
+"fatura.\n"
+"\n"
+"A menos que o pagamento seja efetuado  nos próximos 8 dias, ações legais "
+"para a recuperação do crédito poderão ser tomadas sem próximo aviso.\n"
+"\n"
+"Acreditamos em suas ações para resolver essa pendência o mais breve "
+"possível, os detalhes do pagamento seguem abaixo.\n"
+"\n"
+"No caso de qualquer dúvida sobre esta questão, não deixe de entrar em "
+"contato com nosso departamento financeiro.\n"
+"\n"
+"Atenciosamente,\n"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -713,7 +771,7 @@ msgstr "Você não pode criar ítens de diário em uma conta fechada."
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(line)s: Ledger Posting lines"
-msgstr ""
+msgstr "%(line)s: Lançamentos no Razão"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
@@ -723,7 +781,7 @@ msgstr "Sequência"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(company_name)s: Empresa do Usuário"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
diff --git a/addons/account_sequence/i18n/nl_BE.po b/addons/account_sequence/i18n/nl_BE.po
new file mode 100644
index 00000000000..b5628085fb8
--- /dev/null
+++ b/addons/account_sequence/i18n/nl_BE.po
@@ -0,0 +1,227 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-07-27 13:19+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-28 04:57+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr "Instellen boekingsnummers"
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+"U kunt niet meer dan een beweging maken per periode in een "
+"centralisatiedagboek."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "De rekening en de periode moeten van dezelfde firma zijn."
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "Intern volgnummer"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Volgend nummer in deze reeks"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Volgend nummer"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Verhogen met"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Het volgende nummer in de reeks wordt verhoogd met dit getal."
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Uw boekingsnummers instellen"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Instellingen"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Suffix voor het volgnummer"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+"Dit volgnummer wordt gebruikt voor de interne nummering van boekingen in dit "
+"journaal."
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Nummergrootte"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Boekingslijnen"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Intern nummer"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+"U kunt geen boekingslijnen maken voor een rekening van het type Weergave."
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP voegt automatisch links van het 'Volgend nummer' enkele "
+"voorloopnullen toe om de juiste grootte te krijgen."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Naam"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "U kunt niet boeken op een afgesloten rekening."
+
+#. module: account_sequence
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Configuratiefout: de gekozen munt moet door de standaardrekeningen worden "
+"gedeeld."
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Verkeerde credit– of debetwaarde in de boeking."
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Intern volgnummer"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Prefix voor het volgnummer"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Boeking"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Suffix"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Afbeelding"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "Titel"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "De naam van het journaal moet uniek zijn per firma."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"De gekozen rekening van uw boeking vereist een secundaire munt. U moet de "
+"secundaire munt van de rekening verwijderen of een multivalutaweergave "
+"kiezen voor het journaal."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"De datum van uw boeking ligt niet in de gedefinieerde periode. Verander de "
+"datum of schakel de optie op het journaal uit."
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefix"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "De code van het journaal moet uniek zijn per firma."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "account.sequence.installer"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Journaal"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr "Verbeter de boekingsnummering en installeer"
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 7b55326edf6..3f110641ff1 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:21+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 14:28+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:10+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -53,6 +53,7 @@ msgstr "Lançamentos Abertos dos Clientes"
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
 msgstr ""
+"Você precisa configurar o código da conta base e o código do imposto em '%s'!"
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
@@ -102,6 +103,10 @@ msgid ""
 "automatically and you can record the customer payment related to this sales "
 "receipt."
 msgstr ""
+"Quando você vende produtos para um cliente, você pode fornecer um recibo ou "
+"fatura. Quando o pagamento da venda é confirmado,  é criado um item de "
+"diário automaticamente e você pode registrar  este pagamento relacionando a "
+"esta mesma venda."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -157,7 +162,7 @@ msgstr "Procurar Comprovantes"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr ""
+msgstr "Conta de Contrapartida"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0 field:account.voucher.line,account_id:0
@@ -178,7 +183,7 @@ msgstr "Ok"
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "Reconciliação Completa"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0 field:account.voucher.line,date_due:0
@@ -200,6 +205,11 @@ msgid ""
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
 msgstr ""
+"Pagamentos de venda permitem a você registrar os pagamentos que você recebe "
+"de seus clientes. Para registrar um pagamento, você precisa escolher o "
+"cliente, a forma de pagamento (=o diário) e o valor pago. O OpenErp irá "
+"propor automaticamente a reconciliação desse pagamento com as faturas ou "
+"recibos de venda."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -214,7 +224,7 @@ msgstr "Item Livro"
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
-msgstr ""
+msgstr "Vale Multi Moeda"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -264,12 +274,12 @@ msgstr "Imposto"
 #. module: account_voucher
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "O diário e o período escolhido tem que pertencer à mesma empresa."
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "Comentário da Contrapartida"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -314,6 +324,8 @@ msgid ""
 "Computed as the difference between the amount stated in the voucher and the "
 "sum of allocation on the voucher lines."
 msgstr ""
+"Calculado como a diferença entre o valor lançado no comprovante e a soma de "
+"todas as linhas do comprovante"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -333,7 +345,7 @@ msgstr "Erro! Você não pode criar empresas recursivas"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "current month"
-msgstr ""
+msgstr "mês atual"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,period_id:0
@@ -374,7 +386,7 @@ msgstr "Deseja remover os lançamentos contábeis também?"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Pro-forma Vouchers"
-msgstr ""
+msgstr "Comprovantes Pro-forma"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -413,7 +425,7 @@ msgstr "Pagar Fatura"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "Tem certeza de que deseja des-reconciliar e cancelar este registro?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -456,7 +468,7 @@ msgstr "Atraso Médio"
 #. module: account_voucher
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Income Currency Rate"
-msgstr ""
+msgstr "Taxa de Câmbio de Entrada"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
@@ -472,7 +484,7 @@ msgstr "Valor do Imposto"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Validated Vouchers"
-msgstr ""
+msgstr "Comprovantes Validados"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0 view:account.voucher.line:0
@@ -528,6 +540,8 @@ msgid ""
 "Fields with internal purpose only that depicts if the voucher is a multi "
 "currency one or not"
 msgstr ""
+"Campos com propósitos internos que apenas retrata se um comprovante é multi "
+"moedas ou não."
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
@@ -543,7 +557,7 @@ msgstr "Dezembro"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Agrupar por mês da fatura"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,month:0
@@ -588,12 +602,12 @@ msgstr "Média de Atraso para Pagar"
 #. module: account_voucher
 #: help:account.voucher,paid:0
 msgid "The Voucher has been totally paid."
-msgstr ""
+msgstr "O comprovante foi totalmente pago"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "Reconciliar o Balanço do Pagamento"
 
 #. module: account_voucher
 #: view:account.voucher:0 selection:account.voucher,state:0
@@ -608,11 +622,14 @@ msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Income Currency Rate' on the company! "
 msgstr ""
+"Não foi possivel criar uma entrada contábil para a diferença da taxa de "
+"câmbio. Você precisa configurar o campo 'Taxa de Câmbio de Entrada' na "
+"Empresa! "
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
 msgid "Draft Vouchers"
-msgstr ""
+msgstr "Comprovantes Provisórios"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total_tax:0
@@ -651,7 +668,7 @@ msgstr "Junho"
 #. module: account_voucher
 #: field:account.voucher,payment_rate_currency_id:0
 msgid "Payment Rate Currency"
-msgstr ""
+msgstr "Taxa de Pagamento"
 
 #. module: account_voucher
 #: field:account.voucher,paid:0
@@ -687,7 +704,7 @@ msgstr "Filtros Extendidos..."
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "Valor pago na moeda da Empresa"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
@@ -739,7 +756,7 @@ msgstr "Empresas"
 #: code:addons/account_voucher/account_voucher.py:462
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\" !"
-msgstr ""
+msgstr "Por favor defina a conta padrão de crédito/débito no diário \"%s\" !"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -755,12 +772,12 @@ msgstr "Favor definir a seqüencia no Livro !"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Abrir o diário de Entradas de Fornecedor"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Allocation"
-msgstr ""
+msgstr "Total Alocado"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -780,12 +797,12 @@ msgstr "Faturas e transações pendentes"
 #. module: account_voucher
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Expense Currency Rate"
-msgstr ""
+msgstr "Taxa de Despesas"
 
 #. module: account_voucher
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "O número da fatura deve ser único por Empresa!"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total:0
@@ -911,12 +928,12 @@ msgstr "Pagar"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "year"
-msgstr ""
+msgstr "ano"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Currency Options"
-msgstr ""
+msgstr "Opções de Moedas"
 
 #. module: account_voucher
 #: help:account.voucher,payment_option:0
@@ -926,6 +943,9 @@ msgid ""
 "either choose to keep open this difference on the partner's account, or "
 "reconcile it with the payment(s)"
 msgstr ""
+"Este campo ajuda você a escolher o que deseja fazer com a eventual diferença "
+"entre o valor pago e a soma dos recursos alocados. Você pode tanto escolher "
+"mantes essa diferença na conta do parceiro, ou reconciliar com o pagamento."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -947,12 +967,12 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Posted Vouchers"
-msgstr ""
+msgstr "Comprovantes Lançados"
 
 #. module: account_voucher
 #: field:account.voucher,payment_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Taxa de Câmbio"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1001,7 +1021,7 @@ msgstr "Valor Original"
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
-msgstr ""
+msgstr "Recibo de Compra"
 
 #. module: account_voucher
 #: help:account.voucher,payment_rate:0
@@ -1009,6 +1029,8 @@ msgid ""
 "The specific rate that will be used, in this voucher, between the selected "
 "currency (in 'Payment Rate Currency' field)  and the voucher currency."
 msgstr ""
+"A taxa de cambio específica será usada, neste comprovante, entre a moeda "
+"escolhida (em 'Câmbio de Pagamento') e a definida no comprovante."
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0 view:account.invoice:0
@@ -1041,7 +1063,7 @@ msgstr "Faturas e Transações de Fornecedores Pendentes"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mês-1"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -1051,7 +1073,7 @@ msgstr "Abril"
 #. module: account_voucher
 #: help:account.voucher,tax_id:0
 msgid "Only for tax excluded from price"
-msgstr ""
+msgstr "Apenas para impostos excluídos do preço"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:931
@@ -1060,6 +1082,8 @@ msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Expense Currency Rate' on the company! "
 msgstr ""
+"Não foi possível criar uma entrada para a diferença entre o câmbio. Você "
+"precisa configurar o campo 'Câmbio de Despesa' na Empresa "
 
 #. module: account_voucher
 #: field:account.voucher,type:0
diff --git a/addons/analytic/i18n/pt_BR.po b/addons/analytic/i18n/pt_BR.po
index 63eda5e326a..7c8ff43fd8b 100644
--- a/addons/analytic/i18n/pt_BR.po
+++ b/addons/analytic/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-28 20:55+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 15:08+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:17+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -88,7 +88,7 @@ msgstr ""
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "New"
-msgstr ""
+msgstr "Novos"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
@@ -133,6 +133,11 @@ msgid ""
 "consolidation purposes of several companies charts with different "
 "currencies, for example."
 msgstr ""
+"Se você definir uma Empresa, a moeda selecionada precisa ser a mesma que a "
+"sua moeda.\n"
+"Você pode remover a empresa, e alterar sua moeda, somente numa conta "
+"analítica do tipo 'visualização'. Isto pode ser muito útil  para propósitos "
+"de consolidar os gráficos de empresas com moedas diferentes, por exemplo."
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
@@ -172,12 +177,12 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
 msgid "Account Hierarchy"
-msgstr ""
+msgstr "Hierarquia da Conta"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of time to work on the contract."
-msgstr ""
+msgstr "Defina o maior limite de tempo para trabalhar no contrato."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -197,7 +202,7 @@ msgstr "Contatar"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Code/Reference"
-msgstr ""
+msgstr "Código/Referência"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -208,7 +213,7 @@ msgstr "Cancelado"
 #: code:addons/analytic/analytic.py:138
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erro!"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
@@ -237,12 +242,12 @@ msgstr "Data de término"
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Time"
-msgstr ""
+msgstr "Tempo máximo:"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Contabilidade Analítica"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -258,12 +263,12 @@ msgstr "Conta Analítica"
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Moeda"
 
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Você não pode criar uma linha analítica na visualização da conta"
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index a0f4fe0d092..e2aa342be6b 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-13 21:15+0000\n"
-"Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
+"PO-Revision-Date: 2012-07-28 16:30+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:11+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
@@ -30,6 +30,7 @@ msgstr "Tabela da relação entre usuários e produtos em uma conta analítica"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Você não pode modificar uma entrada que está como Confirmada/Concluída"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
diff --git a/addons/anonymization/i18n/pt_BR.po b/addons/anonymization/i18n/pt_BR.po
index c763ae21b49..e84f7055977 100644
--- a/addons/anonymization/i18n/pt_BR.po
+++ b/addons/anonymization/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-15 14:48+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 16:33+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:26+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -25,7 +25,7 @@ msgstr "ir.model.fields.anonymize.wizard"
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
-msgstr "Nome do campo"
+msgstr "Nome do Campo"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_id:0
@@ -36,7 +36,7 @@ msgstr "Campo"
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
@@ -165,7 +165,7 @@ msgstr "Nome do Objeto"
 #: view:ir.model.fields.anonymization.history:0
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
 msgid "Anonymization History"
-msgstr ""
+msgstr "Histórico de Anonimização"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index d8df4972d42..a8dcc0e425d 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-26 01:21+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-07-28 16:36+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:09+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
@@ -39,11 +39,13 @@ msgid ""
 "There is already a rule defined on this object\n"
 " You cannot define another: please edit the existing one."
 msgstr ""
+"Já existe uma regra definida neste objeto\n"
+" Você não pode definir outra: por favor edite uma existente."
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribed Rule"
-msgstr ""
+msgstr "Regra Inscrita"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
@@ -72,7 +74,7 @@ msgstr "Status"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Inscrever-se"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -329,7 +331,7 @@ msgstr "RegistroS da Trilha de Auditoria"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Draft  Rule"
-msgstr ""
+msgstr "Regra Temporária"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
@@ -372,7 +374,7 @@ msgstr "Linha do Registro"
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
 msgid "Log Action"
-msgstr ""
+msgstr "Registrar Ação"
 
 #. module: audittrail
 #: help:audittrail.rule,log_create:0
diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po
index 3b89b3c8ea6..0fb954ea6b8 100644
--- a/addons/base_action_rule/i18n/pt_BR.po
+++ b/addons/base_action_rule/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-21 15:26+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 14:59+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -38,7 +38,7 @@ msgstr "Categoria do Parceiro"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
 msgid "Mail to Watchers (CC)"
-msgstr ""
+msgstr "Email para Observadores (CC)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_to:0
@@ -53,12 +53,12 @@ msgstr "Objeto"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
 msgid "Mail to these Emails"
-msgstr ""
+msgstr "Enviar para estes Emails"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Mudar Situação para"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_from:0
@@ -121,7 +121,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
-msgstr ""
+msgstr "Condições no Modelo de Parceiro"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -146,7 +146,7 @@ msgstr "Lembretes por Email"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Special Keywords to be Used in the Body"
-msgstr ""
+msgstr "Palavras Chave especiais para ser Usadas no Corpo"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
@@ -328,7 +328,7 @@ msgstr "Ativo"
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
 msgid "No Email ID Found for your Company address!"
-msgstr ""
+msgstr "Email não encontrado para o endereço de sua Empresa!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
diff --git a/addons/base_iban/i18n/pt_BR.po b/addons/base_iban/i18n/pt_BR.po
index 944f65615fa..a85f0a71e24 100644
--- a/addons/base_iban/i18n/pt_BR.po
+++ b/addons/base_iban/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 00:46+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 15:02+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:39+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:36+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -23,22 +23,25 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para "
+"fazer pagamentos válidos"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:139
 #, python-format
 msgid "This IBAN does not pass the validation check, please verify it"
-msgstr ""
+msgstr "Este IBAN não passou no check de validação, por favor verifique"
 
 #. module: base_iban
 #: model:res.partner.bank.type,format_layout:base_iban.bank_iban
 msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
-msgstr ""
+msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bank_bic"
-msgstr ""
+msgstr "bank_bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -66,7 +69,7 @@ msgstr "country_id"
 msgid ""
 "The IBAN does not seem to be correct. You should have entered something like "
 "this %s"
-msgstr ""
+msgstr "Este IBAN não parece estar correto. Você deve digitar algo como  %s"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -77,7 +80,7 @@ msgstr "Banco Internacional"
 #: code:addons/base_iban/base_iban.py:140
 #, python-format
 msgid "The IBAN is invalid, it should begin with the country code"
-msgstr ""
+msgstr "Este IBAN é inválido, Ele deverá começar com o código de país"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
@@ -87,7 +90,7 @@ msgstr "Conta no Banco Internacional"
 #. module: base_iban
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "A RIB e/ ou IBAN não é válido."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index c879a913093..ac2b7f9dc7b 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-12 01:34+0000\n"
+"PO-Revision-Date: 2012-07-28 21:52+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
 msgid "Display Tips"
-msgstr "ヒントを表示する。"
+msgstr "ヒントの表示"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -45,7 +45,7 @@ msgstr "メンバー"
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr "Googleの連絡先を同期する。"
+msgstr "Googleコンタクトの同期"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -57,7 +57,7 @@ msgstr "新規ユーザのタイムゾーンのデフォルト設定のために
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr "取り込む"
+msgstr "インポート"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -67,7 +67,7 @@ msgstr "提供者"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr "会社のヘッダーとフッターを設定します。"
+msgstr "会社ヘッダーとフッターの設定"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -76,8 +76,8 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
-"レポートに印刷されますので、会社のデータ（アドレス、ロゴ、銀行口座）を記入してください。　PDF "
-"ドキュメントのヘッダー/フッターを確認するには、\"ヘッダープレビュー\"をクリックします。"
+"レポートに印刷される会社のデータ（アドレス、ロゴ、銀行口座）を記入して下さい。PDF "
+"ドキュメントのヘッダー/フッターを確認するには、ヘッダープレビューをクリックします。"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -102,7 +102,7 @@ msgid ""
 "Data\" wizard"
 msgstr ""
 "このフォームから手動で顧客とその連絡先を作成またはインポート或いは "
-"\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナーをインポートすることができます。"
+"\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナをインポートすることができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -112,7 +112,7 @@ msgstr "ユーザのプリファレンスを定義します。"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr "ユーザのプリファレンスを初期値に定義します。"
+msgstr "デフォルトのユーザプリファレンスの設定"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
@@ -131,8 +131,7 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
-"初めてopenERPを利用する場合は、簡素化されたインターフェイスを選択されることをお勧めします。設定後いつでもユーザープリファレンスから設定変更ができま"
-"す。"
+"初めてopenERPを利用する場合は、簡素化されたインタフェースを選択されることをお勧めします。設定後いつでもユーザプリファレンスから切り替えができます。"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -143,7 +142,7 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: field:user.preferences.config,view:0
 msgid "Interface"
-msgstr "インターフェース"
+msgstr "インタフェース"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
@@ -160,7 +159,7 @@ msgstr "アプリケーション全体の顧客の用語を変更するには、
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr "占有者"
+msgstr "テナント"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -179,8 +178,8 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
-"UI翻訳が利用可能な時は、既定の言語を全てのユーザインターフェースに設定します。新しい言語を追加する場合は、\"管理\" "
-"メニューのウィザード\"オフィシャル翻訳をロードする' から追加することができます。"
+"UI翻訳が利用可能な時は、既定の言語を全てのユーザインタフェースに設定します。新しい言語を追加する場合は、\"管理\" "
+"メニューのウィザード\"オフィシャル翻訳のロード\"から追加することができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -189,8 +188,7 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
-"これは新規ユーザーのデフォルトのプリファレンスを設定し、既存のすべてのものを更新します。　その後に、ユーザーはユーザー設定フォームで自由に設定変更ができま"
-"す。"
+"これは新規ユーザのデフォルトのプリファレンスを設定し、既存のすべてのものを更新します。　その後に、ユーザはユーザ設定フォームで自由に設定変更ができます。"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -274,7 +272,7 @@ msgstr "簡易化"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr "SugarCRMを取り込むために"
+msgstr "SugarCRMのインポートのため"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -284,9 +282,9 @@ msgstr "パートナ"
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr "用語を指定します。"
+msgstr "用語の定義"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr "Googleの連絡先を同期するために"
+msgstr "Googleコンタクトとの同期のため"
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 43313b581e8..9e1204b9e24 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-26 22:45+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:07+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -52,6 +52,8 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
+"Defina o padrão para a timezone de novos usuários, usado para fazer "
+"conversões de timezones entre servidor e cliente."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
@@ -61,7 +63,7 @@ msgstr "Importar"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Doador"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
@@ -75,6 +77,9 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"Preencha os dados da empresa (Endereço, logo, contas bancárias) para que "
+"seja exibido em seus relatórios. Você pode clicar no botão \"Visualizar "
+"Cabeçalho\" para verificar o cabeçalho/rodapé dos documentos PDF"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -98,6 +103,9 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"Crie ou importe clientes e seus contatos manualmente a partir deste "
+"formulário, ou você pode importar seus parceiros existentes por planilhas "
+"CSV através do assistente \"Importar Dados\""
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -112,12 +120,12 @@ msgstr "Define as Preferências Padrão dos Usuários"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Importar do Saleforce"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "Para Quickbooks Ippids"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -152,11 +160,13 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Você pode usar este assistente para mudar as terminologias para clientes em "
+"toda a aplicação"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Locatário"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -175,6 +185,10 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Defina o idioma padrão para toda a interface de usuário, quando traduções de "
+"UI estiverem disponíveis. Se você quiser adicionar um novo idioma, você pode "
+"adicionar pelo assistente \"Carregar uma tradução oficial\" do menu de "
+"administrador"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -183,16 +197,19 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"Isto irá definir as preferências padrões para novos usuários e atualizar "
+"todos os existentes. Após isso, os usuários são livres para alterarem esses "
+"valores para suas próprias preferencias"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Como você chama um Cliente"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks Ippids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -202,7 +219,7 @@ msgstr "Cliente"
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr ""
+msgstr "Importar Saleforce"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
@@ -212,7 +229,7 @@ msgstr "Fuso Horário"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Use uma outra palavra para dizer \"Cliente\""
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
diff --git a/addons/base_vat/i18n/ja.po b/addons/base_vat/i18n/ja.po
index c0c5b614bc6..175d51422de 100644
--- a/addons/base_vat/i18n/ja.po
+++ b/addons/base_vat/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-20 17:45+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 00:19+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -70,7 +70,7 @@ msgid ""
 "If checked, Partners VAT numbers will be fully validated against EU's VIES "
 "service rather than via a simple format validation (checksum)."
 msgstr ""
-"これをチェックすると，パートナーの付加価値税番号が，単なるフォーマットの検証（チェックサムう）ではなく，EUのVIEAサービスに対して検証されます。"
+"これをチェックすると，パートナの付加価値税番号が，単なるフォーマットの検証（チェックサム）ではなく，EUのVIEAサービスに対して検証されます。"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index 444bd4ac43e..8dea564f267 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-16 16:06+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 18:37+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -23,31 +23,33 @@ msgid ""
 "This VAT number does not seem to be valid.\n"
 "Note: the expected format is %s"
 msgstr ""
+"Este número VAT não parece ser válido.\n"
+"Nota: o formato esperado é %s"
 
 #. module: base_vat
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser exclusivo!"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
 msgid "VIES VAT Check"
-msgstr ""
+msgstr "Verificar VIES VAT"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Empresas"
 
 #. module: base_vat
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Você não pode criar empresas recursivas."
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -69,6 +71,8 @@ msgid ""
 "If checked, Partners VAT numbers will be fully validated against EU's VIES "
 "service rather than via a simple format validation (checksum)."
 msgstr ""
+"Se marcado, VAT do parceiro serão totalmente verificado nos serviços dos "
+"órgãos VIES ao invés de apenas uma validação de formato"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/caldav/i18n/pt_BR.po b/addons/caldav/i18n/pt_BR.po
index 53021cb6c46..789ad9dfb38 100644
--- a/addons/caldav/i18n/pt_BR.po
+++ b/addons/caldav/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:49+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 18:39+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -25,7 +25,7 @@ msgstr "Mapeamento de Valor"
 #. module: caldav
 #: help:caldav.browse,url:0
 msgid "Url of the caldav server, use for synchronization"
-msgstr ""
+msgstr "URL do servidor caldav, use para sincronização"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:99
@@ -126,7 +126,7 @@ msgstr "À Fazer"
 #. module: caldav
 #: model:ir.model,name:caldav.model_user_preference
 msgid "User preference Form"
-msgstr ""
+msgstr "Preferências do usuário"
 
 #. module: caldav
 #: field:user.preference,service:0
@@ -141,7 +141,7 @@ msgstr "Expressão tão constante"
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Evolution"
-msgstr ""
+msgstr "Evolução"
 
 #. module: caldav
 #: view:calendar.event.import:0
@@ -188,7 +188,7 @@ msgstr ""
 #. module: caldav
 #: view:user.preference:0
 msgid "Caldav's host name configuration"
-msgstr ""
+msgstr "Configuração do host name do Caldav"
 
 #. module: caldav
 #: field:caldav.browse,url:0
@@ -289,7 +289,7 @@ msgstr "_Abrir"
 #. module: caldav
 #: view:user.preference:0
 msgid "Next"
-msgstr ""
+msgstr "Próximo"
 
 #. module: caldav
 #: field:basic.calendar,type:0
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 158ac76cfa7..eaee44fc334 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-26 22:39+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 18:57+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:48+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -172,7 +172,7 @@ msgstr "Mês de fechamento esperado"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "Oportunidades atribuídas para"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -454,6 +454,13 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Estágios permitem ao vendedor para rastrear de uma forma fácil como uma "
+"oportunidade está posicionada no ciclo de vendas. Para gerenciar de uma "
+"forma eficiente seu funil de vendas, é importante definir condições para ir "
+"para o próximo passo. Por Exemplo, marcando uma Oportunidade como "
+"\"Qualificada\", você precisa especificar a \"Receita Esperada\" e o "
+"\"Fechamento Esperado\". Você também poderá consultar a dica de \"Mudar a "
+"Probabilidade Automaticamente\"."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -535,7 +542,7 @@ msgstr "E-mail"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr "Ligações de telefone  dos últimos 7 dias"
+msgstr "Ligações telefônicas dos últimos 7 dias"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -592,7 +599,7 @@ msgstr "Data de término"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Agendar/Registrar uma Ligação"
 
 #. module: crm
 #: constraint:base.action.rule:0
@@ -737,6 +744,12 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Defina Equipe de Vendas para estruturar seu departamento de vendas e "
+"associar usuários a cada Equipe. Você também deve definir o estágio de "
+"vendas de cada equipe. Por exemplo, se você usar técnicas de Vendas de "
+"Soluções para rastrear suas oportunidades, você pode associar o seguinte "
+"estágio para a equipe: Território, Qualificado, Patrocinador Qualificado, "
+"Proposta, Negociação, Ganha/Perda"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -779,7 +792,7 @@ msgstr "Continuar"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "Dias por Período"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -906,7 +919,7 @@ msgstr "Fornecedor"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr "Marcar como Vencido"
+msgstr "Ganhamos!"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -916,7 +929,7 @@ msgstr "Total da Compra"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr "Marcar como Perdido"
+msgstr "Perdemos"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -946,7 +959,7 @@ msgstr "Dias para Abrir"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "Mostrar horário como"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -1183,7 +1196,7 @@ msgstr "Email para Parceiro"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr "Detalhes da Chamada"
+msgstr "Detalhes da Ligação"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1329,7 +1342,7 @@ msgstr "Escrever Data"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "Fim da recorrência"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1353,7 +1366,7 @@ msgstr "Definir um alarme neste momento, antes da ocorrência do evento"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr "Agendar Chamada"
+msgstr "Agendar Ligação"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1379,6 +1392,10 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"A situação é marcada como \"A Fazer\", quando um chamado é criado.\n"
+"Se o chamado está em progresso, a situação é marcada como \"Aberto\".\n"
+"Quando a ligação é finalizada, a situação é marcada como \"Concluida\".\n"
+"Se a chamada precisa ser refeita então a situação é marcada como \"Pendente\""
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1593,7 +1610,7 @@ msgstr "Erro ! Você não pode criar um Time de Vends recursivo."
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr "Logar a chamada"
+msgstr "Registrar a Ligação"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -1885,7 +1902,7 @@ msgstr "Responder-Para"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "Escolha os estágios para esta Equipe de Vendas"
 
 #. module: crm
 #: view:board.board:0
@@ -1925,7 +1942,7 @@ msgstr "Canais"
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr "Ajuda"
+msgstr "Concluída"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2000,7 +2017,7 @@ msgstr "Local"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Prospectos para Oportunidades  em lote"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2129,7 +2146,7 @@ msgstr "Prospecções/Oportunidades com o status de novo"
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr "Não Segura"
+msgstr "Pendente"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2198,7 +2215,7 @@ msgstr "Criar um Novo Parceiro"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr "Agendar Chamadas"
+msgstr "Ligações Agendadas"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2208,7 +2225,7 @@ msgstr "Data de Início"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr "Agendar Chamadas Telefônicas"
+msgstr "Ligações Agendadas"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2759,7 +2776,7 @@ msgstr "Endereço de E-mail do contato"
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "Indicado por"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
@@ -2797,7 +2814,7 @@ msgstr "Erro!"
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0 field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr "Resumo da Chamada"
+msgstr "Resumo da ligação"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
@@ -2897,7 +2914,7 @@ msgstr "# Emails"
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr "Resumo da Chamada"
+msgstr "Resumo da Ligação"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2913,6 +2930,12 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Ligações agendadas mostra todas as ligações que precisam ser feitas pela "
+"equipe de vendas. Um vendedor pode gravar as informações sobre uma chamada "
+"na visão de formulário. Esta informação será gravada no formulário de "
+"parceiro para rastrear cada contato que você fizer com um cliente. Você "
+"também pode importar um arquivo .CSV com uma lista de chamadas a serem "
+"feitas por sua equipe."
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2928,7 +2951,7 @@ msgstr "Chamada Telefônica para Chamada Telefônica"
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr "Agenda/Registro de Chamadas"
+msgstr "Agendar/Registrar Ligações"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -3133,6 +3156,13 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"Um período é a média de dias entre dois ciclos de compras ou vendas para "
+"esta segmentação. \n"
+"É usado principalmente para detectar se um parceiro não vende ou compra a um "
+"tempo,\n"
+"então nós presumimos que  seu estado de espírito esfriou por que "
+"provavelmente ele comprou bens de outro fornecedor.\n"
+"Use esta funcionalidade para negócios recorrentes."
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
@@ -3417,7 +3447,7 @@ msgstr "Fechar"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr "Agendar a chamada"
+msgstr "Agendar a Ligação"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -4791,4 +4821,4 @@ msgstr "Notícias"
 #~ msgstr "Oportunidades atribuídas a"
 
 #~ msgid "Schedule call"
-#~ msgstr "Agendar Chamada"
+#~ msgstr "Agendar ligação"
diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po
index 0c09d80c5a7..974ec4454ee 100644
--- a/addons/crm_partner_assign/i18n/pt_BR.po
+++ b/addons/crm_partner_assign/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-07 17:41+0000\n"
-"Last-Translator: Alexsandro Haag <alexsandro.haag@gmail.com>\n"
+"PO-Revision-Date: 2012-07-28 18:41+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:24+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,12 +25,12 @@ msgstr "Enviar para"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Tipo de Mensagem"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Excluir Permanentemente o email após o envio"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -40,7 +40,7 @@ msgstr "Espera para Fechar"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Destinatários da mensagem"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -61,7 +61,7 @@ msgstr "Agrupar Por..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Modelo"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -76,12 +76,12 @@ msgstr "Localização Geográfica"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Versão em texto"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Conteúdo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -101,7 +101,7 @@ msgstr "Atraso para fechar"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "#Parceiro"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -137,7 +137,7 @@ msgstr "Mais Alta"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_text:0
 msgid "Text contents"
-msgstr ""
+msgstr "Conteúdo"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -148,7 +148,7 @@ msgstr "Dia"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Identificador da mensagem"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -167,6 +167,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Adicione aqui todos os anexos do documento atual que você quiser incluir no "
+"e-mail."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -195,17 +197,17 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Versão em Rich-text/HTML"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Excluir automaticamente"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Cópia oculta para os destinatários"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -254,7 +256,7 @@ msgstr "Seção"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -286,7 +288,7 @@ msgstr "Tipo"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -299,11 +301,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipo de mensagem, geralmente 'html' ou 'texto', usado para selecionar texto "
+"puro ou html"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Data Associada"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -318,7 +322,7 @@ msgstr "Dt. Criação"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "Documento Relacionado"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -349,7 +353,7 @@ msgstr "Estágio"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "Modelo de Documento relacionado"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
@@ -392,7 +396,7 @@ msgstr "Fechar"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Usar modelo"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -464,12 +468,12 @@ msgstr "Nº de Oportunidades"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Equipe"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Parceiro referido"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -490,7 +494,7 @@ msgstr "Fechado"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Encaminhar em massa para o parceiro"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -570,7 +574,7 @@ msgstr "Longitude Geográfica"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "# da Oportunidade"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -600,12 +604,12 @@ msgstr "O Parceiro desse Caso foi Enviado/Atribuído para."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Conteúdo Rich-text"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -620,18 +624,18 @@ msgstr "res.partner.grade"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Cód da Mensagem"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Anexos"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cópia para"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -641,7 +645,7 @@ msgstr "Setembro"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Referências"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -667,14 +671,14 @@ msgstr "Aberto"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Cópia oculta da mensagem para os destinatários"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
 msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
-msgstr ""
+msgstr "Cabeçalho completo, Ex Cabecalhos SMTP"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -697,11 +701,13 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Remetente da mensagem, anotado das preferências do usuário, Se estiver vazio "
+"não é um email mas uma mensagem"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "Cód do Parceiro"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -712,7 +718,7 @@ msgstr "Encaminhar para o Parceiro"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Nome do Parceiro"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -727,7 +733,7 @@ msgstr "Receita Provável"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Responder para"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -747,7 +753,7 @@ msgstr "Oportunidade"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar Email"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -775,7 +781,7 @@ msgstr "País"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Cabeçalho da mensagem"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -785,7 +791,7 @@ msgstr "Converter para Oportunidade"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Cópia Oculta (Cco)"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -801,7 +807,7 @@ msgstr "Abril"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Analise de Parceria"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -816,7 +822,7 @@ msgstr "Pendente"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Análise do Parceiro"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
@@ -827,11 +833,12 @@ msgstr "Relatório de Prospecto CRM"
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Referências da mensagem, como identificadores de mensagens anteriores"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -846,12 +853,12 @@ msgstr "Sequência"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "CRM Relatório de Parceiro"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente de composição de Email"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -872,7 +879,7 @@ msgstr "Data de Criação"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -883,7 +890,7 @@ msgstr "Ano"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Endereço de resposta preferido"
 
 #~ msgid "Reply-to of the Sales team defined on this case"
 #~ msgstr "Responder para a Equipe de Vendas definida neste caso"
@@ -939,3 +946,6 @@ msgstr ""
 #~ "Este é o módulo usado pelo OpenERP SA para redirecionar os clientes para os "
 #~ "seus parceiros, com base na geolocalização.\n"
 #~ "    "
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de E-mail."
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index 3287ce425aa..f26313d446a 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:58+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 18:51+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -385,6 +385,8 @@ msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
 msgstr ""
+"Quando executar este assistente, ele irá configurar seus diretórios "
+"automaticamente de acordo com os módulos instalados."
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -558,6 +560,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Junto com o Modelo Parente, este ID anexa esta pasta para um registro "
+"específico ou um Modelo Parente"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -613,6 +617,10 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Se você colocar um objeto aqui, este modelo de diretório aparecerá abaixo "
+"desses objetos. Alguns diretórios são \"Anexados\" a um modelo ou registro "
+"específico,  como anexos. Não coloque um diretório parente se você "
+"selecionar um modelo parente."
 
 #. module: document
 #: view:document.directory:0
@@ -695,6 +703,11 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"O sistema de controle de documentos do OpenErp suporta mapear pastas "
+"virtuais com documentos. A pasta virtual de um documento pode ser usada para "
+"gerenciar os arquivos anexados ao documento, os para exibir ou fazer "
+"download de qualquer relatório. Esta ferramenta irá criar diretórios "
+"automaticamente de acordo com os módulos instalados."
 
 #. module: document
 #: view:board.board:0
@@ -744,12 +757,12 @@ msgstr "Armazenamento externo de arquivo"
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Mural da Vergonha"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Para armazenamento de arquivos, o caminho raiz do armazenamento"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -764,7 +777,7 @@ msgstr "Campo"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "Diretório Dinâmico"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
@@ -814,7 +827,7 @@ msgstr "Todos Arquivos do Usuário"
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Usuários não inseriram documentos a mais de um mês"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
@@ -822,11 +835,13 @@ msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
 msgstr ""
+"O repositório de documentos lhe dá acesso a todos os anexos, como emails, "
+"documentos de projetos, faturas, etc"
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "Para cada entrada aqui, arquivos virtuais irão aparecer nesta pasta"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
@@ -851,7 +866,7 @@ msgstr "Arquivos Por Parceiro"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "Conteúdo Indexado - experimental"
 
 #. module: document
 #: view:report.document.user:0
@@ -877,6 +892,11 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"Cada diretório pode ter o tipo Estático ou ser anexado a um outro recurso. "
+"Um diretório estático, como em sistemas operacionais, é o formato clássico "
+"que contém um conjunto de arquivos. Os diretórios anexados em recursos de "
+"sistema automaticamente possuem sub-diretórios para cada tipo de recurso "
+"definido no diretório pai"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -896,6 +916,8 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"Nome do campo. Note que o prefixo \"dctx_\" será preposto ao que for "
+"digitado aqui."
 
 #. module: document
 #: field:document.directory,name:0
@@ -951,6 +973,8 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Estes grupos, no entanto, NÃO se aplicam a diretórios filhos, que precisam "
+"definir seus próprios grupos."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
@@ -960,7 +984,7 @@ msgstr "Mime Type"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "Arquivos de todos os meses"
 
 #. module: document
 #: field:document.directory.content,name:0
@@ -982,7 +1006,7 @@ msgstr "Armazenamento interno de arquivo"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "O diretório precisa ter um pai ou um armazenamento"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
index d6d8cc74915..e871fd9b0c9 100644
--- a/addons/document_webdav/i18n/pt_BR.po
+++ b/addons/document_webdav/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-29 15:36+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-07-28 18:55+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:14+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -26,7 +26,7 @@ msgstr "Dada de Criação"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_document_props
 msgid "Documents"
-msgstr ""
+msgstr "Documentos"
 
 #. module: document_webdav
 #: constraint:document.directory:0
@@ -45,17 +45,17 @@ msgstr "Procurar Propriedades dos Documentos"
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "Namespace"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
 msgid "DAV properties"
-msgstr ""
+msgstr "Propriedades DAV"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "document.webdav.file.property"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -66,18 +66,18 @@ msgstr "Agrupar Por..."
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "Estas propriedades serão adicionadas para requisições WebDAV"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_file_props_form
 msgid "DAV Properties for Documents"
-msgstr ""
+msgstr "Propriedades DAV para Documentos"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "Erro de Iimportação PyWEbDAV!"
 
 #. module: document_webdav
 #: view:document.webdav.file.property:0
@@ -88,7 +88,7 @@ msgstr "Documento"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_folder_props
 msgid "Folders"
-msgstr ""
+msgstr "Pastas"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -103,7 +103,7 @@ msgstr "Contexo dinâmico"
 #. module: document_webdav
 #: view:document.directory:0
 msgid "WebDAV properties"
-msgstr ""
+msgstr "Propriedades WebDAV"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -118,11 +118,14 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Por favor instale o PyWebDAV de "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
-msgstr ""
+msgstr "Propriedades DAV para as pastas"
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -140,7 +143,7 @@ msgstr "Nome"
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_dir_property
 msgid "document.webdav.dir.property"
-msgstr ""
+msgstr "document.webdav.dir.property"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,value:0
@@ -180,12 +183,12 @@ msgstr "Criador"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
 msgid "DAV Properties"
-msgstr ""
+msgstr "Propriedades DAV"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "O diretório precisa ter um pai ou um armazenamento"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index e10eea2be12..1b0026e7f79 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/i18n/pt_BR.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-04-16 20:56+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 22:06+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:19+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
 #: field:email_template.preview,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Tipo de Mensagem"
 
 #. module: email_template
 #: field:email.template,report_name:0
@@ -32,48 +32,49 @@ msgstr "Nome do Arquivo de Relatório"
 #. module: email_template
 #: view:email.template:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "Servidor SMTP"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove the sidebar button currently displayed on related documents"
 msgstr ""
+"Remover a barra lateral mostrada atualmente em em documentos relacionados"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 #: field:email_template.preview,ref_ir_act_window:0
 msgid "Sidebar action"
-msgstr ""
+msgstr "Ação da Barra Lateral"
 
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as a new template"
-msgstr ""
+msgstr "Salvar como um novo modelo"
 
 #. module: email_template
 #: help:email.template,subject:0
 #: help:email_template.preview,subject:0
 msgid "Subject (placeholders may be used here)"
-msgstr ""
+msgstr "Assunto (placeholders podem ser usados aqui)"
 
 #. module: email_template
 #: help:email.template,email_cc:0
 #: help:email_template.preview,email_cc:0
 msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Cópia oculta para destinatários (placeholders podem ser usados aqui)"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Received"
-msgstr ""
+msgstr "Recebida"
 
 #. module: email_template
 #: view:email.template:0
 #: field:email.template,ref_ir_value:0
 #: field:email_template.preview,ref_ir_value:0
 msgid "Sidebar Button"
-msgstr ""
+msgstr "Botão da Barra Lateral"
 
 #. module: email_template
 #: help:email.template,report_name:0
@@ -82,22 +83,24 @@ msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
 msgstr ""
+"Nome a ser usado no arquivo de relatório gerado (pode conter placeholders)\n"
+"A extensão pode ser omitida e será atribuída pelo tipo de relatório."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach existing files"
-msgstr ""
+msgstr "Anexar arquivos existentes"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content"
-msgstr ""
+msgstr "Conteúdo do Email"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -120,7 +123,7 @@ msgstr "Alerta"
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Parceiro"
 
 #. module: email_template
 #: field:email.template,subject:0
@@ -143,13 +146,13 @@ msgstr "Modêlo"
 #: field:email.template,partner_id:0
 #: field:email_template.preview,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Parceiro relacionado"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 #: field:email_template.preview,sub_model_object_field:0
 msgid "Sub-field"
-msgstr ""
+msgstr "Sub-Campo"
 
 #. module: email_template
 #: view:email.template:0
@@ -157,6 +160,8 @@ msgid ""
 "Display a button in the sidebar of related documents to open a composition "
 "wizard with this template"
 msgstr ""
+"Mostrar um botão na barra lateral de documentos relacionados, abrem um "
+"assistente de composição."
 
 #. module: email_template
 #: field:email.template,state:0
@@ -168,7 +173,7 @@ msgstr "Status"
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Enviado"
 
 #. module: email_template
 #: help:email.template,subtype:0
@@ -177,27 +182,29 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipo de mensagem, geralmente 'html' ou 'texto', usado para selecionar texto "
+"puro ou html"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente de composição de Email"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Values Builder"
-msgstr ""
+msgstr "Construtor de Valores Dinâmicos"
 
 #. module: email_template
 #: field:email.template,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "Documento Relacionado"
 
 #. module: email_template
 #: field:email.template,lang:0
 #: field:email_template.preview,lang:0
 msgid "Language Selection"
-msgstr ""
+msgstr "Seleção de idioma"
 
 #. module: email_template
 #: view:email.template:0
@@ -214,7 +221,7 @@ msgstr "Para"
 #: field:email.template,model:0
 #: field:email_template.preview,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modelo de Documento Relacionado"
 
 #. module: email_template
 #: help:email.template,model_object_field:0
@@ -224,6 +231,9 @@ msgid ""
 "If it is a relationship field you will be able to select a target field at "
 "the destination of the relationship."
 msgstr ""
+"Escolha o campo relacionado no modelo de documento.\n"
+"Se for um campo relacionado, você será capaz de escolher um campo no destino "
+"do relacionamento."
 
 #. module: email_template
 #: view:email.template:0
@@ -234,7 +244,7 @@ msgstr "Visualizar Modelo"
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Null value"
-msgstr ""
+msgstr "Valor nulo"
 
 #. module: email_template
 #: field:email.template,sub_object:0
@@ -250,17 +260,20 @@ msgid ""
 "emails so you can identify replies and link them back to the corresponding "
 "resource record. This is useful for CRM leads for example"
 msgstr ""
+"Habilite isso se você deseja incluir um códio de rastreamento nos emails de "
+"saída, assim você poderá identificar respostas e anexa-las no registro "
+"correspondente. Isto é útil para prospectos de CRM por exemplo"
 
 #. module: email_template
 #: field:mail.compose.message,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Usar modelo"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
 #: field:email_template.preview,attachment_ids:0
 msgid "Files to attach"
-msgstr ""
+msgstr "Arquivos para anexar"
 
 #. module: email_template
 #: view:email.template:0
@@ -271,13 +284,13 @@ msgstr "Opções"
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Related document model"
-msgstr ""
+msgstr "Modelo de documento relacionado"
 
 #. module: email_template
 #: help:email.template,email_from:0
 #: help:email_template.preview,email_from:0
 msgid "Sender address (placeholders may be used here)"
-msgstr ""
+msgstr "Email do remetente (pode ser usado placeholders)"
 
 #. module: email_template
 #: help:res.partner,opt_out:0
@@ -285,11 +298,13 @@ msgid ""
 "If checked, this partner will not receive any automated email notifications, "
 "such as the availability of invoices."
 msgstr ""
+"Se selecionado, este parceiro não irá receber nenhuma notificação "
+"automatizada, como disponibilidade de faturas."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr ""
+msgstr "Nota: Isto é HTML puro"
 
 #. module: email_template
 #: view:email.template:0
@@ -300,25 +315,25 @@ msgstr "Agrupar por..."
 #: field:email.template,user_signature:0
 #: field:email_template.preview,user_signature:0
 msgid "Add Signature"
-msgstr ""
+msgstr "Adicionar Assinatura"
 
 #. module: email_template
 #: help:email.template,body_text:0
 #: help:email_template.preview,body_text:0
 msgid "Plaintext version of the message (placeholders may be used here)"
-msgstr ""
+msgstr "Versão em Texto da mensagem (placeholders podem ser usados aqui)"
 
 #. module: email_template
 #: help:email.template,original:0
 #: help:email_template.preview,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Versão original da mensagem, como foi enviada pela rede"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:230
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(copiar)"
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -329,7 +344,7 @@ msgstr "Saindo"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use a message template"
-msgstr ""
+msgstr "Usar um modelo de mensagem"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -338,12 +353,14 @@ msgid ""
 "If checked, the user's signature will be appended to the text version of the "
 "message"
 msgstr ""
+"Se selecionado, a assinatura do usuário será adicionada na versão em texto "
+"da mensagem"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.preview:0
 msgid "Body (Rich/HTML)"
-msgstr ""
+msgstr "Corpo (Rich/HTML)"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -352,6 +369,8 @@ msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr ""
+"Quando um relacionamento é selecionado como primeiro campo, este campo "
+"exibirá o modelo que o relacionamento levará"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
@@ -362,7 +381,7 @@ msgstr "Modelos de Email"
 #: field:email.template,date:0
 #: field:email_template.preview,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -373,12 +392,12 @@ msgstr "Visualizar Modelo"
 #: field:email.template,message_id:0
 #: field:email_template.preview,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Cód da Mensagem"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Add sidebar button"
-msgstr ""
+msgstr "Adicionar Botão da Barra Lateral"
 
 #. module: email_template
 #: view:email.template:0
@@ -395,13 +414,13 @@ msgstr "Opções Avançadas"
 #: code:addons/email_template/email_template.py:183
 #, python-format
 msgid "Send Mail (%s)"
-msgstr ""
+msgstr "Enviar Email (%s)"
 
 #. module: email_template
 #: field:email.template,body_html:0
 #: field:email_template.preview,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Conteúdo Rich-text"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
@@ -413,7 +432,7 @@ msgstr "Expressão"
 #: field:email.template,original:0
 #: field:email_template.preview,original:0
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #. module: email_template
 #: view:email.template:0
@@ -427,6 +446,8 @@ msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
 msgstr ""
+"Expressão final de Placeholder, para ser copiada e colada no campo do modelo "
+"desejado"
 
 #. module: email_template
 #: view:email.template:0
@@ -436,37 +457,38 @@ msgstr "Anexos"
 #. module: email_template
 #: view:email.template:0
 msgid "Email Details"
-msgstr ""
+msgstr "Detalhes do Email"
 
 #. module: email_template
 #: field:email.template,email_cc:0
 #: field:email_template.preview,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cópia para"
 
 #. module: email_template
 #: field:email.template,body_text:0
 #: field:email_template.preview,body_text:0
 msgid "Text Contents"
-msgstr ""
+msgstr "Conteúdo de Texto"
 
 #. module: email_template
 #: help:email.template,auto_delete:0
 #: help:email_template.preview,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
+"Excluir permanentemente este email depois do envio para economizar espaço"
 
 #. module: email_template
 #: field:email.template,references:0
 #: field:email_template.preview,references:0
 msgid "References"
-msgstr ""
+msgstr "Referências"
 
 #. module: email_template
 #: field:email.template,display_text:0
 #: field:email_template.preview,display_text:0
 msgid "Display Text"
-msgstr ""
+msgstr "Mostrar o Texto"
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -480,6 +502,8 @@ msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
 msgstr ""
+"Você pode anexar arquivos a este modelo, para ser adicionado a todos os "
+"emails criado a partir deste modelo"
 
 #. module: email_template
 #: help:email.template,headers:0
@@ -488,12 +512,14 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cabeçalho completo da mensagem, Ex. SMTP session headers (geralmente "
+"disponível somente para mensagens recebidas)"
 
 #. module: email_template
 #: field:email.template,mail_server_id:0
 #: field:email_template.preview,mail_server_id:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Servidor de email de saída"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -502,6 +528,8 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Ação da Barra Lateral para fazer este modelo estar disponível nos registros "
+"de modelos de documentos relacionados"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
@@ -513,7 +541,7 @@ msgstr "Campo"
 #: field:email.template,user_id:0
 #: field:email_template.preview,user_id:0
 msgid "Related user"
-msgstr ""
+msgstr "Usuário relacionado"
 
 #. module: email_template
 #: view:email.template:0
@@ -525,13 +553,13 @@ msgstr "Modelos"
 #. module: email_template
 #: field:res.partner,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Opt-Out"
 
 #. module: email_template
 #: help:email.template,email_bcc:0
 #: help:email_template.preview,email_bcc:0
 msgid "Blind carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Cópia Oculta para recipientes (placeholders podem ser usados aqui)"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -542,17 +570,23 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"Idioma de tradução opcional (ISO code) para selecionar quando enviar um "
+"email. Se não for definido, a versão em inglês será usada. Isto geralmente "
+"deve ser uma expressão de Placeholder que informa o código de idiomas "
+"apropriado, ex ${object.partner_id.lang.code}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
 msgid "Sample Document"
-msgstr ""
+msgstr "Exemplo de Documentos"
 
 #. module: email_template
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
+"Endereços de email separados por virgulas (placeholders podem ser usados "
+"aqui)"
 
 #. module: email_template
 #: field:email.template,name:0
@@ -564,17 +598,17 @@ msgstr "Nome"
 #: field:email.template,track_campaign_item:0
 #: field:email_template.preview,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr ""
+msgstr "Rastrear recurso"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "Visualizar modelo de email"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Email Preview"
-msgstr ""
+msgstr "Visualizar Email"
 
 #. module: email_template
 #: help:email.template,message_id:0
@@ -586,35 +620,41 @@ msgid ""
 "instead.\n"
 "Placeholders must be used here, as this value always needs to be unique!"
 msgstr ""
+"Message-ID SMTP header para usar em mensagens enviadas baseadas neste "
+"modelo. Note que isto sobrescreve o \"Rastreamento de Recurso\", então se "
+"você apenas deseja rastrear respostas de emails de saída, habilite essa "
+"opção.\n"
+"Placeholders podem ser usados aqui, como este valor sempre necessita ser "
+"único"
 
 #. module: email_template
 #: field:email.template,headers:0
 #: field:email_template.preview,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Cabeçalho da mensagem"
 
 #. module: email_template
 #: field:email.template,email_bcc:0
 #: field:email_template.preview,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Cópia Oculta (Cco)"
 
 #. module: email_template
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
-msgstr ""
+msgstr "Endereço de resposta preferido (placeholders podem ser usados aqui)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove sidebar button"
-msgstr ""
+msgstr "Remover botão da barra lateral"
 
 #. module: email_template
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
-msgstr ""
+msgstr "Valor opcional a ser usado se o campo estiver vazio"
 
 #. module: email_template
 #: view:email.template:0
@@ -626,23 +666,24 @@ msgstr "Modelo"
 #: help:email_template.preview,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Referências da mensagem, como identificadores de mensagens anteriores"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "Botão da barra lateral para executar a ação"
 
 #. module: email_template
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "Deletion of the action record failed."
-msgstr ""
+msgstr "Falha ao excluir o registro"
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -651,12 +692,14 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Opcional Servidor preferido para os emails de saída. Se não for definido o "
+"servidor com maior prioridade será usado."
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Falha no envio"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
@@ -665,23 +708,27 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"Quando um campo relacionado for selecionado como primeiro campo, este campo "
+"te deixa escolher o campo alvo dentro do modelo de documento de destino (sub-"
+"modelo)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach Report"
-msgstr ""
+msgstr "Relatório do Anexo"
 
 #. module: email_template
 #: field:email.template,report_template:0
 #: field:email_template.preview,report_template:0
 msgid "Optional report to print and attach"
-msgstr ""
+msgstr "Relatório opcional para exibir e anexar"
 
 #. module: email_template
 #: help:email.template,body_html:0
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
 msgstr ""
+"Versão Rich-text/HTML da mensagem (placeholders podem ser usados aqui)"
 
 #~ msgid "Email Content  "
 #~ msgstr "Contexto do E-mail  "
@@ -1123,3 +1170,21 @@ msgstr ""
 
 #~ msgid "Model Internal Name"
 #~ msgstr "Nome Interno do Modelo"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de E-mail."
+
+#~ msgid "Opt-out"
+#~ msgstr "Opt-out"
+
+#~ msgid "Related Document model"
+#~ msgstr "Modelo de Documento relacionado"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Conteúdo Rich-text"
+
+#~ msgid "Text contents"
+#~ msgstr "Conteúdo"
+
+#~ msgid "Sidebar button"
+#~ msgstr "Botão da Barra Lateral"
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index b9e5fd0e7a1..7eb7095729b 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-02-28 21:26+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 22:38+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -25,17 +25,19 @@ msgstr "Confirmado"
 #. module: fetchmail
 #: field:fetchmail.server,server:0
 msgid "Server Name"
-msgstr ""
+msgstr "Nome do Servidor"
 
 #. module: fetchmail
 #: field:fetchmail.server,script:0
 msgid "Script"
-msgstr ""
+msgstr "Script"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
 msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
+"Define a ordem de processamento, valores mais baixos significam prioridade "
+"maior"
 
 #. module: fetchmail
 #: help:fetchmail.server,is_ssl:0
@@ -43,11 +45,13 @@ msgid ""
 "Connections are encrypted with SSL/TLS through a dedicated port (default: "
 "IMAPS=993, POP3S=995)"
 msgstr ""
+"Conexões são encriptadas com  SSL/TLS através de uma porta dedicada (padrão: "
+"IMAPS=993, POP3S=995)"
 
 #. module: fetchmail
 #: field:fetchmail.server,attach:0
 msgid "Keep Attachments"
-msgstr ""
+msgstr "Manter Anexos"
 
 #. module: fetchmail
 #: help:fetchmail.server,original:0
@@ -56,6 +60,9 @@ msgid ""
 "attached to each processed message. This will usually double the size of "
 "your message database."
 msgstr ""
+"Se uma cópia completa de cada email deve ser mantida para referência e "
+"anexada a cada mensagem processada, isto geralmente dobra o tamanho do "
+"espaço de mensagens"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
@@ -75,13 +82,13 @@ msgstr "POP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Fetch Now"
-msgstr ""
+msgstr "Buscar Agora"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
 msgid "Incoming Mail Servers"
-msgstr ""
+msgstr "Servidores de Email de Entrada"
 
 #. module: fetchmail
 #: field:fetchmail.server,port:0
@@ -96,12 +103,12 @@ msgstr "Servidores POP/IMAP"
 #. module: fetchmail
 #: selection:fetchmail.server,type:0
 msgid "Local Server"
-msgstr ""
+msgstr "Servidor Local"
 
 #. module: fetchmail
 #: field:fetchmail.server,user:0
 msgid "Username"
-msgstr ""
+msgstr "Usuário"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -111,7 +118,7 @@ msgstr "Servidor POP/IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Reset Confirmation"
-msgstr ""
+msgstr "Resetar Confirmação"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -121,12 +128,12 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Mensagem de Email"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
 msgid "Last Fetch Date"
-msgstr ""
+msgstr "Data da última verificação"
 
 #. module: fetchmail
 #: help:fetchmail.server,action_id:0
@@ -134,6 +141,8 @@ msgid ""
 "Optional custom server action to trigger for each incoming mail, on the "
 "record that was created or updated by this mail"
 msgstr ""
+"Ação opcional para disparar a cada email que chegar, no registro que foi "
+"atualizado por este email"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -143,7 +152,7 @@ msgstr "# de emails"
 #. module: fetchmail
 #: field:fetchmail.server,original:0
 msgid "Keep Original"
-msgstr ""
+msgstr "Manter original"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
@@ -152,33 +161,35 @@ msgid ""
 "Here is what we got instead:\n"
 " %s"
 msgstr ""
+"Aqui está o que temos em vez disso:\n"
+" %s"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 #: field:fetchmail.server,configuration:0
 msgid "Configuration"
-msgstr ""
+msgstr "Configuração"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
-msgstr ""
+msgstr "Servidor de Email de Entrada"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "Teste de conexão falhou!"
 
 #. module: fetchmail
 #: help:fetchmail.server,server:0
 msgid "Hostname or IP of the mail server"
-msgstr ""
+msgstr "Hostname ou IP do servidor de emails"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type IMAP."
-msgstr ""
+msgstr "Servidor tipo IMAP"
 
 #. module: fetchmail
 #: field:fetchmail.server,name:0
@@ -188,22 +199,22 @@ msgstr "Nome"
 #. module: fetchmail
 #: field:fetchmail.server,is_ssl:0
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Test & Confirm"
-msgstr ""
+msgstr "Testar & Confirmar"
 
 #. module: fetchmail
 #: field:fetchmail.server,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Ação de Servidor"
 
 #. module: fetchmail
 #: field:mail.message,fetchmail_server_id:0
 msgid "Inbound Mail Server"
-msgstr ""
+msgstr "Servidor de email de entrada"
 
 #. module: fetchmail
 #: field:fetchmail.server,message_ids:0
@@ -214,7 +225,7 @@ msgstr "Mensagens"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Search Incoming Mail Servers"
-msgstr ""
+msgstr "Buscar servidor de email de entrada"
 
 #. module: fetchmail
 #: field:fetchmail.server,active:0
@@ -227,11 +238,13 @@ msgid ""
 "Whether attachments should be downloaded. If not enabled, incoming emails "
 "will be stripped of any attachments before being processed"
 msgstr ""
+"Se os anexos devem ser baixados. Se não estiver habilitado, os servidores de "
+"email irão excluir qualquer anexo antes de processar"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Opções Avançadas"
 
 #. module: fetchmail
 #: selection:fetchmail.server,type:0
@@ -246,7 +259,7 @@ msgstr "IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type POP."
-msgstr ""
+msgstr "Servidor tipo POP"
 
 #. module: fetchmail
 #: field:fetchmail.server,password:0
@@ -256,7 +269,7 @@ msgstr "Senha"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Actions to Perform on Incoming Mails"
-msgstr ""
+msgstr "Ações a serem executadas nos emails recebidos"
 
 #. module: fetchmail
 #: field:fetchmail.server,type:0
@@ -276,12 +289,12 @@ msgstr "Informação do Servidor"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "If SSL required."
-msgstr ""
+msgstr "Se SSL obrigatório."
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -295,11 +308,14 @@ msgid ""
 "document type. This will create new documents for new conversations, or "
 "attach follow-up emails to the existing conversations (documents)."
 msgstr ""
+"Processar cada servidor de entrada como parte de uma conversa correspondente "
+"a este tipo de email. Isto irá criar novos documentos para novas conversas, "
+"ou anexar os emails como parte da conversa (documentos)"
 
 #. module: fetchmail
 #: field:fetchmail.server,object_id:0
 msgid "Create a New Record"
-msgstr ""
+msgstr "Criar um Novo Registro"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -378,3 +394,6 @@ msgstr "Servidor de Email"
 
 #~ msgid "Fetch Emails"
 #~ msgstr "Baixar Emails"
+
+#~ msgid "Advanced options"
+#~ msgstr "Opções avançadas"
diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po
new file mode 100644
index 00000000000..dd694f0ca6e
--- /dev/null
+++ b/addons/google_base_account/i18n/pt_BR.po
@@ -0,0 +1,122 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-28 22:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:38+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Usuário"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Login do Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Erro de importação dos contatos Google!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Sincronização "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Você não pode ter dois usuários com o mesmo login!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Erro"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Login do Google"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Senha do Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Conta do Google"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Usuário do Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Por favor instale gdata-python-client de http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Contatos do Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Login"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A empresa escolhida não está entre as empresas habilitadas para este usuário"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Senha"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Usuário e senha não conferem!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "ex: usuario@gmail.com"
diff --git a/addons/hr_payroll/i18n/nb.po b/addons/hr_payroll/i18n/nb.po
new file mode 100644
index 00000000000..5e05b98942a
--- /dev/null
+++ b/addons/hr_payroll/i18n/nb.po
@@ -0,0 +1,1119 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-07-28 16:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr "Månedlig"
+
+#. module: hr_payroll
+#: view:hr.payslip:0 field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr "Lønnslipplinjer"
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.line:0 view:hr.salary.rule:0
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Bekrefter"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,input_ids:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr "Inndata"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0 view:hr.payslip:0 view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr "Opphav"
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "("
+msgstr "("
+
+#. module: hr_payroll
+#: field:hr.contribution.register,company_id:0
+#: field:hr.payroll.structure,company_id:0 field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0 field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr "Laget lønnslipp"
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.run:0
+msgid "Set to Draft"
+msgstr "Sett som utkast"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr "hr.salary.rule"
+
+#. module: hr_payroll
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr "Kvantum/sats"
+
+#. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0 field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip report:payslip:0
+msgid "Pay Slip"
+msgstr "Lønnslipp"
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr "Lag"
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr "Totalt:"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule:0
+msgid "Input Data"
+msgstr "Inndata"
+
+#. module: hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr "Lønnberegning"
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0 report:paylip.details:0 report:payslip:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Lønnslipplinje"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Information"
+msgstr "Annen informasjon"
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_select:0 help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel !"
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr "Utkast til lønnslipp"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Identification No"
+msgstr "ID nummer"
+
+#. module: hr_payroll
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr "Struktur"
+
+#. module: hr_payroll
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Total Working Days"
+msgstr "Totaly antall arbeidsdager"
+
+#. module: hr_payroll
+#: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
+msgid ""
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr "Ukentlig"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr "Bekreft"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
+msgid "Employee PaySlip"
+msgstr "Ansatt lønnslipp"
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr "Lønnslipper pr ansatte"
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr "Kvartalsvis"
+
+#. module: hr_payroll
+#: field:hr.payslip,state:0 field:hr.payslip.run,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: hr_payroll
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,employee_id:0 field:hr.payslip.line,employee_id:0
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "Ansatt"
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Children Definition"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Email"
+msgstr "E-post"
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr "Prosent basert på"
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr "Antall dager"
+
+#. module: hr_payroll
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr "Avvist"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0 field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr "Lønnsregler"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+msgid "Done"
+msgstr "Utført"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr "Kommer fra på lønnslipp"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0 field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr "Fast beløp"
+
+#. module: hr_payroll
+#: help:hr.payslip.line,active:0 help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr "Lønnslipplinjer"
+
+#. module: hr_payroll
+#: help:hr.payslip.line,register_id:0 help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr "Antall timer"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "PaySlip Batch"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,child_ids:0 field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr "Til dato"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr "intervall"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr "Lønnslipp"
+
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr "Lønnslippinfo"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:872
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr "Beregning"
+
+#. module: hr_payroll
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0 field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
+msgid "Amount Type"
+msgstr "Beløpstype"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,category_id:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: hr_payroll
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,credit_note:0 field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,active:0 field:hr.salary.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:861
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0 field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Credit"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:861
+#: code:addons/hr_payroll/hr_payroll.py:866
+#: code:addons/hr_payroll/hr_payroll.py:872
+#: code:addons/hr_payroll/hr_payroll.py:889
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Refund"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.input,code:0
+#: field:hr.payslip.line,code:0 field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0 field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,sequence:0 field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0 field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 report:paylip.details:0
+msgid "Register Name"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:664
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,struct_id:0 view:hr.payroll.structure:0 view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contribution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0 selection:hr.payslip.run,state:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:889
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Days"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0 field:hr.contribution.register,note:0
+#: field:hr.payroll.structure,note:0 field:hr.payslip,name:0
+#: field:hr.payslip,note:0 field:hr.payslip.input,name:0
+#: view:hr.payslip.line:0 field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0 field:hr.rule.input,name:0
+#: view:hr.salary.rule:0 field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
+msgid "Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:866
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.contribution.register,name:0
+#: field:hr.payroll.structure,name:0 field:hr.payslip.line,name:0
+#: field:hr.payslip.run,name:0 field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0 view:hr.payslip.line:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,sequence:0 help:hr.salary.rule,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will be used to compute the % fields values; in general it is on basic, "
+"but you can also use categories code fields in lowercase as a variable names "
+"(hra, ma, lta, etc.) and the variable basic."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.line,total:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index 8ca428bafc5..b37c1f5577b 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-19 15:16+0000\n"
+"PO-Revision-Date: 2012-07-28 22:13+0000\n"
 "Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:05+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -746,7 +746,7 @@ msgstr "Dia"
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "Minha Planilha de Horas Atual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
diff --git a/addons/import_google/i18n/pt_BR.po b/addons/import_google/i18n/pt_BR.po
index 56654d0f9e7..e130a50e59a 100644
--- a/addons/import_google/i18n/pt_BR.po
+++ b/addons/import_google/i18n/pt_BR.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-16 20:10+0000\n"
-"Last-Translator: Rafael <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 21:30+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
-"X-Generator: Launchpad (build 15627)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:38+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
 msgid "Choose which group to import, By default it takes all."
-msgstr ""
+msgstr "Escolha qual grupo importar, por padrão todos são importados."
 
 #. module: import_google
 #: view:synchronize.google.import:0
@@ -30,7 +30,7 @@ msgstr "Importar o Calendário de Eventos da Google"
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "_Import Events"
-msgstr ""
+msgstr "_Importar Eventos"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:71
@@ -39,6 +39,8 @@ msgid ""
 "No Google Username or password Defined for user.\n"
 "Please define in user view"
 msgstr ""
+"Não foi definido nome de usuário ou senha para o usuário Google.\n"
+"Por favor definir na visão de usuário"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:127
@@ -47,6 +49,8 @@ msgid ""
 "Invalid login detail !\n"
 " Specify Username/Password."
 msgstr ""
+"Detalhes de acesso inválidos!\n"
+" Especificar Usuário/Senha."
 
 #. module: import_google
 #: field:synchronize.google.import,supplier:0
@@ -66,7 +70,7 @@ msgstr "Nome do Grupo"
 #. module: import_google
 #: model:ir.model,name:import_google.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Categoria de Caso"
 
 #. module: import_google
 #: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
@@ -77,12 +81,12 @@ msgstr "Importar Contatos do Google"
 #. module: import_google
 #: view:google.import.message:0
 msgid "Import Google Data"
-msgstr ""
+msgstr "Importar Dados do Google"
 
 #. module: import_google
 #: view:crm.meeting:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Tipo de Reunião"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google.py:38
@@ -92,22 +96,24 @@ msgid ""
 "Please install gdata-python-client from http://code.google.com/p/gdata-"
 "python-client/downloads/list"
 msgstr ""
+"Por favor instale gdata-python-client de http://code.google.com/p/gdata-"
+"python-client/downloads/list"
 
 #. module: import_google
 #: model:ir.model,name:import_google.model_google_login
 msgid "Google Contact"
-msgstr ""
+msgstr "Contatos do Google"
 
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "Import contacts from a google account"
-msgstr ""
+msgstr "Importar contatos de uma conta Google"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:133
 #, python-format
 msgid "Please specify correct user and password !"
-msgstr ""
+msgstr "Por favor especificar usuário e senha corretos !"
 
 #. module: import_google
 #: field:synchronize.google.import,customer:0
@@ -117,7 +123,7 @@ msgstr "Cliente"
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: import_google
 #: model:ir.model,name:import_google.model_synchronize_google_import
@@ -127,7 +133,7 @@ msgstr "sincronizar.importação.google"
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "_Import Contacts"
-msgstr ""
+msgstr "_Importar Contatos"
 
 #. module: import_google
 #: model:ir.actions.act_window,name:import_google.act_google_login_form
@@ -139,7 +145,7 @@ msgstr "Importar Calendário do Google"
 #: code:addons/import_google/wizard/import_google_data.py:50
 #, python-format
 msgid "Import google"
-msgstr ""
+msgstr "Importar do Google"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:127
@@ -169,12 +175,12 @@ msgstr "_Ok"
 #: code:addons/import_google/wizard/import_google_data.py:28
 #, python-format
 msgid "Google Contacts Import Error!"
-msgstr ""
+msgstr "Erro de importação dos contatos Google!"
 
 #. module: import_google
 #: model:ir.model,name:import_google.model_google_import_message
 msgid "Import Message"
-msgstr ""
+msgstr "Importar Mensagem"
 
 #. module: import_google
 #: field:synchronize.google.import,calendar_name:0
@@ -184,12 +190,12 @@ msgstr "Nome do Calendário"
 #. module: import_google
 #: help:synchronize.google.import,supplier:0
 msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
+msgstr "Selecione para marcar este parceiro recém criado como Fornecedor."
 
 #. module: import_google
 #: selection:synchronize.google.import,create_partner:0
 msgid "Import only address"
-msgstr ""
+msgstr "Importar somente endereços"
 
 #. module: import_google
 #: field:crm.case.categ,user_id:0
@@ -199,7 +205,7 @@ msgstr "Usuário"
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "Partner Status for this Group:"
-msgstr ""
+msgstr "Situação do Parceiro para este grupo."
 
 #. module: import_google
 #: field:google.import.message,name:0
@@ -209,9 +215,12 @@ msgstr "Mensagem"
 #. module: import_google
 #: selection:synchronize.google.import,create_partner:0
 msgid "Create partner for each contact"
-msgstr ""
+msgstr "Criar um parceiro para cada contato"
 
 #. module: import_google
 #: help:synchronize.google.import,customer:0
 msgid "Check this box to set newly created partner as Customer."
-msgstr ""
+msgstr "Selecione para marcar o parceiro recém criado como Cliente"
+
+#~ msgid "Partner status for this group:"
+#~ msgstr "Situação do Parceiro para este grupo"
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
index d1197588eef..b1cc55bb0f9 100644
--- a/addons/membership/i18n/pt_BR.po
+++ b/addons/membership/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-16 19:47+0000\n"
-"Last-Translator: Rafael <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:37+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n"
-"X-Generator: Launchpad (build 15627)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -547,7 +547,8 @@ msgstr "Versão da lista de preço do membro."
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Erro: A UdM padrão e a UdM de compra precisam estar na mesma categoria."
+"Erro: A Unidade de Medida Padrão e a Unidade de Medida de compra precisam "
+"estar na mesma categoria."
 
 #. module: membership
 #: view:report.membership:0
@@ -577,7 +578,7 @@ msgstr "Informações da Conta"
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "Data de término da Associação"
 
 #. module: membership
 #: view:res.partner:0
@@ -622,7 +623,7 @@ msgstr "Membro Faturado"
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "Data na qual o membro entrou para a associação"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -650,12 +651,12 @@ msgstr "Novembro"
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "Selecionar se um produto é um produto da associação."
 
 #. module: membership
 #: field:membership.membership_line,state:0
 msgid "Membership State"
-msgstr ""
+msgstr "Estado da Associação"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -675,12 +676,12 @@ msgstr "Janeiro"
 #. module: membership
 #: view:res.partner:0
 msgid "Membership Partners"
-msgstr ""
+msgstr "Parceiros Membros"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "Taxa de Associação"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
@@ -690,17 +691,17 @@ msgstr "Quantidade de adesões"
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "O preço negociado pelo Parceiro"
 
 #. module: membership
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "O número da fatura deve ser único por Empresa!"
 
 #. module: membership
 #: view:res.partner:0
 msgid "None/Canceled/Old/Waiting"
-msgstr ""
+msgstr "Nenhum/Cancelado/Antigo/Aguardando"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -724,7 +725,7 @@ msgstr "Estado atual da Associação"
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "Geral:"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
@@ -750,7 +751,7 @@ msgstr "Fechar"
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "Todos não Membros"
 
 #. module: membership
 #: view:product.product:0
@@ -788,12 +789,12 @@ msgstr "Descrição da compra"
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: membership
 #: view:product.product:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: membership
 #: field:res.partner,free_member:0
@@ -808,12 +809,12 @@ msgstr "Maio"
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "Grupo de Membros Prata"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Impostos na Venda"
 
 #. module: membership
 #: field:report.membership,date_to:0
@@ -834,17 +835,17 @@ msgstr "Membro faturado"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Starting Date Of Membership"
-msgstr ""
+msgstr "Data inicial da Associação"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "Data de cancelamento da associação"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
@@ -859,7 +860,7 @@ msgstr "Membro em espera"
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 msgid "Invoice Membership"
-msgstr ""
+msgstr "Fatura da Associação"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
@@ -869,19 +870,19 @@ msgstr "Produto de adesão"
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "Quantia para a Associação."
 
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Cancelled Member"
-msgstr ""
+msgstr "Membro cancelado"
 
 #. module: membership
 #: constraint:product.product:0
@@ -897,7 +898,7 @@ msgstr "Ano"
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
+msgstr "Receita Concluída"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 6d91705eaca..65fbae3a8e4 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-02-19 15:27+0000\n"
-"Last-Translator: tamnil <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 22:20+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:40+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -187,7 +187,7 @@ msgstr "Custo por hora"
 #. module: mrp
 #: model:product.template,name:mrp.product_orange_product_template
 msgid "Orange"
-msgstr ""
+msgstr "Laranja"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -329,7 +329,7 @@ msgstr "Você tentou atribuir um lote que não é do mesmo produto"
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
 msgid "Cloth"
-msgstr ""
+msgstr "Tecido"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
@@ -409,6 +409,12 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"As propriedades do OpenErp são usadas para selecionar a lista de materiais "
+"correta para a produção de um produto quando você tem diversas formas "
+"diferentes de construir o mesmo produto. Você pode associar diversas "
+"propriedades para cada Lista de Materiais. Quando um vendedor cria um pedido "
+"de venda, ele pode relacionar isso a várias propriedades e o OpenErp irá "
+"automaticamente selecionar o BoM de acordo com as necessidades."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -691,7 +697,7 @@ msgstr "Pronto"
 #. module: mrp
 #: model:product.template,name:mrp.product_buttons_product_template
 msgid "Shirt Buttons"
-msgstr ""
+msgstr "Botões de Camiseta"
 
 #. module: mrp
 #: help:mrp.production,routing_id:0
@@ -714,7 +720,7 @@ msgstr "Tempo em horas para fazer um ciclo."
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr ""
+msgstr "Produtos de linha BoM não devem ser os mesmo que produtos BoM"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -844,6 +850,11 @@ msgid ""
 "resource leave are not taken into account in the time computation of the "
 "work center."
 msgstr ""
+"Centro de Trabalho te permitem criar e gerenciar unidades de produção. Eles "
+"consistem em trabalhadores e/ou máquinas, que são considerados como unidades "
+"para capacidade e planejamento da previsão. Lembre se que o tempo de "
+"trabalho e recursos não são levados em consideração no tempo de cálculo do "
+"centro de trabalho."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -899,7 +910,7 @@ msgstr "Pesquisar"
 #: code:addons/mrp/mrp.py:626
 #, python-format
 msgid "Could not cancel manufacturing order !"
-msgstr ""
+msgstr "Não pode cancelar uma ordem de produção !"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -918,6 +929,8 @@ msgid ""
 "You must first cancel related internal picking attached to this "
 "manufacturing order."
 msgstr ""
+"Voce deve primeiro cancelar as ordens de movimentação internas ligadas a "
+"esta ordem de produção."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
@@ -929,7 +942,7 @@ msgstr "Estoque Mínimo"
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr ""
+msgstr "Não é possível apagar uma ordem de produção no estado '%s'"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -941,7 +954,7 @@ msgstr "Painel"
 #: code:addons/mrp/report/price.py:211
 #, python-format
 msgid "Total Cost of %s %s"
-msgstr ""
+msgstr "Custo total de %s %s"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -1046,7 +1059,7 @@ msgstr "Painel de Produção"
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_manager
 msgid "Manager"
-msgstr ""
+msgstr "Gerente"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1108,12 +1121,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.todo.category,name:mrp.category_mrp_config
 msgid "MRP Management"
-msgstr ""
+msgstr "Controle de Produção"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work Center per hour."
-msgstr ""
+msgstr "Especifique o Custo do Centro de Trabalho por hora."
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -1121,6 +1134,9 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Número de operações que este Centro de trabalho pode fazer em paralelo. Se "
+"este Centro de Trabalho representa uma equipe de 5 funcionários, a "
+"capacidade por ciclo é 5."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1163,6 +1179,8 @@ msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Tempo em horas para este Centro de Trabalho para concluir a operação da rota "
+"especificada."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1197,7 +1215,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Cria ou Importa Produtos"
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
@@ -1217,7 +1235,7 @@ msgstr "Observações"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are ready to start production."
-msgstr ""
+msgstr "Ordens de produção que estao prontas para iniciar."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
@@ -1249,6 +1267,9 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
+"Roteamento indica todos os Centros de Trabalho usados, por quanto "
+"tempo/ciclos. Se o Roteamento está indicado então, a terceira aba da ordem "
+"de produção (Centros de Trabalho) será automaticamente completada."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1265,7 +1286,7 @@ msgstr ""
 #: code:addons/mrp/report/price.py:187
 #, python-format
 msgid "Components Cost of %s %s"
-msgstr ""
+msgstr "Custos de Componentes de %s %s"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1280,7 +1301,7 @@ msgstr "Revisões"
 #. module: mrp
 #: model:product.template,name:mrp.product_shirt_product_template
 msgid "Shirt"
-msgstr ""
+msgstr "Camisa"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1318,7 +1339,7 @@ msgstr "Produção Agendada do Produto"
 #: code:addons/mrp/report/price.py:204
 #, python-format
 msgid "Work Cost of %s %s"
-msgstr ""
+msgstr "Custos de Trabalho para %s %s"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1328,12 +1349,12 @@ msgstr "Dias de segurança para cada operação de produção."
 #. module: mrp
 #: model:product.template,name:mrp.product_water_product_template
 msgid "Water"
-msgstr ""
+msgstr "Água"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Component Name"
-msgstr ""
+msgstr "Nome do Componente"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
@@ -1345,7 +1366,7 @@ msgstr "Avaliar Estoque"
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "A quantidade do pedido não pode ser negativa ou zero!"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -1438,7 +1459,7 @@ msgstr "Pendente"
 #: code:addons/mrp/mrp.py:603
 #, python-format
 msgid "Couldn't find a bill of material for this product."
-msgstr ""
+msgstr "Não é possível localizar a lista de materiais para este produto."
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1521,7 +1542,7 @@ msgstr "Não urgente"
 #. module: mrp
 #: field:mrp.production,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsável"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
@@ -1606,6 +1627,8 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
+"Descrição do Centro de Trabalho. Explica aqui o que é uma ciclo de acordo "
+"com este Centro de Trabalho."
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1745,6 +1768,8 @@ msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
 "But you can only consume up to total %s quantities."
 msgstr ""
+"Você vai consumir um total de %s quantidades de \"%s\".\n"
+"Mas voce pode consumir até %s quantidades."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1881,7 +1906,7 @@ msgstr "Arredondamento do Produto"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -1943,7 +1968,7 @@ msgstr "Configuração"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
@@ -1998,7 +2023,7 @@ msgstr "Tempo em horas para a configuração."
 #. module: mrp
 #: model:product.template,name:mrp.product_orangejuice_product_template
 msgid "Orange Juice"
-msgstr ""
+msgstr "Suco de Laranja"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -2048,7 +2073,7 @@ msgstr "Normal"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production started late"
-msgstr ""
+msgstr "Produção iniciada com atraso"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
@@ -2065,7 +2090,7 @@ msgstr "Estrutura de Custo"
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_user
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -2096,7 +2121,7 @@ msgstr ""
 #. module: mrp
 #: model:product.uom,name:mrp.product_uom_litre
 msgid "Litre"
-msgstr ""
+msgstr "Litro"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:762
@@ -2105,6 +2130,8 @@ msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
 "But you can only produce up to total %s quantities."
 msgstr ""
+"Você precisa produzir um total de %s para a quantidade de \"%s\".\n"
+"Mas você só pode produzir um total de até %s"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
@@ -2122,7 +2149,7 @@ msgstr "Erro"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Production Started"
-msgstr ""
+msgstr "Produção Iniciada"
 
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
@@ -2281,7 +2308,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:954
 #, python-format
 msgid "PROD: %s"
-msgstr ""
+msgstr "PROD: %s"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
diff --git a/addons/mrp_operations/i18n/mn.po b/addons/mrp_operations/i18n/mn.po
new file mode 100644
index 00000000000..634a5fd905e
--- /dev/null
+++ b/addons/mrp_operations/i18n/mn.po
@@ -0,0 +1,857 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-28 16:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_order
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+msgid "Work Orders"
+msgstr "Ажлын Захиалгууд"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:489
+#, python-format
+msgid "Operation is already finished!"
+msgstr "Ажиллагаа хэдийнээ дууссан байна!"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_canceloperation0
+msgid "Cancel the operation."
+msgstr "Ажиллагааг цуцлах"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
+msgid "mrp_operations.operation.code"
+msgstr "mrp_operations.operation.code"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_workorder0
+msgid "Information from the routing definition."
+msgstr "Маршрутын тодорхойлолтоосх мэдээлэл"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
+msgid "Work Centers"
+msgstr "Дамжлагууд"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Resume"
+msgstr "Үргэлжилүүлэх"
+
+#. module: mrp_operations
+#: report:mrp.code.barcode:0
+msgid "("
+msgstr "("
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Product to Produce"
+msgstr "Үйлдвэрлэх бараа"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Production Operation"
+msgstr "Үйлдвэрлэлийн ажиллагаа"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+msgid "Set to Draft"
+msgstr "Ноороглох"
+
+#. module: mrp_operations
+#: field:mrp.production,allow_reorder:0
+msgid "Free Serialisation"
+msgstr "Чөлөөт Сери"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Үйлдвэрлэлийн Захиалга"
+
+#. module: mrp_operations
+#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
+msgid "Mrp Operations"
+msgstr "Үйлдвэрлэлийн ажиллагаа"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+msgid "Cancel Order"
+msgstr "Захиалга цуцлах"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_productionorder0
+msgid "Production Order"
+msgstr "Үйлдвэрлэлийн Захиалга"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Picking Exception"
+msgstr "Бэлтгэлтийн Сондгойрол"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_productionstart0
+msgid "Creation of the work order"
+msgstr "Ажлын захиалгыг үүсгэх"
+
+#. module: mrp_operations
+#: help:mrp.production.workcenter.line,state:0
+msgid ""
+"* When a work order is created it is set in 'Draft' state.\n"
+"* When user sets work order in start mode that time it will be set in 'In "
+"Progress' state.\n"
+"* When work order is in running mode, during that time if user wants to stop "
+"or to make changes in order then can set in 'Pending' state.\n"
+"* When the user cancels the work order it will be set in 'Canceled' state.\n"
+"* When order is completely processed that time it is set in 'Finished' state."
+msgstr ""
+"* Ажлын захиалга үүсгэгдсэн дараагаараа 'Ноорог' төлөвтэй байдаг.\n"
+"* Хэрэглэгч ажлын захиалгыг эхлүүлэхэд 'Хийгдэж буй' төлөвтэй болдог.\n"
+"* Ажлын захиалга хийгдэж байхад түр зогсоож ямарваа засвар хийвэл 'Хүлээгдэж "
+"буй' горимд шилждэг.\n"
+"* Хэрэглэгч ажлын захиалгыг цуцлах юм бол 'Цуцлагдсан' төлөвтэй болдог.\n"
+"* Захиалга бүрэн хийгдэж дуусахад төлөв 'Дууссан' болдог."
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_productionstart0
+msgid "The work orders are created on the basis of the production order."
+msgstr "Үйлдвэрлэлийн захиалга дээр үндэслэж ажлын захиалга үүсдэг."
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:486
+#: code:addons/mrp_operations/mrp_operations.py:489
+#, python-format
+msgid "Error!"
+msgstr "Алдаа!"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:486
+#, python-format
+msgid "There is no Operation to be cancelled!"
+msgstr "Цуцлагдах ажиллагаа байхгүй байна!"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:482
+#, python-format
+msgid "Operation is Already Cancelled!"
+msgstr "Ажиллагаа хэдийнээ цуцлагдсан байна!"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
+#: view:mrp.production.workcenter.line:0
+msgid "Operations"
+msgstr "Ажиллагаанууд"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_stock_move
+msgid "Stock Move"
+msgstr "Нөөцийн хөдөлгөөн"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:479
+#, python-format
+msgid ""
+"In order to Finish the operation, it must be in the Start or Resume state!"
+msgstr ""
+"Ажиллагааг дуусгахын тулд энэ нь Эхлэх эсвэл Үргэлжлэх төлөвт байх ёстой!"
+
+#. module: mrp_operations
+#: field:mrp.workorder,nbr:0
+msgid "# of Lines"
+msgstr "Мөрийн тоо"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Finish Order"
+msgstr "Захиалгыг Дуусгах"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_finished:0
+#: field:mrp.production.workcenter.line,date_planned_end:0
+#: field:mrp_operations.operation,date_finished:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "In Production"
+msgstr "Үйлдвэрлэгдэж буй"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: field:mrp.production.workcenter.line,state:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
+#: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
+msgid "Work Order"
+msgstr "Ажлын Захиалга"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
+msgid ""
+"There is 1 work order per work center. The information about the number of "
+"cycles or the cycle time."
+msgstr ""
+"Дамжлагын хэмжээнд 1 ажлын захиалга байна. Циклийн тоо эсвэл циклийн "
+"хугацааны мэдээлэл."
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Month -1"
+msgstr "Сар-1"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,uom:0
+msgid "UOM"
+msgstr "Х.нэгж"
+
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr "Харагдац төрөлтэй байрлалаас/байрлалруу шилжүүлж болохгүй."
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Planned Date"
+msgstr "Төлөвлөсөн огноо"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,product_qty:0
+msgid "Product Qty"
+msgstr "Барааны тоо"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:134
+#, python-format
+msgid "Manufacturing order cannot start in state \"%s\"!"
+msgstr "\"%s\" төлөвт байгаа үйлдвэрлэх захиалгыг эхлүүлж чадахгүй!"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "July"
+msgstr "7-р сар"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation.code,name:0
+msgid "Operation Name"
+msgstr "Ажиллагааны Нэр"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation.code,start_stop:0
+msgid "Status"
+msgstr "Төлөв"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
+msgid ""
+"To manufacture or assemble products, and use raw materials and finished "
+"products you must also handle manufacturing operations. Manufacturing "
+"operations are often called Work Orders. The various operations will have "
+"different impacts on the costs of manufacturing and planning depending on "
+"the available workload."
+msgstr ""
+"Барааг үйлдвэрлэх эсвэл угсрах, түүхий эдийг болон дууссан барааг "
+"хэрэглэхийн тулд үйлдвэрлэлийн ажиллагааг удирдах ёстой. Үйлдвэрлэлийн "
+"ажиллагаа нь ихэнхдээ ажлын захиалга гэж яригддаг. Байгаа ачааллаас хамааран "
+"олон янзын ажиллагаа нь үйлдвэрлэлийн өртөг болон төлөвлөлтөд төрөл бүрийн "
+"нөлөөг үзүүлдэг."
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Planned Year"
+msgstr "Төлөвлөсөн Жил"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,order_date:0
+msgid "Order Date"
+msgstr "Захиалгын Огноо"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
+msgid "Future Work Orders"
+msgstr "Ирээдүйн Ажлын Захиалгууд"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Work orders during last month"
+msgstr "Өнгөрсөн сарын ажлын захиалгууд"
+
+#. module: mrp_operations
+#: help:mrp.production.workcenter.line,delay:0
+msgid "The elapsed time between operation start and stop in this Work Center"
+msgstr ""
+"Энэ дамжлага дээрх ажиллагааны эхлэх болон зогсох огнооны ялгавар хугацаа"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_canceloperation0
+msgid "Operation Cancelled"
+msgstr "Ажиллагаа Цуцлагдсан"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Pause Work Order"
+msgstr "Ажлын Захиалгыг Түр зогсоох"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "September"
+msgstr "9-р сар"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "December"
+msgstr "12-р сар"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,month:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Canceled"
+msgstr "Цуцлагдсан"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation
+msgid "mrp_operations.operation"
+msgstr "mrp_operations.operation"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_workorder
+msgid "Work Order Report"
+msgstr "Ажлын Захиалгын Тайлан"
+
+#. module: mrp_operations
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Захиалгын тоо ширхэг нь хасах юмуу тэг байж болохгүй!"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_start:0
+#: field:mrp.production.workcenter.line,date_start_date:0
+#: field:mrp_operations.operation,date_start:0
+msgid "Start Date"
+msgstr "Эхлэл огноо"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Waiting Goods"
+msgstr "Бараанууд Хүлээж буй"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Work orders made during current year"
+msgstr "Энэ жилд хийгдсэн ажлын захиалгууд"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Pause"
+msgstr "Түр зогсоох"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "In Progress"
+msgstr "Хийгдэж буй"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:470
+#, python-format
+msgid ""
+"In order to Pause the operation, it must be in the Start or Resume state!"
+msgstr ""
+"Ажиллагааг түр зогсоохын тулд Эхлэх эсвэл Үргэлжлүүлэх төлөвт байх ёстой!"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:474
+#, python-format
+msgid "In order to Resume the operation, it must be in the Pause state!"
+msgstr ""
+"Ажиллагааг үргэлжлүүлэхийн тулд энэ нь Түр зогсоох төлөвт байх ёстой!"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Start"
+msgstr "Эхлэх"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Calendar View"
+msgstr "Цагалбар Харагдац"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
+msgid ""
+"When the operation needs to be cancelled, you can do it in the work order "
+"form."
+msgstr ""
+"Ажиллагааг цуцлах шаардлагатай бол ажлын захиалгын маягт дотор үүнийг хийж "
+"болно."
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Set Draft"
+msgstr "Ноороглох"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation.code:0
+msgid "Production Operation Code"
+msgstr "Үйлдвэрлэлийн ажиллагааны код"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:466
+#, python-format
+msgid ""
+"Operation has already started !Youcan either Pause/Finish/Cancel the "
+"operation"
+msgstr ""
+"Ажиллагаа хэдийнээ эхлсэн байна! Та түр зогсоох/дуусгах/цуцлах үйлдлүүдийг "
+"хийж чадна."
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "August"
+msgstr "8-р сар"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Started"
+msgstr "Эхлэсэн"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Production started late"
+msgstr "Үйлдвэрлэж оройтож эхлэсэн"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Planned Day"
+msgstr "Төлөвлөсөн өдөр"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "June"
+msgstr "6-р сар"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,total_cycles:0
+msgid "Total Cycles"
+msgstr "Нийт циклүүд"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Ready to Produce"
+msgstr "Үйлдвэрлэхэд бэлэн"
+
+#. module: mrp_operations
+#: field:stock.move,move_dest_id_lines:0
+msgid "Children Moves"
+msgstr "Хүүхдүүдийн Хөдөлгөөнүүд"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
+msgid "Work Orders Planning"
+msgstr "Ажлын Захиалгуудын Төлөвлөлт"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: field:mrp.workorder,date:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "November"
+msgstr "11-р сар"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Search"
+msgstr "Хайх"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "October"
+msgstr "10-р сар"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "January"
+msgstr "1-р сар"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Resume Work Order"
+msgstr "Ажлын Захиалгыг Үргэлжлүүлэх"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_doneoperation0
+msgid "Finish the operation."
+msgstr "Ажиллагааг дуусгах."
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:459
+#, python-format
+msgid "Operation is not started yet !"
+msgstr "Ажиллагаа хараахан эхлээгүй байна !"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_productionorder0
+msgid "Information from the production order."
+msgstr "Үйлдвэрлэлийн захиалгаасх мэдээлэл."
+
+#. module: mrp_operations
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Код компаний хэмжээнд үл давхцах байх ёстой!"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:466
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
+#, python-format
+msgid "Sorry!"
+msgstr "Уучлаарай!"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Current"
+msgstr "Одоогийн"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,code_id:0
+#: field:mrp_operations.operation.code,code:0
+msgid "Code"
+msgstr "Код"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
+msgid "Confirmed Work Orders"
+msgstr "Батлагдсан Ажлын Захиалгууд"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
+msgid "Operation Codes"
+msgstr "Ажиллагааны Кодууд"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,qty:0
+msgid "Qty"
+msgstr "Тоо хэмжээ"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_doneoperation0
+msgid "Operation Done"
+msgstr "Ажиллагаа Хийгдсэн"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: view:mrp.workorder:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
+msgid "Start/Stop Barcode"
+msgstr "Эхлэх/Зогсоох Зураасан код"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
+msgid ""
+"Work Orders is the list of operations to be performed for each manufacturing "
+"order. Once you start the first work order of a manufacturing order, the "
+"manufacturing order is automatically marked as started. Once you finish the "
+"latest operation of a manufacturing order, the MO is automatically done and "
+"the related products are produced."
+msgstr ""
+"Ажлын захиалгууд гэдэг нь үйлдвэрлэлийн захиалгыг гүйцэтгэхэд хийгдэх "
+"ажиллагаанууд юм. Үйлдвэрлэлийн захиалгын эхний ажиллагаа эхлүүлэхэд "
+"үйлдвэрлэлийн захиалга автоматаар эхлэсэн төлөвтэй болдог. Хамгийн сүүлийн "
+"ажиллагааг дуусгахад үйлдвэрлэлийн захиалга автоматаар хийгдсэн төлөвтэй "
+"болж холбогдох бараанууд үйлдвэрлэгддэг."
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_startoperation0
+msgid "Start Operation"
+msgstr "Ажиллагааг Эхлүүлэх"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Information"
+msgstr "Мэдээлэл"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
+msgid "Work Centers Barcode"
+msgstr "Дамжлагуудын зураасан код"
+
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Бараанд цувралыг оноох ёстой."
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Late"
+msgstr "Хоцролт"
+
+#. module: mrp_operations
+#: field:mrp.workorder,delay:0
+msgid "Delay"
+msgstr "Саатал"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,production_id:0
+#: field:mrp_operations.operation,production_id:0
+msgid "Production"
+msgstr "Үйлдвэрлэл"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Search Work Orders"
+msgstr "Ажлын Захиалгуудыг Хайх"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,workcenter_id:0
+#: field:mrp_operations.operation,workcenter_id:0
+#: model:process.node,name:mrp_operations.process_node_workorder0
+msgid "Work Center"
+msgstr "Дамжлага"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Real"
+msgstr "Бодит"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_planned:0
+msgid "Scheduled Date"
+msgstr "Товлогдсон огноо"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,product:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,product_id:0
+msgid "Product"
+msgstr "Бараа"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,total_hours:0
+msgid "Total Hours"
+msgstr "Нийт цаг"
+
+#. module: mrp_operations
+#: help:mrp.production,allow_reorder:0
+msgid ""
+"Check this to be able to move independently all production orders, without "
+"moving dependent ones."
+msgstr ""
+"Үйлдвэрлэлийн захиалгуудыг хооронд хамааруулалгүй буюу хамаатай захиалгуудад "
+"нөлүүлэлгүйгээр зөөхөөр бол үүнийг тэмдэглэнэ."
+
+#. module: mrp_operations
+#: report:mrp.code.barcode:0
+msgid ")"
+msgstr ")"
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
+msgid "Work Order Analysis"
+msgstr "Ажлын Захиалгын Шинжилгээ"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "Finished"
+msgstr "Дууссан"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Hours by Work Center"
+msgstr "Цагууд дамжлагаар"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,delay:0
+msgid "Working Hours"
+msgstr "Ажлын цаг"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Planned Month"
+msgstr "Төлөвлөсөн Сар"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "February"
+msgstr "2-р сар"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Work orders made during current month"
+msgstr "Энэ сард хийгдсэжн ажлын захиалгууд"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
+msgid "Operation cancelled"
+msgstr "Ажиллагаа цуцлагдсан"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_startoperation0
+msgid "Start the operation."
+msgstr "Ажиллагааг эхлүүлэх"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "April"
+msgstr "4-р сар"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
+msgid "Operation done"
+msgstr "Ажиллагаа хийгдсэн"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "#Line Orders"
+msgstr "Захиалгуудын мөр #"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Start Working"
+msgstr "Ажиллаж эхлэх"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
+msgid ""
+"When the operation is finished, the operator updates the system by finishing "
+"the work order."
+msgstr ""
+"Ажиллагаа дуусахад хэрэглэгч ажлын захиалгыг дуусгаж системд шинэчлэлийг "
+"оруулна."
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "May"
+msgstr "5-р сар"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
+msgid "Details of the work order"
+msgstr "Ажлын захиалгын дэлгэрэнгүй"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,production_state:0
+msgid "Production State"
+msgstr "Үйлдвэрлэлийн төлөв"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,year:0
+msgid "Year"
+msgstr "Жил"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Duration"
+msgstr "Үргэлжлэх хугацаа"
+
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Ижил биш барааны цувралыг олгох гэж байна"
diff --git a/addons/plugin_outlook/i18n/pt_BR.po b/addons/plugin_outlook/i18n/pt_BR.po
index b13b73a7634..cbc1ed8430b 100644
--- a/addons/plugin_outlook/i18n/pt_BR.po
+++ b/addons/plugin_outlook/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-05-24 18:04+0000\n"
-"Last-Translator: Eduardo de Jesus <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 20:39+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:24+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -23,11 +23,13 @@ msgid ""
 "This plug-in allows you to create and link outlook emails with openerp "
 "objects."
 msgstr ""
+"Este plugin te permite criar um link dos emails do Outlook para seus objetos "
+"do OpenErp"
 
 #. module: plugin_outlook
 #: field:outlook.installer,name:0
 msgid "Outlook Plug-in"
-msgstr ""
+msgstr "Plug0in do Outlook"
 
 #. module: plugin_outlook
 #: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
@@ -35,7 +37,7 @@ msgstr ""
 #: model:ir.ui.menu,name:plugin_outlook.menu_base_config_plugins_outlook
 #: view:outlook.installer:0
 msgid "Install Outlook Plug-In"
-msgstr ""
+msgstr "Instalar Plug-in do Outlook"
 
 #. module: plugin_outlook
 #: field:outlook.installer,config_logo:0
@@ -50,12 +52,12 @@ msgstr "Titulo"
 #. module: plugin_outlook
 #: model:ir.model,name:plugin_outlook.model_outlook_installer
 msgid "outlook.installer"
-msgstr ""
+msgstr "outlook.installer"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Fechar"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_thunderbird/i18n/pt_BR.po b/addons/plugin_thunderbird/i18n/pt_BR.po
index b30c9031f29..ca5c0650b39 100644
--- a/addons/plugin_thunderbird/i18n/pt_BR.po
+++ b/addons/plugin_thunderbird/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-12-26 19:12+0000\n"
-"Last-Translator: tfr (Openerp) <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 20:54+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:14+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -35,7 +35,7 @@ msgstr "Título"
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
 msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "plugin_thunderbird.installer"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,config_logo:0
@@ -54,6 +54,8 @@ msgid ""
 "This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
+"Este plug-in te permite fazer um link entre seu email para os documentos do "
+"OpenErp. Você poderá anexar para qualquer um existente ou criar um novo."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -98,7 +100,7 @@ msgstr ""
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Instalar Plug-in do Thunderbird"
 
 #~ msgid ""
 #~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index 1ff2d4fab85..1f4e5c5539e 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-17 18:46+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:10+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -256,7 +256,7 @@ msgstr "Processo"
 #. module: process
 #: view:process.node:0
 msgid "Search ProcessNode"
-msgstr ""
+msgstr "Procurar Processo/Nó"
 
 #. module: process
 #: view:process.node:0
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 02b62d0caad..d28f83ac4ab 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:37+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:32+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:02+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,15 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Quantidade prevista (calculada como Quantidade em mãos - Saída + Entrada)\n"
+"Em um contexto de Estoque único, isto inclui mercadorias armazenadas neste "
+"Local, ou qualquer de seus filhos.\n"
+"Em um contexto de Armazém único, isto inclui mercadorias armazenadas  em um "
+"Local do Estoque deste Armazém, ou qualquer  de suas filiais.\n"
+"Em um contexto de loja única, isto inclui mercadorias armazenadas  em um "
+"local de estoque do armazém desta loja, ou qualquer de seus filhos.\n"
+"Do contrário, isto inclui mercadorias armazenadas em qualquer Estoque "
+"descrito como \"Interno\""
 
 #. module: product
 #: model:product.category,name:product.cat1
@@ -170,11 +179,13 @@ msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Conversão de uma UdM de um produto %s  para um padrão de UdM %s não é "
+"possível pois eles pertencem a categorias diferentes"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen"
-msgstr ""
+msgstr "Dúzia"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -258,6 +269,8 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Cria um formulário de produto para tudo que você compra ou vende. "
+"Especifique o fornecedor se o produto pode ser comprado."
 
 #. module: product
 #: view:product.uom:0
@@ -545,7 +558,7 @@ msgstr "Presilhas de Metal"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Não é possível alterar a categoria de uma UdM  '%s' existente."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -565,7 +578,7 @@ msgstr "Cálculo de Preços"
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Product UoS View"
-msgstr ""
+msgstr "Ver UoS de Produto"
 
 #. module: product
 #: field:product.template,purchase_ok:0
@@ -613,7 +626,7 @@ msgstr "Templates de Produtos"
 #. module: product
 #: field:product.category,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Pai anterior"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
@@ -663,7 +676,7 @@ msgstr "Preço base"
 #. module: product
 #: model:product.template,name:product.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Lançamentos de Horas de Serviço"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
@@ -699,7 +712,7 @@ msgstr "Fornecedor"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "Quantidade na măo"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -714,7 +727,7 @@ msgstr "Nome do Preço"
 #. module: product
 #: model:product.template,name:product.product_product_arm_product_template
 msgid "Cabinet"
-msgstr ""
+msgstr "Armário"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -733,7 +746,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
 msgid "Wooden Table"
-msgstr ""
+msgstr "Mesa de Madeira"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -899,7 +912,7 @@ msgstr "Em desevolvimento"
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Categorias da UdM são diferentes!"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -976,7 +989,7 @@ msgstr "Peso Bruto Total"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "Desconhecido"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -1126,7 +1139,7 @@ msgstr "Maior que a UdM de referência"
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Próximo pai"
 
 #. module: product
 #: view:product.product:0
@@ -1317,7 +1330,7 @@ msgstr "Serviços"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Cria ou Importa Produtos"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1517,6 +1530,8 @@ msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
 msgstr ""
+"Irá mudar a forma como compras são processadas. Consumíveis são produtos que "
+"você não controla estoque"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1600,7 +1615,7 @@ msgstr "O peso embalagem"
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "Madeira 10mm"
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1634,7 +1649,7 @@ msgstr "O código EAN da embalagem."
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "Isto vem do formulário do produto"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1765,6 +1780,8 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Buy will trigger purchase orders when requested."
 msgstr ""
+"Produzir irá gerar uma ordem de produção ou tarefas, de acordo com o tipo de "
+"produto. Comprar irá disparar uma ordem de compra quando solicitado."
 
 #. module: product
 #: field:product.product,variants:0
@@ -1915,7 +1932,7 @@ msgstr "Outros Produtos"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Índice de Cores"
 
 #. module: product
 #: view:product.product:0
@@ -1941,7 +1958,7 @@ msgstr "Lista de Preços para Fornecedor"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Alerta"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -1951,7 +1968,7 @@ msgstr "Baseado em"
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "t"
-msgstr ""
+msgstr "t"
 
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
@@ -2111,7 +2128,7 @@ msgstr "Fornecedor do Produto"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Imagem"
 
 #. module: product
 #: field:product.uom,uom_type:0
@@ -2193,6 +2210,8 @@ msgid ""
 "At least one pricelist has no active version !\n"
 "Please create or activate one."
 msgstr ""
+"Pelo menos uma lista de preços não possui uma versão ativa!\n"
+"Por favor crie ou ative uma."
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
@@ -2260,7 +2279,7 @@ msgstr "Sequência"
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Custo de Montagem"
 
 #. module: product
 #: view:product.price_list:0
@@ -2291,7 +2310,7 @@ msgstr "Atrasos"
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Ambos os Produtos Estocáveis e Consumíveis"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
@@ -2421,7 +2440,7 @@ msgstr "Preço de venda"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Erro! Você não pode criar categorias recursivas."
 
 #. module: product
 #: field:product.category,type:0
@@ -2445,7 +2464,7 @@ msgstr ""
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 26c09df9427..61859e7c568 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 12:02+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:09+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:11+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -186,7 +186,7 @@ msgstr "Margem total"
 #: view:product.product:0
 #: field:product.product,sales_gap:0
 msgid "Sales Gap"
-msgstr ""
+msgstr "Vendas abertas"
 
 #. module: product_margin
 #: field:product.product,normal_cost:0
@@ -251,7 +251,7 @@ msgstr "Erro: Código EAN inválido"
 #. module: product_margin
 #: field:product.product,purchase_gap:0
 msgid "Purchase Gap"
-msgstr ""
+msgstr "Abertura de compra"
 
 #. module: product_margin
 #: field:product.product,total_margin_rate:0
diff --git a/addons/product_visible_discount/i18n/pt_BR.po b/addons/product_visible_discount/i18n/pt_BR.po
index a3a9de0975e..018d275c99a 100644
--- a/addons/product_visible_discount/i18n/pt_BR.po
+++ b/addons/product_visible_discount/i18n/pt_BR.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 23:10+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:35+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:17+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "No Sale Pricelist Found!"
-msgstr ""
+msgstr "Nenhuma lista de Preços de Venda encontrada!"
 
 #. module: product_visible_discount
 #: field:product.pricelist,visible_discount:0
@@ -32,7 +32,7 @@ msgstr "Desconto Visível"
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "No Purchase Pricelist Found!"
-msgstr ""
+msgstr "Não foi encontrada uma Lista de Preços de Compras!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_account_invoice_line
@@ -49,6 +49,8 @@ msgstr "Lista de Preço"
 #, python-format
 msgid "You must first define a pricelist on the supplier form!"
 msgstr ""
+"Você precisa primeiro definir uma lista de preços no formulário do "
+"fornecedor!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
@@ -60,6 +62,7 @@ msgstr "Linha de Pedido de Vendas"
 #, python-format
 msgid "You must first define a pricelist on the customer form!"
 msgstr ""
+"Você primeiro precisa definir uma Lista de Preços no formulário do Cliente!"
 
 #, python-format
 #~ msgid "You must first define a pricelist for Supplier !"
diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
index 817ddc5a887..bbb3571497e 100644
--- a/addons/project_scrum/i18n/pt_BR.po
+++ b/addons/project_scrum/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
+"PO-Revision-Date: 2012-07-28 20:36+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:43+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
@@ -46,7 +46,7 @@ msgstr "O que você executou desde a última reunião?"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Sprint Month"
-msgstr ""
+msgstr "Mês do Sprint"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
@@ -127,18 +127,18 @@ msgstr "Erro! Você não pode criar tarefas recursivas."
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "In Progress Sprints"
-msgstr ""
+msgstr "Sprints em Progresso"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Para mudar para Situação Delegada"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
 #, python-format
 msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
+msgstr "Backlog do produto '%s' está associado ao sprint %s"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj
@@ -209,12 +209,12 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
+msgstr "Backlogs Atribuídos ao Sprint Atual"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Para cancelar a tarefa"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
@@ -287,7 +287,7 @@ msgstr "Total de Horas Gastas"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Pending Sprints"
-msgstr ""
+msgstr "Sprints Pendentes"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:95
@@ -298,7 +298,7 @@ msgstr "Pontos de bloqueio encontrados:"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
+msgstr "Backlogs não atribuídos a Sprints"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -391,7 +391,7 @@ msgstr "Backlogs de Produto"
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Assistente de composição de E-mail."
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,create_date:0
@@ -639,12 +639,12 @@ msgstr "Mudar o Tipo"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Para mudar o estado para feito"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "New Sprints"
-msgstr ""
+msgstr "Novos Sprints"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -827,12 +827,12 @@ msgstr "Meus Backlogs"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "In Progress Backlogs"
-msgstr ""
+msgstr "Backlogs em Andamento"
 
 #. module: project_scrum
 #: view:project.task:0
 msgid "View Sprints"
-msgstr ""
+msgstr "Ver Sprints"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
@@ -851,7 +851,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Postpone backlog"
-msgstr ""
+msgstr "Adiar backlog"
 
 #. module: project_scrum
 #: model:process.transition,name:project_scrum.process_transition_backlogtask0
@@ -1015,7 +1015,7 @@ msgstr "Obrigado"
 #: view:project.scrum.meeting:0
 #: view:project.task:0
 msgid "Current Sprints"
-msgstr ""
+msgstr "Sprints Atuais"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
@@ -1036,7 +1036,7 @@ msgstr "Tem certeza de adiar Backlog"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Para alterar para Aberto"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,sprint_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pt_BR.po b/addons/purchase_analytic_plans/i18n/pt_BR.po
index bcd27c79e9f..56a42f27bd0 100644
--- a/addons/purchase_analytic_plans/i18n/pt_BR.po
+++ b/addons/purchase_analytic_plans/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 02:08+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 20:58+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:36+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:36+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Distribuição Analítica"
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index 864be1f1071..6e241fc84d0 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-01 00:40+0000\n"
-"Last-Translator: Filipe Belmont Sopranzi <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 21:05+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:26+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -48,7 +48,7 @@ msgstr "Configura o Valor Limite para Compra"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "Ordem de Compra Esperando Aprovação"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -68,7 +68,7 @@ msgstr "purchase.double.validation.installer"
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum Purchase Amount"
-msgstr ""
+msgstr "Valor Máximo da Compra"
 
 #~ msgid "purchase_double_validation"
 #~ msgstr "purchase_double_validation"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index a8256204d5a..0932318f49a 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:38+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 16:28+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
-"X-Generator: Launchpad (build 15654)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -28,6 +28,8 @@ msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Linhas do Pedido de Venda que estão confirmadas, feitas ou em situação de "
+"excessão e não foram ainda faturadas."
 
 #. module: sale
 #: view:board.board:0
@@ -90,7 +92,7 @@ msgstr "Aviso !"
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Imposto"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -123,6 +125,9 @@ msgid ""
 "cancel a sale order, you must first cancel related picking or delivery "
 "orders."
 msgstr ""
+"Para excluir um pedido de venda confirmado, você precisa cancelar antes! "
+"Para cancelar um pedido de venda, você precisa primeiro cancelar as ordens "
+"de entrega ou de separação."
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
@@ -262,7 +267,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.picking_policy,task_work:0
 msgid "Based on Tasks' Work"
-msgstr ""
+msgstr "Baseado no Trabalho da Tarefa"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -272,7 +277,7 @@ msgstr "Cotação e Vendas"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Fatura de Vendas"
 
 #. module: sale
 #: code:addons/sale/sale.py:330
@@ -327,6 +332,18 @@ msgid ""
 "  - The 'Invoice based on deliveries' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"A política de Fatura é usada para sincronizar operações de faturamento e "
+"entrega.\n"
+"  - 'Faturar antes da entrega' irá primeiro gerar a fatura e então gerar a "
+"ordem de separação depois do pagamento desta fatura.\n"
+"  - 'Entrega e Fatura na demanda' irá criar uma ordem de separação "
+"diretamente e esperar o usuário clicar no botão 'Fatura' para gerar uma "
+"fatura provisória baseada no pedido de venda ou em linhas do pedido de "
+"venda.\n"
+"  - 'Faturar depois da entrega' irá gerar uma fatura provisória baseada no "
+"pedido de venda depois que todos os itens forem entregues.\n"
+"  - 'Faturar  baseado em entregas' irá gerar uma fatura durante o processo "
+"de separação e entrega de cada item."
 
 #. module: sale
 #: code:addons/sale/sale.py:1171
@@ -471,6 +488,7 @@ msgstr ""
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
+"Você não pode cancelar uma linha do  pedido de venda que já foi faturada!"
 
 #. module: sale
 #: code:addons/sale/sale.py:1079
@@ -534,7 +552,7 @@ msgstr "Mês-1"
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "Mês de ordenação  do pedido de venda"
 
 #. module: sale
 #: code:addons/sale/sale.py:504
@@ -542,6 +560,7 @@ msgstr ""
 msgid ""
 "You cannot group sales having different currencies for the same partner."
 msgstr ""
+"Você não pode agrupar vendas com moedas diferentes para o mesmo parceiro."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -606,7 +625,7 @@ msgstr "Endereço de Faturamento :"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Line Sequence"
-msgstr ""
+msgstr "Sequência da Linha"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -773,6 +792,8 @@ msgstr "Setembro"
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
+"Você não pode confirmar um pedido de venda que não tem nenhuma linha de "
+"pedido."
 
 #. module: sale
 #: code:addons/sale/sale.py:1259
@@ -781,6 +802,9 @@ msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Você precisa escolher uma lista de preços ou um cliente no formulário de "
+"vendas!\n"
+"Por favor escolha um antes de escolher um produto."
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,categ_id:0
@@ -877,12 +901,18 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"Informa a Situação da cotação ou pedido de venda.\n"
+"A Situação de Excessão é automaticamente definida quando um Cancelamento "
+"ocorre na validação da fatura (Excessão de Fatura) ou no processo de "
+"separação (Excessão de Entrega).\n"
+"O 'Aguardando Agendamento' é definido quando a fatura está confirmada, mas "
+"está esperando o agendamento na data do pedido."
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
 #, python-format
 msgid "No valid pricelist line found ! :"
-msgstr ""
+msgstr "Não foi encontrada uma linha de preço válida!"
 
 #. module: sale
 #: view:sale.order:0
@@ -892,7 +922,7 @@ msgstr "Histórico"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on order after delivery"
-msgstr ""
+msgstr "Faturar depois da entrega"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -936,7 +966,7 @@ msgstr "Referências"
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
-msgstr ""
+msgstr "Minhas linhas de Pedido de Venda"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -968,7 +998,7 @@ msgstr "Total de Impostos Excluídos"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
-msgstr ""
+msgstr "Referência do Pedido"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -994,7 +1024,7 @@ msgstr "Nota Fiscal Aberta"
 #. module: sale
 #: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
 msgid "Auto-email confirmed sale orders"
-msgstr ""
+msgstr "Email automático do Pedido de Vendas"
 
 #. module: sale
 #: code:addons/sale/sale.py:413
@@ -1059,6 +1089,8 @@ msgstr "Criar Ordem de Entrega"
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'!"
 msgstr ""
+"Não é possível excluir uma linha de pedido de vendas que possui situação "
+"'%s'!"
 
 #. module: sale
 #: view:sale.order:0
@@ -1078,7 +1110,7 @@ msgstr "Criar lista de Opções"
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered date of the sales order"
-msgstr ""
+msgstr "Pedidos de Venda ordenado por data"
 
 #. module: sale
 #: view:sale.report:0
@@ -1215,6 +1247,80 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Olá${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Aqui está a confirmação de seu pedido para ${object.partner_id.name}:\n"
+"       | Número do Pedido: *${object.name}*\n"
+"       | Valor Total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Data: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Referência: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Sua referência: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Seu contato: ${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"Você pode ver a confirmação do pedido, fazer o download e até efetuar o "
+"pagamento online através do link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"Também é possível pagar diretamente com Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"Se tiver alguma dúvida por favor entre em contato conosco.\n"
+"\n"
+"\n"
+"Obrigado por escolher ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1240,7 +1346,7 @@ msgstr "Impostos"
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order ready to be invoiced"
-msgstr ""
+msgstr "Pedido de Venda pronto para ser faturado"
 
 #. module: sale
 #: help:sale.order,create_date:0
@@ -1260,7 +1366,7 @@ msgstr "Criar Notas Fiscais"
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in current month"
-msgstr ""
+msgstr "Pedidos de venda criados neste mês"
 
 #. module: sale
 #: report:sale.order:0
@@ -1274,6 +1380,9 @@ msgid ""
 "create a task, purchase order or manufacturing order linked to this sale "
 "order line."
 msgstr ""
+"Se 'No Pedido' ele aciona uma ação quando o pedido de venda for confirmado, "
+"para criar uma tarefa, pedido de compra, ou ordem de produção associado a "
+"esta linha de pedido."
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -1283,7 +1392,7 @@ msgstr "Montante de Adiantamento"
 #. module: sale
 #: field:sale.config.picking_policy,charge_delivery:0
 msgid "Do you charge the delivery?"
-msgstr ""
+msgstr "Cobrar entrega?"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1302,6 +1411,8 @@ msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
 "prices of existing order lines will not be updated."
 msgstr ""
+"Se você desejar mudar a lista de preço para este pedido (e eventualmente a "
+"moeda), os preços da linha de pedido existente não serão atualizadas."
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
@@ -1330,7 +1441,7 @@ msgstr "Quantidade(UoM)"
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered Year of the sales order"
-msgstr ""
+msgstr "Ano do pedido de venda"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1351,7 +1462,7 @@ msgstr "Pendência no Embarque"
 #: code:addons/sale/sale.py:1156
 #, python-format
 msgid "Picking Information ! : "
-msgstr ""
+msgstr "Informações de Separação ! : "
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
@@ -1361,13 +1472,13 @@ msgstr "Agrupar Notas Fiscais"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Invoice Policy"
-msgstr ""
+msgstr "Politica de Faturamento"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 #: view:sale.config.picking_policy:0
 msgid "Setup your Invoicing Method"
-msgstr ""
+msgstr "Configure o Método de Faturamento"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
@@ -1385,6 +1496,8 @@ msgid ""
 "This tool will help you to install the right module and configure the system "
 "according to the method you use to invoice your customers."
 msgstr ""
+"Esta ferramenta irá ajudá-lo a instalar o módulo correto e configurar o "
+"sistema de acordo com o método usado para cobrar seus clientes."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1421,6 +1534,10 @@ msgid ""
 "Here is a proposition of quantities according to the packaging:\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"Você selecionou uma quantidade de %d unidades.\n"
+"Mas não é compatível com a embalagem escolhida.\n"
+"Aqui segue uma proposta de quantidades compatível com a embalagem:\n"
+"AN: %s Quantidade: %s Tipo de : %s"
 
 #. module: sale
 #: view:sale.order:0
@@ -1460,7 +1577,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
+msgstr "Linhas de pedido confirmadas e não entregues"
 
 #. module: sale
 #: code:addons/sale/sale.py:473
@@ -1547,7 +1664,7 @@ msgstr "Mês"
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
 
 #. module: sale
 #: view:sale.order.line:0 field:sale.order.line,product_id:0
@@ -1680,12 +1797,12 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Pay before delivery"
-msgstr ""
+msgstr "Pagar antes da entrega"
 
 #. module: sale
 #: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Painel de Vendas"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1707,7 +1824,7 @@ msgstr "Data na qual o pedido de venda é confirmado."
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
-msgstr ""
+msgstr "Conta de Contrato/Analítica"
 
 #. module: sale
 #: field:sale.order,company_id:0 field:sale.order.line,company_id:0
@@ -1733,6 +1850,9 @@ msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"Não foi possível encontrar uma linha da lista de preços para este produto e "
+"quantidade.\n"
+"Você precisa alterar ou o produto, a quantidade ou a lista de preços."
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -1760,7 +1880,7 @@ msgstr "Cancelada"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
+msgstr "Linhas de Pedido de Venda relacionadas ao meu pedido"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1803,7 +1923,7 @@ msgstr "Quantidade (UdS)"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
+msgstr "Linhas do Pedido que estão 'Feitas'"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -1826,7 +1946,7 @@ msgstr "Confirmada"
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Main Method Based On"
-msgstr ""
+msgstr "Método principal baseado em"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1869,7 +1989,7 @@ msgstr "Configuração"
 #: code:addons/sale/edi/sale_order.py:146
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI Lista de Preços (%s)"
 
 #. module: sale
 #: view:sale.order:0
@@ -1879,7 +1999,7 @@ msgstr "Imprimir Pedido"
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in current year"
-msgstr ""
+msgstr "Pedidos de Venda criados este ano"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:113
@@ -1898,7 +2018,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
-msgstr ""
+msgstr "Linhas de pedido concluídas"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -2010,18 +2130,18 @@ msgstr "Separação"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
+msgstr "Linhas de pedido prontas para faturar"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in last month"
-msgstr ""
+msgstr "Pedidos de venda criados mês passado"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
 #: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Modelos de Email"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -2081,7 +2201,7 @@ msgstr "Compromisso Atrasado"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Deliver & invoice on demand"
-msgstr ""
+msgstr "Entrega e Fatura na demanda"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -2110,7 +2230,7 @@ msgstr "Pedidos de venda confirmados para faturamento."
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+msgstr "Pedidos de Venda que não foram confirmados"
 
 #. module: sale
 #: code:addons/sale/sale.py:322
@@ -2132,7 +2252,7 @@ msgstr "Encerrar"
 #: code:addons/sale/sale.py:1261
 #, python-format
 msgid "No Pricelist ! : "
-msgstr ""
+msgstr "Nenhuma Lista de Preços ! : "
 
 #. module: sale
 #: field:sale.order,shipped:0
@@ -2213,7 +2333,7 @@ msgstr "Solicitação para Pedido de Venda"
 #: code:addons/sale/sale.py:1255
 #, python-format
 msgid "Not enough stock ! : "
-msgstr ""
+msgstr "Sem Estoque Suficiente ! : "
 
 #. module: sale
 #: report:sale.order:0 field:sale.order,payment_term:0
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index 4737b125eac..110bef65e51 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-29 10:47+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:41+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "Convertido para Cotação (%s)."
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -62,7 +62,7 @@ msgstr "_Criar"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Minha Equipe de Vendas"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -75,7 +75,7 @@ msgstr ""
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Minhas Oportunidades"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -106,13 +106,13 @@ msgstr "Fechar Oportunidade"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Minhas Receitas Planejadas por Estágio"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "A Oportunidade '%s' foi convertida para uma cotação."
 
 #. module: sale_crm
 #: view:sale.order:0
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index 31e94c023d1..0f8910c0e8e 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-14 09:27+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:50+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:04+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -29,7 +29,7 @@ msgstr "Nota"
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Type"
-msgstr ""
+msgstr "Tipo de Fatura"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
@@ -37,11 +37,12 @@ msgid ""
 "This invoicing type will be used, by default, for invoicing the current "
 "partner."
 msgstr ""
+"Este tipo de fatura será usada, por padrão, para faturar o parceiro atual."
 
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -99,7 +100,7 @@ msgstr ""
 #. module: sale_journal
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "A referência deve ser única por empresa!"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po
index aea579c2d60..4dd027ca579 100644
--- a/addons/sale_margin/i18n/pt_BR.po
+++ b/addons/sale_margin/i18n/pt_BR.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-14 10:12+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:50+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:17+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po
index 85462ecc6f6..b94f7b78657 100644
--- a/addons/sale_order_dates/i18n/pt_BR.po
+++ b/addons/sale_order_dates/i18n/pt_BR.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-14 10:07+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:51+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
 
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
diff --git a/addons/users_ldap/i18n/pt_BR.po b/addons/users_ldap/i18n/pt_BR.po
index 2558123ad28..18657350e25 100644
--- a/addons/users_ldap/i18n/pt_BR.po
+++ b/addons/users_ldap/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-16 18:46+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 22:27+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -35,6 +35,9 @@ msgid ""
 "option requires a server with STARTTLS enabled, otherwise all authentication "
 "attempts will fail."
 msgstr ""
+"Solicite a conexão segura com encriptação TLS/SSL quando se conectar no "
+"servidor LDAP. Esta opção requer um servidor com STARTTLS habilitado, caso "
+"contrário a autenticação irá falhar"
 
 #. module: users_ldap
 #: view:res.company:0
@@ -78,6 +81,8 @@ msgid ""
 "The user account on the LDAP server that is used to query the directory. "
 "Leave empty to connect anonymously."
 msgstr ""
+"A conta do usuário no servidor LDAP que é usada para a busca no diretório, "
+"deixe em branco para conectar anonimamente"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -87,12 +92,12 @@ msgstr "Base LDAP"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "User Information"
-msgstr ""
+msgstr "Informações do usuário"
 
 #. module: users_ldap
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser exclusivo!"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -102,7 +107,7 @@ msgstr "Empresas"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Parâmetro de Processo"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
@@ -112,7 +117,7 @@ msgstr "res.company.ldap"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_tls:0
 msgid "Use TLS"
-msgstr ""
+msgstr "Usar TLS"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -122,17 +127,17 @@ msgstr "Sequência"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Login Information"
-msgstr ""
+msgstr "Informações de login"
 
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Server Information"
-msgstr ""
+msgstr "Informação do servidor"
 
 #. module: users_ldap
 #: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
 msgid "Setup your LDAP Server"
-msgstr ""
+msgstr "Configure seu servidor LDAP"
 
 #. module: users_ldap
 #: sql_constraint:res.users:0
@@ -150,6 +155,8 @@ msgid ""
 "The password of the user account on the LDAP server that is used to query "
 "the directory."
 msgstr ""
+"A senha da conta de usuário no servidor LDAP que é usada para a busca no "
+"diretório"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0

From 9dec7e41102778aea46eb8a94eb88dfb52e95589 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 29 Jul 2012 06:47:21 +0200
Subject: [PATCH 260/312] [IMP] small change in copywriting of intro messages

bzr revid: fp@openerp.com-20120729044721-m1raabv882heiog8
---
 addons/mail/data/mail_group_data.xml | 13 ++++++++-----
 addons/sale/sale_data.xml            | 10 +++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 15928cd3e26..0c348c4d6eb 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -18,11 +18,14 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Social Network has been installed</value>
-            <value>Manage all communications on your documents (emails,
-                notifications, comments and discussions) and keep track of
-                news on documents you follow.
-            </value>
+            <value>Welcome to OpenERP!</value>
+            <value>Your homepage is a summary of messages you received and key information about documents you follow.
+
+You can also organize discussions with others people by topics. To do so, &lt;em&gt;create or join existing groups&lt;/em&gt; using the left menu.
+
+The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to intall more applications, activate others features or give access to new users.
+
+To setup your preferences (name, email signature, avatar), click on the top right corner.</value>
         </function>
 
     </data>
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index c93651219af..8617256d23b 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -26,14 +26,10 @@
         <function model="mail.group" name="message_append_note">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Sales Management has been installed</value>
-            <value>From the top menu Sales, manage your customers, quotations and
-                sales orders.  With sale orders, you can manage product
-                deliveries and customer invoices.
+            <value>The Sales Management application has been installed.</value>
+            <value>&lt;b&gt;Click on the top menu &lt;i&gt;'Sales'&lt;/i&gt;&lt;/em&gt; to start managing your customers, sending quotations and processing sale orders.
 
-                If you need to manage your sales pipeline (leads, opportunities,
-                phonecalls), you can install the module CRM from the top menu
-                Settings.
+If you need to manage your sales pipeline (leads, opportunities, phonecalls), you can install the module &lt;i&gt;CRM&lt;/i&gt; from the top menu Settings.
             </value>
         </function>
     </data>

From 70f12f78b8e72d99dba49a8a279dc5ec5c142ac9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 29 Jul 2012 17:16:11 +0200
Subject: [PATCH 261/312] [IMP] simplifiation of welcome message

bzr revid: fp@openerp.com-20120729151611-wxe4h8inc0ofa4d6
---
 addons/mail/data/mail_group_data.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 0c348c4d6eb..09a6ca29a2d 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -21,8 +21,6 @@
             <value>Welcome to OpenERP!</value>
             <value>Your homepage is a summary of messages you received and key information about documents you follow.
 
-You can also organize discussions with others people by topics. To do so, &lt;em&gt;create or join existing groups&lt;/em&gt; using the left menu.
-
 The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to intall more applications, activate others features or give access to new users.
 
 To setup your preferences (name, email signature, avatar), click on the top right corner.</value>

From 4f15336078c3fc2e50a69ed0fc78ac54ac65cd97 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 30 Jul 2012 04:59:15 +0000
Subject: [PATCH 262/312] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120730045534-skdqxm52z48qlae1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120730045915-0rv3el9erxc6y6dr
---
 addons/account/i18n/es_EC.po             |  29 +-
 addons/account_asset/i18n/es_EC.po       |  14 +-
 addons/fetchmail/i18n/pt_BR.po           |   4 +-
 addons/google_base_account/i18n/pt_BR.po |   4 +-
 addons/lunch/i18n/nl.po                  | 552 +++++++++++++++++
 addons/web/i18n/pt_BR.po                 | 722 ++++++++++++-----------
 6 files changed, 946 insertions(+), 379 deletions(-)
 create mode 100644 addons/lunch/i18n/nl.po

diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 7eff1938061..5b6bbffea1f 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -10,15 +10,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-12-31 16:16+0000\n"
-"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
-"<chris.ormaza@gmail.com>\n"
+"PO-Revision-Date: 2012-07-30 03:26+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -446,7 +445,7 @@ msgstr "Total crédito"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr ""
+msgstr "Abrir para romper conciliación"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -1612,7 +1611,7 @@ msgstr "Base Imponible"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr ""
+msgstr "Ir a la siguiente empresa"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2859,7 +2858,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax Codes"
-msgstr ""
+msgstr "Códigos de impuestos"
 
 #. module: account
 #: view:account.account:0
@@ -3229,7 +3228,7 @@ msgstr "Plantillas para el plan contable"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Configurar tu Contabilidad"
 
 #. module: account
 #: view:report.account.sales:0
@@ -4405,7 +4404,7 @@ msgstr "Reconcile Writeoff"
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by Type"
-msgstr ""
+msgstr "Cuentas por tipo"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4447,7 +4446,7 @@ msgstr "res_config_contents"
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate Transactions"
-msgstr ""
+msgstr "Transacciones no conciliadas"
 
 #. module: account
 #: help:account.chart.template,visible:0
@@ -4650,7 +4649,7 @@ msgstr "Fecha de realizacion"
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation Transactions"
-msgstr ""
+msgstr "Desconcialiación de Transacciones"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -4785,7 +4784,7 @@ msgstr "Pagado"
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure?"
-msgstr ""
+msgstr "¿Está Seguro?"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5183,7 +5182,7 @@ msgstr "Cuenta impuesto"
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation Result"
-msgstr ""
+msgstr "Resultado de conciliación"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
@@ -6173,7 +6172,7 @@ msgstr "Impuesto de venta(%)"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "Crear una cuenta basada en esta plantilla"
 
 #. module: account
 #: view:account.account.type:0
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
index 0aea9f1a44e..b9e3fc013a5 100644
--- a/addons/account_asset/i18n/es_EC.po
+++ b/addons/account_asset/i18n/es_EC.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-03-24 03:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-30 03:27+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -438,12 +438,12 @@ msgstr "Método de tiempo"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Información analítica"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Duraciones de activo para modificar"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -619,7 +619,7 @@ msgstr "Prorata Temporis"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Información Contable"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index 7eb7095729b..6b74bfa4910 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
-"X-Generator: Launchpad (build 15694)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po
index dd694f0ca6e..e8e510c183c 100644
--- a/addons/google_base_account/i18n/pt_BR.po
+++ b/addons/google_base_account/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-29 04:38+0000\n"
-"X-Generator: Launchpad (build 15694)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/lunch/i18n/nl.po b/addons/lunch/i18n/nl.po
new file mode 100644
index 00000000000..481e8a4f79a
--- /dev/null
+++ b/addons/lunch/i18n/nl.po
@@ -0,0 +1,552 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-07-29 09:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Reset cashbox"
+msgstr "Reset kas"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current year"
+msgstr "Kasbedrag in huidig jaar"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr "Lunch Orders"
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "Weet u zeker dat u deze order wilt annuleren?"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr "Kas mutaties"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0 view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Groepeer op.."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "Bevestig order"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 Dagen    "
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0
+msgid "Today"
+msgstr "Vandaag"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "March"
+msgstr "Maart"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Totaal :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0 view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel_values
+#: model:ir.model,name:lunch.model_lunch_order_cancel view:lunch.order:0
+#: view:lunch.order.cancel:0
+msgid "Cancel Order"
+msgstr "Annuleer order"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_create_cashbox
+msgid ""
+"You can create on cashbox by employee if you want to keep track of the "
+"amount due by employee according to what have been ordered."
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Bedrag"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form view:lunch.product:0
+msgid "Products"
+msgstr "Producten"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr "Bedrag beschikbaar per gebruiker en kas"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Maand   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "Lunch order analyses"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr "Kas muttatie"
+
+#. module: lunch
+#: view:lunch.order:0 selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "Bevestig"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "Zoek lunchorders"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "New"
+msgstr "Nieuw"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Totaalprijs"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "Aanmaakdatum"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "Naam/Datum"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "Order omschrijving"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in last month"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm_values
+#: view:lunch.order:0 view:lunch.order.confirm:0
+msgid "Confirm Order"
+msgstr "Bevestig Order"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.amount:0 view:report.lunch.order:0
+msgid "Box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365 Dagen  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    Maand-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "Aanmaakdatum"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " Product categorieën "
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Set to Zero"
+msgstr "Zet op nul"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr "Kas mutatie"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 365 days"
+msgstr "Taken uitgevoert de laatste 365 dagen"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "April"
+msgstr "April"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "September"
+msgstr "September"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "December"
+msgstr "December"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0 view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: lunch
+#: field:lunch.order.confirm,confirm_cashbox:0
+msgid "Name of box"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Yes"
+msgstr "Ja"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category view:lunch.category:0
+#: view:lunch.order:0 field:lunch.order,category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "Categorie"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  Jaar  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "Product categorieën"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0 view:lunch.order.cancel:0
+msgid "No"
+msgstr "Nee"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Orders Confirmation"
+msgstr "Order bevestigen"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.view_lunch_product_form_installer
+msgid ""
+"Define all products that the employees can order for the lunch time. If you "
+"order lunch at several places, you can use the product categories to split "
+"by supplier. It will be easier for the lunch manager to filter lunch orders "
+"by categories."
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "August"
+msgstr "Augustus"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "Lunch orders analyse"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0 field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0 field:report.lunch.order,user_id:0
+msgid "User Name"
+msgstr "Gebruikersnaam"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "Verkoopanalyse"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration
+msgid "Lunch"
+msgstr "Lunch"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.order:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "November"
+msgstr "November"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0 field:lunch.product,active:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "Orderdatum"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "General Information"
+msgstr "Algemene informatie"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Cancel"
+msgstr "Anulleren"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Unit Price"
+msgstr "Eenheidsprijs"
+
+#. module: lunch
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "Product"
+
+#. module: lunch
+#: field:lunch.cashmove,name:0 report:lunch.order:0 view:lunch.product:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "May"
+msgstr "Mei"
+
+#. module: lunch
+#: field:lunch.order,price:0 field:lunch.product,price:0
+msgid "Price"
+msgstr "Prijs"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "Lunch product"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "Totaal overgebleven"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "February"
+msgstr "Februari"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0 field:lunch.category,name:0
+#: field:lunch.product,name:0 field:report.lunch.order,box_name:0
+msgid "Name"
+msgstr "Naam"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "Totaalbedrag"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 30 days"
+msgstr "Taken uitgevoerd in de laatste 30 dagen"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category Related to Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0 report:lunch.order:0 view:lunch.order:0
+msgid "Order"
+msgstr "Order"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch report:lunch.order:0
+msgid "Lunch Order"
+msgstr "Luchorder"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current month"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer
+msgid "Define Your Lunch Products"
+msgstr "Definieer uw lunch producten"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks during last 7 days"
+msgstr "Taken afgelopen 7 dagen"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "Manager"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30 Dagen   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,year:0 view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr "Jaar"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_create_cashbox
+msgid "Create Lunch Cash Boxes"
+msgstr ""
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index 789202e6474..516ef990a6d 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -8,179 +8,183 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-16 01:36+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-07-30 00:28+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-03 05:54+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:59+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:170
-#: addons/web/static/src/js/chrome.js:196
-#: addons/web/static/src/js/chrome.js:364
-#: addons/web/static/src/js/view_form.js:531
-#: addons/web/static/src/js/view_form.js:1665
-#: addons/web/static/src/xml/base.xml:1641
+#: addons/web/static/src/js/chrome.js:176
+#: addons/web/static/src/js/chrome.js:202
+#: addons/web/static/src/js/chrome.js:380
+#: addons/web/static/src/js/view_form.js:457
+#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:178
+#: addons/web/static/src/js/chrome.js:184
 msgid "Send OpenERP Enterprise Report"
 msgstr "Enviar Relatório OpenERP Enterprise"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:192
+#: addons/web/static/src/js/chrome.js:198
 msgid "Dont send"
 msgstr "Não enviar"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:212
-#: addons/web/static/src/js/chrome.js:914
+#: addons/web/static/src/js/chrome.js:1119
 msgid "Client Error"
 msgstr "Erro no aplicativo cliente"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:253
+#: addons/web/static/src/js/chrome.js:260
 #, python-format
 msgid "Loading (%d)"
 msgstr "Carregando (%d)"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:276
+#: addons/web/static/src/js/chrome.js:292
 msgid "Invalid database name"
 msgstr "Nome de banco de dados inválido"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:402
+#: addons/web/static/src/js/chrome.js:455
 msgid "Backed"
 msgstr "Copiado"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:402
+#: addons/web/static/src/js/chrome.js:456
 msgid "Database backed up successfully"
 msgstr "Backup do banco de dado realizado com sucesso"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:442
+#: addons/web/static/src/js/chrome.js:499
 msgid "Restored"
 msgstr "Restaurado"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:442
+#: addons/web/static/src/js/chrome.js:499
 msgid "Database restored successfully"
 msgstr "Banco de dados restaurado com sucesso"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:735
-#: addons/web/static/src/xml/base.xml:259
-#: addons/web/static/src/xml/base.xml:367
+#: addons/web/static/src/js/chrome.js:783
+#: addons/web/static/src/xml/base.xml:226
+#: addons/web/static/src/xml/base.xml:1735
 msgid "Change Password"
 msgstr "Alterar Senha"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:809
-#: addons/web/static/src/xml/base.xml:326
+#: addons/web/static/src/js/chrome.js:759
+#: addons/web/static/src/xml/base.xml:356
 msgid "Preferences"
 msgstr "Preferências"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:812
+#: addons/web/static/src/js/chrome.js:763
 msgid "Change password"
 msgstr "Alterar Senha"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:813
-#: addons/web/static/src/js/view_editor.js:96
-#: addons/web/static/src/js/view_editor.js:832
-#: addons/web/static/src/js/view_editor.js:960
-#: addons/web/static/src/js/view_form.js:1660
-#: addons/web/static/src/xml/base.xml:1468
-#: addons/web/static/src/xml/base.xml:1478
+#: addons/web/static/src/js/chrome.js:762
+#: addons/web/static/src/js/search.js:241
+#: addons/web/static/src/js/search.js:300
+#: addons/web/static/src/js/view_editor.js:95
+#: addons/web/static/src/js/view_editor.js:836
+#: addons/web/static/src/js/view_editor.js:962
+#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/xml/base.xml:743
+#: addons/web/static/src/xml/base.xml:1502
+#: addons/web/static/src/xml/base.xml:1512
+#: addons/web/static/src/xml/base.xml:1521
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:814
-#: addons/web/static/src/js/view_editor.js:74
-#: addons/web/static/src/js/views.js:899 addons/web/static/src/xml/base.xml:687
-#: addons/web/static/src/xml/base.xml:1384
-#: addons/web/static/src/xml/base.xml:1472
+#: addons/web/static/src/js/chrome.js:764
+#: addons/web/static/src/js/view_editor.js:73
+#: addons/web/static/src/js/views.js:967 addons/web/static/src/xml/base.xml:742
+#: addons/web/static/src/xml/base.xml:1506
+#: addons/web/static/src/xml/base.xml:1520
 msgid "Save"
 msgstr "Salvar"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:839
+#: addons/web/static/src/js/chrome.js:680
+#: addons/web/static/src/xml/base.xml:359
 msgid "About"
 msgstr "Sobre"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:856
+#: addons/web/static/src/js/chrome.js:1052
 msgid "OpenERP - Unsupported/Community Version"
-msgstr "OpenERP - Versão da Comunidade/Não Suportada"
+msgstr "Versão da Comunidade - Sem suporte oficial da OpenERP S/A"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:619
 msgid "less than a minute ago"
-msgstr ""
+msgstr "menos de um minuto atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:620
 msgid "about a minute ago"
-msgstr ""
+msgstr "por volta de um minuto atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minutos atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:622
 msgid "about an hour ago"
-msgstr ""
+msgstr "por volta de uma hora atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:623
 #, python-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d horas atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:624
 msgid "a day ago"
-msgstr ""
+msgstr "há um dia"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:625
 #, python-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d dias atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:626
 msgid "about a month ago"
-msgstr ""
+msgstr "por volta de um mês atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:627
 #, python-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%d meses atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:628
 msgid "about a year ago"
-msgstr ""
+msgstr "por volta de um ano atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:629
 #, python-format
 msgid "%d years ago"
-msgstr ""
+msgstr "%d anos atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:6
@@ -191,10 +195,10 @@ msgstr "Exportar Dados"
 #: addons/web/static/src/js/data_export.js:19
 #: addons/web/static/src/js/data_import.js:70
 #: addons/web/static/src/js/view_editor.js:49
-#: addons/web/static/src/js/view_editor.js:399
-#: addons/web/static/src/js/view_form.js:891
-#: addons/web/static/src/js/view_form.js:3901
-#: addons/web/static/src/js/views.js:900
+#: addons/web/static/src/js/view_editor.js:398
+#: addons/web/static/src/js/view_form.js:734
+#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Fechar"
 
@@ -204,17 +208,17 @@ msgid "Export To File"
 msgstr "Exportar para Arquivo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:125
+#: addons/web/static/src/js/data_export.js:126
 msgid "Please enter save field list name"
 msgstr "Por favor, entre o nome da lista de campos salva"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:360
+#: addons/web/static/src/js/data_export.js:362
 msgid "Please select fields to save export list..."
 msgstr "Por favor, selecione os campos para salvar na lista de exportação"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:373
+#: addons/web/static/src/js/data_export.js:375
 msgid "Please select fields to export..."
 msgstr "Por favor, selecione os campos para exportar..."
 
@@ -239,42 +243,44 @@ msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
+"Campos de destino devem ser selecionados apenas uma vez, alguns campos foram "
+"selecionados mais de uma vez:"
 
 #. openerp-web
 #: addons/web/static/src/js/data_import.js:383
 msgid "*Required Fields are not selected :"
-msgstr ""
+msgstr "*Campos Obrigatórios não selecionados :"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:141
+#: addons/web/static/src/js/formats.js:139
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "(%d registos)"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:327
-#: addons/web/static/src/js/view_form.js:4301
+#: addons/web/static/src/js/formats.js:325
+#: addons/web/static/src/js/view_page.js:268
 msgid "Download"
 msgstr "Download"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:332
+#: addons/web/static/src/js/formats.js:330
 #, python-format
 msgid "Download \"%s\""
 msgstr "Download \"%s\""
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:798
+#: addons/web/static/src/js/search.js:437
 msgid "Invalid Search"
 msgstr "Pesquisa Inválida"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:798
+#: addons/web/static/src/js/search.js:437
 msgid "triggered from search view"
 msgstr "desencadeada a partir da visão de busca"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:839
+#: addons/web/static/src/js/search.js:528
 #, python-format
 msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
 msgstr "Valor incorreto para campo %(fieldname)s: [%(value)s] é %(message)s"
@@ -283,48 +289,48 @@ msgstr "Valor incorreto para campo %(fieldname)s: [%(value)s] é %(message)s"
 #: addons/web/static/src/js/search.js:948
 #, python-format
 msgid "Filter on: %s"
-msgstr ""
+msgstr "Filtrar por: %s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:999
 msgid "Filter"
-msgstr ""
+msgstr "Filtrar"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1108
 #, python-format
 msgid "Group by: %s"
-msgstr ""
+msgstr "Agrupar por: %s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1132
 msgid "GroupBy"
-msgstr ""
+msgstr "AgruparPor"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1267
 #, python-format
 msgid "Search %(field)s for: %(value)s"
-msgstr ""
+msgstr "Procurar %(field)s por: %(value)s"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1301
+#: addons/web/static/src/js/search.js:869
 msgid "not a valid integer"
 msgstr "não é um número inteiro válido"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1315
+#: addons/web/static/src/js/search.js:883
 msgid "not a valid number"
 msgstr "não é um número válido"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1398
-#: addons/web/static/src/xml/base.xml:840
+#: addons/web/static/src/js/search.js:962
+#: addons/web/static/src/xml/base.xml:973
 msgid "Yes"
 msgstr "Sim"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1399
+#: addons/web/static/src/js/search.js:963
 msgid "No"
 msgstr "Não"
 
@@ -332,97 +338,106 @@ msgstr "Não"
 #: addons/web/static/src/js/search.js:1416
 #, python-format
 msgid "Search %(field)s at: %(value)s"
-msgstr ""
+msgstr "Procurar %(field)s em: %(value)s"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1622
-#: addons/web/static/src/xml/base.xml:1229
+#: addons/web/static/src/xml/base.xml:1286
 msgid "Filters"
 msgstr "Filtros"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1762
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1853
 #, python-format
 msgid "%(field)s %(operator)s \"%(value)s\""
-msgstr ""
+msgstr "%(field)s %(operator)s \"%(value)s\""
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1888
+#: addons/web/static/src/js/search.js:1341
 msgid "contains"
 msgstr "contém"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1889
+#: addons/web/static/src/js/search.js:1342
 msgid "doesn't contain"
 msgstr "não contém"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1890
-#: addons/web/static/src/js/search.js:1900
-#: addons/web/static/src/js/search.js:1928
-#: addons/web/static/src/js/search.js:1952
+#: addons/web/static/src/js/search.js:1343
+#: addons/web/static/src/js/search.js:1359
+#: addons/web/static/src/js/search.js:1380
+#: addons/web/static/src/js/search.js:1401
+#: addons/web/static/src/js/search.js:1424
 msgid "is equal to"
 msgstr "é igual a"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1891
-#: addons/web/static/src/js/search.js:1901
-#: addons/web/static/src/js/search.js:1929
-#: addons/web/static/src/js/search.js:1953
+#: addons/web/static/src/js/search.js:1344
+#: addons/web/static/src/js/search.js:1360
+#: addons/web/static/src/js/search.js:1381
+#: addons/web/static/src/js/search.js:1402
+#: addons/web/static/src/js/search.js:1425
 msgid "is not equal to"
 msgstr "é diferente de"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1902
-#: addons/web/static/src/js/search.js:1930
-#: addons/web/static/src/js/search.js:1954
+#: addons/web/static/src/js/search.js:1345
+#: addons/web/static/src/js/search.js:1361
+#: addons/web/static/src/js/search.js:1382
+#: addons/web/static/src/js/search.js:1403
+#: addons/web/static/src/js/search.js:1426
 msgid "greater than"
 msgstr "maior que"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1903
-#: addons/web/static/src/js/search.js:1931
-#: addons/web/static/src/js/search.js:1955
+#: addons/web/static/src/js/search.js:1346
+#: addons/web/static/src/js/search.js:1362
+#: addons/web/static/src/js/search.js:1383
+#: addons/web/static/src/js/search.js:1404
+#: addons/web/static/src/js/search.js:1427
 msgid "less than"
 msgstr "menor que"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1904
-#: addons/web/static/src/js/search.js:1932
-#: addons/web/static/src/js/search.js:1956
+#: addons/web/static/src/js/search.js:1347
+#: addons/web/static/src/js/search.js:1363
+#: addons/web/static/src/js/search.js:1384
+#: addons/web/static/src/js/search.js:1405
+#: addons/web/static/src/js/search.js:1428
 msgid "greater or equal than"
 msgstr "maior ou igual a"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1905
-#: addons/web/static/src/js/search.js:1933
-#: addons/web/static/src/js/search.js:1957
+#: addons/web/static/src/js/search.js:1348
+#: addons/web/static/src/js/search.js:1364
+#: addons/web/static/src/js/search.js:1385
+#: addons/web/static/src/js/search.js:1406
+#: addons/web/static/src/js/search.js:1429
 msgid "less or equal than"
 msgstr "menor ou igual a"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1947
-#: addons/web/static/src/js/search.js:1973
+#: addons/web/static/src/js/search.js:1419
+#: addons/web/static/src/js/search.js:1444
 msgid "is"
 msgstr "é"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1974
+#: addons/web/static/src/js/search.js:1445
 msgid "is not"
 msgstr "não é"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1988
+#: addons/web/static/src/js/search.js:1459
 msgid "is true"
 msgstr "é verdadeiro"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1989
+#: addons/web/static/src/js/search.js:1460
 msgid "is false"
 msgstr "é falso"
 
@@ -435,195 +450,194 @@ msgstr "Administrar Visões (%s)"
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:46
 #: addons/web/static/src/js/view_list.js:17
-#: addons/web/static/src/xml/base.xml:121
-#: addons/web/static/src/xml/base.xml:164
-#: addons/web/static/src/xml/base.xml:684
+#: addons/web/static/src/xml/base.xml:100
+#: addons/web/static/src/xml/base.xml:327
+#: addons/web/static/src/xml/base.xml:761
 msgid "Create"
 msgstr "Criar"
 
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:47
-#: addons/web/static/src/xml/base.xml:456
-#: addons/web/static/src/xml/base.xml:683
+#: addons/web/static/src/xml/base.xml:483
+#: addons/web/static/src/xml/base.xml:760
 msgid "Edit"
 msgstr "Editar"
 
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:48
-#: addons/web/static/src/xml/base.xml:1595
+#: addons/web/static/src/xml/base.xml:1653
 msgid "Remove"
 msgstr "Remover"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:72
+#: addons/web/static/src/js/view_editor.js:71
 #, python-format
 msgid "Create a view (%s)"
 msgstr "Criar a visão (%s)"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:169
+#: addons/web/static/src/js/view_editor.js:168
 msgid "Do you really want to remove this view?"
 msgstr "Deseja remover essa visão?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:365
+#: addons/web/static/src/js/view_editor.js:364
 #, python-format
 msgid "View Editor %d - %s"
 msgstr "Editar Visão %d - %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:368
+#: addons/web/static/src/js/view_editor.js:367
 msgid "Inherited View"
 msgstr "View herdada"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:372
+#: addons/web/static/src/js/view_editor.js:371
 msgid "Do you really wants to create an inherited view here?"
 msgstr "Quer realmente criar uma view herdada aqui?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:382
+#: addons/web/static/src/js/view_editor.js:381
 msgid "Preview"
 msgstr "Pré-visualizar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:502
+#: addons/web/static/src/js/view_editor.js:501
 msgid "Do you really want to remove this node?"
 msgstr "Deseja remover esse nó?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:811
-#: addons/web/static/src/js/view_editor.js:937
+#: addons/web/static/src/js/view_editor.js:815
+#: addons/web/static/src/js/view_editor.js:939
 msgid "Properties"
 msgstr "Propriedades"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:814
-#: addons/web/static/src/js/view_editor.js:940
+#: addons/web/static/src/js/view_editor.js:818
+#: addons/web/static/src/js/view_editor.js:942
 msgid "Update"
 msgstr "Atualizar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:43
+#: addons/web/static/src/js/view_form.js:16
+#: addons/web/static/src/js/view_form.js:210
 msgid "Form"
 msgstr "Formulário"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:147
-#: addons/web/static/src/js/view_list.js:358
-#: addons/web/static/src/xml/base.xml:1653
+#: addons/web/static/src/xml/base.xml:632
+#: addons/web/static/src/xml/base.xml:763
+#: addons/web/static/src/xml/base.xml:1714
 msgid "Delete"
 msgstr "Excluir"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:148
+#: addons/web/static/src/xml/base.xml:762
 msgid "Duplicate"
 msgstr "Duplicar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:149
-#: addons/web/static/src/js/view_form.js:885
+#: addons/web/static/src/js/view_form.js:133
+#: addons/web/static/src/js/view_form.js:728
 msgid "Set Default"
 msgstr "Definir como Padrão"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:643
+#: addons/web/static/src/js/view_page.js:59
 msgid "Do you really want to delete this record?"
 msgstr "Deseja remover esse registro?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:657
+#: addons/web/static/src/js/view_form.js:508
 msgid ""
 "Warning, the record has been modified, your changes will be discarded."
 msgstr "Aviso, o registro foi modificado, suas alterações serão descartadas."
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:892
+#: addons/web/static/src/js/view_form.js:735
 msgid "Save default"
 msgstr "Salvar padrão"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1402
+#: addons/web/static/src/js/view_form.js:867
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconhecido %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1410
+#: addons/web/static/src/js/view_form.js:875
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo desconhecido %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1448
+#: addons/web/static/src/js/view_form.js:913
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador não suportado %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1657
+#: addons/web/static/src/js/view_form.js:1284
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2478
+#: addons/web/static/src/js/view_form.js:2193
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Procurar Mais...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2488
+#: addons/web/static/src/js/view_form.js:2211
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Criar \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2494
+#: addons/web/static/src/js/view_form.js:2217
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Criar e Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2527
+#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Pesquisar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2527
-#: addons/web/static/src/js/view_form.js:3210
+#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2738
 msgid "Create: "
 msgstr "Criar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2596
-#: addons/web/static/src/js/view_form.js:3125
-#: addons/web/static/src/js/view_form.js:3238
-#: addons/web/static/src/js/view_form.js:3586
-#: addons/web/static/src/js/view_form.js:3702
+#: addons/web/static/src/js/view_form.js:2040
+#: addons/web/static/src/js/view_form.js:2766
+#: addons/web/static/src/js/view_form.js:2991
 msgid "Open: "
 msgstr "Aberto: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:3517
-#: addons/web/static/src/js/view_form.js:3644
-#: addons/web/static/src/xml/base.xml:1184
-#: addons/web/static/src/xml/base.xml:1594
+#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/xml/base.xml:755
+#: addons/web/static/src/xml/base.xml:777
+#: addons/web/static/src/xml/base.xml:1652
 msgid "Add"
 msgstr "Adicionar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:3566
-#: addons/web/static/src/js/view_form.js:3684
+#: addons/web/static/src/js/view_form.js:2971
 msgid "Add: "
 msgstr "Adicionar: "
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:4230
 msgid "Save As..."
-msgstr ""
+msgstr "Salvar como..."
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:4230
 msgid "The field is empty, there's nothing to save !"
-msgstr ""
+msgstr "O campo está vazio, não tem nada para salvar!"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:8
@@ -631,51 +645,49 @@ msgid "List"
 msgstr "Lista"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:338
+#: addons/web/static/src/js/view_list.js:277
 msgid "Unlimited"
 msgstr "Ilimitado"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:356
-#: addons/web/static/src/xml/base.xml:622
-#: addons/web/static/src/xml/base.xml:1657
+#: addons/web/static/src/js/views.js:819
+#: addons/web/static/src/xml/base.xml:1742
 msgid "Import"
 msgstr "Importar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:357
-#: addons/web/static/src/xml/base.xml:1554
+#: addons/web/static/src/js/views.js:822
+#: addons/web/static/src/xml/base.xml:1612
 msgid "Export"
 msgstr "Exportar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:436
+#: addons/web/static/src/js/view_list.js:374
 msgid "Group"
 msgstr "Grupo"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:623
+#: addons/web/static/src/js/view_list.js:549
 msgid "Do you really want to remove these records?"
 msgstr "Deseja remover esse registro?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:716
-#: addons/web/static/src/js/views.js:820
+#: addons/web/static/src/js/views.js:925
 msgid "Warning"
 msgstr "Atenção"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:716
 msgid "You must select at least one record."
-msgstr ""
+msgstr "Você precisa selecionar ao menos um registro."
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:1332
+#: addons/web/static/src/js/view_list.js:1243
 msgid "Undefined"
 msgstr "Indefinida"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:1428
+#: addons/web/static/src/js/view_list.js:1342
 #, python-format
 msgid "%(page)d/%(page_count)d"
 msgstr "%(page)d/%(page_count)d"
@@ -686,84 +698,84 @@ msgid "Tree"
 msgstr "Árvore"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:566 addons/web/static/src/xml/base.xml:452
+#: addons/web/static/src/js/views.js:570 addons/web/static/src/xml/base.xml:480
 msgid "Fields View Get"
 msgstr "Fields View Get"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:574
+#: addons/web/static/src/js/views.js:578
 #, python-format
 msgid "View Log (%s)"
 msgstr "Ver o Log (%s)"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:604
+#: addons/web/static/src/js/views.js:605
 #, python-format
 msgid "Model %s fields"
 msgstr "Modelo %s campos"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:614 addons/web/static/src/xml/base.xml:455
+#: addons/web/static/src/js/views.js:615 addons/web/static/src/xml/base.xml:482
 msgid "Manage Views"
 msgstr "Administrar Visões"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:615
+#: addons/web/static/src/js/views.js:616
 msgid "Could not find current view declaration"
 msgstr "Não foi possível encontrar a declaração da visão atual"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:716
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:717
 msgid "Attachment"
-msgstr ""
+msgstr "Anexo"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:718 addons/web/static/src/xml/base.xml:276
 msgid "More"
-msgstr ""
+msgstr "Mais"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:726
+#: addons/web/static/src/js/views.js:810
 msgid "Translate"
 msgstr "Traduzir"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:726
+#: addons/web/static/src/js/views.js:812
 msgid "Technical translation"
 msgstr "Tradução Técnica"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:820
+#: addons/web/static/src/js/views.js:924
 msgid "You must choose at least one record."
 msgstr "Você deve escolher pelo menos um registro."
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:875
 msgid "Uploading..."
-msgstr ""
+msgstr "Enviando..."
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:885
 msgid "Do you really want to delete this attachment ?"
-msgstr ""
+msgstr "Você deseja excluir este anexo?"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:894
+#: addons/web/static/src/js/views.js:962
 msgid "Translations"
 msgstr "Traduções"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:9
+#: addons/web/static/src/xml/base.xml:52
 msgid "Loading..."
 msgstr "Carregando..."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:48
+#: addons/web/static/src/xml/base.xml:251
 msgid ""
 "Your version of OpenERP is unsupported. Support & maintenance services are "
 "available here:"
@@ -772,265 +784,266 @@ msgstr ""
 "disponíveis aqui:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:48
+#: addons/web/static/src/xml/base.xml:251
 msgid "OpenERP Entreprise"
 msgstr "OpenERP Entreprise"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:53
+#: addons/web/static/src/xml/base.xml:256
 msgid "OpenERP Enterprise Contract."
 msgstr "Contrato Corporativo OpenERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:54
+#: addons/web/static/src/xml/base.xml:257
 msgid "Your report will be sent to the OpenERP Enterprise team."
 msgstr "Seu relatório será enviado à equipe do OpenERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:56
+#: addons/web/static/src/xml/base.xml:259
 msgid "Summary:"
 msgstr "Resumo:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:60
+#: addons/web/static/src/xml/base.xml:263
 msgid "Description:"
 msgstr "Descrição :"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:64
+#: addons/web/static/src/xml/base.xml:267
 msgid "What you did:"
 msgstr "O que você fez:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:80
+#: addons/web/static/src/xml/base.xml:297
 msgid "Invalid username or password"
 msgstr "Nome de usuário ou senha inválidos"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:84 addons/web/static/src/xml/base.xml:174
-#: addons/web/static/src/xml/base.xml:200
+#: addons/web/static/src/xml/base.xml:116
+#: addons/web/static/src/xml/base.xml:150
+#: addons/web/static/src/xml/base.xml:301
 msgid "Database:"
 msgstr "Banco de Dados:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:89
+#: addons/web/static/src/xml/base.xml:306
 msgid "Username"
 msgstr "Nome do usuário"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:91 addons/web/static/src/xml/base.xml:125
+#: addons/web/static/src/xml/base.xml:308
+#: addons/web/static/src/xml/base.xml:331
 msgid "Password"
 msgstr "Senha"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:93
+#: addons/web/static/src/xml/base.xml:310
 msgid "Log in"
 msgstr "Autenticar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:97
+#: addons/web/static/src/xml/base.xml:314
 msgid "Manage Databases"
 msgstr "Administrar bancos de dados"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:389
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
 msgid "Powered by"
 msgstr "Desenvolvido Por"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:334
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:1819
 msgid "OpenERP"
 msgstr "OpenERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:122
-#: addons/web/static/src/xml/base.xml:189
+#: addons/web/static/src/xml/base.xml:132
+#: addons/web/static/src/xml/base.xml:328
 msgid "Drop"
 msgstr "Soltar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:123
-#: addons/web/static/src/xml/base.xml:215
+#: addons/web/static/src/xml/base.xml:166
+#: addons/web/static/src/xml/base.xml:329
 msgid "Backup"
 msgstr "Cópia de Segurança"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:124
-#: addons/web/static/src/xml/base.xml:237
+#: addons/web/static/src/xml/base.xml:195
+#: addons/web/static/src/xml/base.xml:330
 msgid "Restore"
 msgstr "Restaurar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:126
+#: addons/web/static/src/xml/base.xml:332
 msgid "Back to Login"
 msgstr "Voltar ao Login"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:131
+#: addons/web/static/src/xml/base.xml:61
 msgid "CREATE DATABASE"
 msgstr "CRIAR BANCO DE DADOS"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:134
-#: addons/web/static/src/xml/base.xml:247
+#: addons/web/static/src/xml/base.xml:68 addons/web/static/src/xml/base.xml:211
 msgid "Master password:"
 msgstr "Senha Super Admin:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:138
-#: addons/web/static/src/xml/base.xml:233
+#: addons/web/static/src/xml/base.xml:72 addons/web/static/src/xml/base.xml:191
 msgid "New database name:"
 msgstr "Nome do Novo banco de dados:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:142
+#: addons/web/static/src/xml/base.xml:77
 msgid "Load Demonstration data:"
 msgstr "Carregar dados de demonstração:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:146
+#: addons/web/static/src/xml/base.xml:81
 msgid "Default language:"
 msgstr "Idioma padrão:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:156
+#: addons/web/static/src/xml/base.xml:91
 msgid "Admin password:"
 msgstr "Senha do Administrador"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:160
+#: addons/web/static/src/xml/base.xml:95
 msgid "Confirm password:"
 msgstr "Confirmar Senha:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:171
+#: addons/web/static/src/xml/base.xml:109
 msgid "DROP DATABASE"
 msgstr "EXCLUIR BANCO DE DADOS"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:185
-#: addons/web/static/src/xml/base.xml:211
-#: addons/web/static/src/xml/base.xml:229
+#: addons/web/static/src/xml/base.xml:128
+#: addons/web/static/src/xml/base.xml:162
+#: addons/web/static/src/xml/base.xml:187
 msgid "Master Password:"
 msgstr "Senha do Super Admin"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:197
+#: addons/web/static/src/xml/base.xml:143
 msgid "BACKUP DATABASE"
 msgstr "BACKUP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:222
+#: addons/web/static/src/xml/base.xml:175
 msgid "RESTORE DATABASE"
 msgstr "RESTAURAR BANCO DE DADOS"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:225
+#: addons/web/static/src/xml/base.xml:182
 msgid "File:"
 msgstr "Arquivo:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:244
+#: addons/web/static/src/xml/base.xml:204
 msgid "CHANGE MASTER PASSWORD"
 msgstr "ALTERAR SENHA DO SUPER ADMIN"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:251
+#: addons/web/static/src/xml/base.xml:216
 msgid "New master password:"
 msgstr "Nova Senha do Super Admin:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:255
+#: addons/web/static/src/xml/base.xml:221
 msgid "Confirm new master password:"
 msgstr "Confirme a Senha do Super Admin:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:325
 msgid "About OpenERP"
-msgstr ""
+msgstr "Sobre OpenERP"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:327
 msgid "Log out"
-msgstr ""
+msgstr "Sair"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:333
 msgid "Activate the developer mode"
-msgstr ""
+msgstr "Ativar o modo de desenvolvedor"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:335
+#: addons/web/static/src/xml/base.xml:1820
 msgid "Version"
 msgstr "Versão"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:336
+#: addons/web/static/src/xml/base.xml:1821
 msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
 msgstr "Copyright © 2004-HOJE OpenERP SA. Alguns Direitos Reservados."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:337
+#: addons/web/static/src/xml/base.xml:1822
 msgid "OpenERP is a trademark of the"
 msgstr "OpenERP é uma marca de"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:338
+#: addons/web/static/src/xml/base.xml:1823
 msgid "OpenERP SA Company"
 msgstr "Empresa OpenERP SA"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:340
+#: addons/web/static/src/xml/base.xml:1825
 msgid "Licenced under the terms of"
 msgstr "Licenciado sobre os termos de"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:341
+#: addons/web/static/src/xml/base.xml:1826
 msgid "GNU Affero General Public License"
 msgstr "Licença Pública Geral GNU Affero"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:343
+#: addons/web/static/src/xml/base.xml:1828
 msgid "For more information visit"
 msgstr "Para mais informações visite"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:344
+#: addons/web/static/src/xml/base.xml:1829
 msgid "OpenERP.com"
 msgstr "OpenERP.com"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:352
+#: addons/web/static/src/xml/base.xml:1720
 msgid "Old Password:"
 msgstr "Senha Anterior"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:357
+#: addons/web/static/src/xml/base.xml:1725
 msgid "New Password:"
 msgstr "Nova Senha"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:362
+#: addons/web/static/src/xml/base.xml:1730
 msgid "Confirm Password:"
 msgstr "Confirmar Senha:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
 msgid "ERP"
-msgstr ""
+msgstr "ERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:448
+#: addons/web/static/src/xml/base.xml:477
 msgid "Debug View#"
 msgstr "Visão de Depuração#"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:449
+#: addons/web/static/src/xml/base.xml:478
 msgid "View Log (perm_read)"
 msgstr "Visualiza Log (perm_read)"
 
@@ -1040,70 +1053,69 @@ msgid "Toggle Form Layout Outline"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:451
+#: addons/web/static/src/xml/base.xml:479
 msgid "View Fields"
 msgstr "Visualiza Campos"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:453
-#: addons/web/static/src/xml/base.xml:1242
+#: addons/web/static/src/xml/base.xml:1300
 msgid "Manage Filters"
 msgstr "Gerenciar Filtros"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:456
+#: addons/web/static/src/xml/base.xml:483
 msgid "View"
 msgstr "Visão"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:457
+#: addons/web/static/src/xml/base.xml:484
 msgid "Edit SearchView"
 msgstr "Editar Busca"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:458
+#: addons/web/static/src/xml/base.xml:485
 msgid "Edit Action"
 msgstr "Editar Ação"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:459
+#: addons/web/static/src/xml/base.xml:486
 msgid "Edit Workflow"
 msgstr "Editar Workflow"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:464
+#: addons/web/static/src/xml/base.xml:491
 msgid "ID:"
 msgstr "ID:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:467
+#: addons/web/static/src/xml/base.xml:494
 msgid "XML ID:"
 msgstr "ID XML:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:470
+#: addons/web/static/src/xml/base.xml:497
 msgid "Creation User:"
 msgstr "Usuário de criação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:473
+#: addons/web/static/src/xml/base.xml:500
 msgid "Creation Date:"
 msgstr "Data de Criação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:476
+#: addons/web/static/src/xml/base.xml:503
 msgid "Latest Modification by:"
 msgstr "Última Modificação por:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:479
+#: addons/web/static/src/xml/base.xml:506
 msgid "Latest Modification Date:"
 msgstr "Data da Última Modificação:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:518
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Excluir este anexo"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:523
@@ -1113,297 +1125,301 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:527
 msgid "Add..."
-msgstr ""
+msgstr "Adicionar..."
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:622
 #: addons/web/static/src/xml/base.xml:687
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:687
 msgid "Discard"
-msgstr ""
+msgstr "Descartar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:704
+#: addons/web/static/src/xml/base.xml:806
 msgid "Default:"
 msgstr "Padrão:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:721
+#: addons/web/static/src/xml/base.xml:823
 msgid "Condition:"
 msgstr "Condição:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:740
+#: addons/web/static/src/xml/base.xml:842
 msgid "Only you"
 msgstr "Somente voce"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:747
+#: addons/web/static/src/xml/base.xml:849
 msgid "All users"
 msgstr "Todos os usuários"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:797
+#: addons/web/static/src/xml/base.xml:856
 msgid "Unhandled widget"
 msgstr "Widget não utilizado"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:803
+#: addons/web/static/src/xml/base.xml:936
 msgid "(nolabel)"
 msgstr "(nolabel)"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:808
+#: addons/web/static/src/xml/base.xml:941
 msgid "Field:"
 msgstr "Campo:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:812
+#: addons/web/static/src/xml/base.xml:945
 msgid "Object:"
 msgstr "Objeto:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:816
+#: addons/web/static/src/xml/base.xml:949
 msgid "Type:"
 msgstr "Tipo:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:820
+#: addons/web/static/src/xml/base.xml:953
 msgid "Widget:"
 msgstr "Componente:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:824
+#: addons/web/static/src/xml/base.xml:957
 msgid "Size:"
 msgstr "Tamanho:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:828
+#: addons/web/static/src/xml/base.xml:961
 msgid "Context:"
 msgstr "Contexto:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:832
+#: addons/web/static/src/xml/base.xml:965
 msgid "Domain:"
 msgstr "Domínio:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:836
+#: addons/web/static/src/xml/base.xml:910
+#: addons/web/static/src/xml/base.xml:969
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:840
+#: addons/web/static/src/xml/base.xml:973
 msgid "Change default:"
 msgstr "Trocar padrão"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:844
+#: addons/web/static/src/xml/base.xml:977
 msgid "On change:"
 msgstr "Ao alterar:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:848
+#: addons/web/static/src/xml/base.xml:981
 msgid "Relation:"
 msgstr "Relação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:852
+#: addons/web/static/src/xml/base.xml:985
 msgid "Selection:"
 msgstr "Seleção:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:895
+#: addons/web/static/src/xml/base.xml:1040
 msgid "Open this resource"
 msgstr "Abrir este recurso"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:922
+#: addons/web/static/src/xml/base.xml:1063
 msgid "Select date"
 msgstr "Data selecionada"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:948
 msgid "Open Resource"
-msgstr ""
+msgstr "Abrir Recurso"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1026
-#: addons/web/static/src/xml/base.xml:1067
+#: addons/web/static/src/xml/base.xml:1162
+#: addons/web/static/src/xml/base.xml:1205
 msgid "Set Image"
 msgstr "Definir Imagem"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1030
-#: addons/web/static/src/xml/base.xml:1082
-#: addons/web/static/src/xml/base.xml:1084
+#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/xml/base.xml:1170
+#: addons/web/static/src/xml/base.xml:1220
+#: addons/web/static/src/xml/base.xml:1222
+#: addons/web/static/src/xml/base.xml:1279
 msgid "Clear"
 msgstr "Limpar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1035
-#: addons/web/static/src/xml/base.xml:1092
+#: addons/web/static/src/xml/base.xml:1179
+#: addons/web/static/src/xml/base.xml:1230
 msgid "Uploading ..."
 msgstr "Tranferindo..."
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1066
 msgid "width: 83px;"
-msgstr ""
+msgstr "largura: 83px;"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1069
-#: addons/web/static/src/xml/base.xml:1467
+#: addons/web/static/src/xml/base.xml:1207
+#: addons/web/static/src/xml/base.xml:1501
 msgid "Select"
 msgstr "Selecionar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1075
-#: addons/web/static/src/xml/base.xml:1077
+#: addons/web/static/src/xml/base.xml:1214
+#: addons/web/static/src/xml/base.xml:1216
 msgid "Save As"
 msgstr "Salvar Como"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1126
+#: addons/web/static/src/xml/base.xml:1245
 msgid "Button"
 msgstr "Botão"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1129
+#: addons/web/static/src/xml/base.xml:1248
 msgid "(no string)"
 msgstr "(sem string)"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1136
+#: addons/web/static/src/xml/base.xml:1255
 msgid "Special:"
 msgstr "Especial:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1141
+#: addons/web/static/src/xml/base.xml:1260
 msgid "Button Type:"
 msgstr "Tipo do Botão:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1145
+#: addons/web/static/src/xml/base.xml:1264
 msgid "Method:"
 msgstr "Método:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1149
+#: addons/web/static/src/xml/base.xml:1268
 msgid "Action ID:"
 msgstr "ID da Ação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1159
+#: addons/web/static/src/xml/base.xml:542
 msgid "Field"
 msgstr "Campo"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1205
 msgid "Advanced Search..."
-msgstr ""
+msgstr "Busca Avançada..."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1230
+#: addons/web/static/src/xml/base.xml:1287
 msgid "-- Filters --"
 msgstr "-- Filtros --"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1239
+#: addons/web/static/src/xml/base.xml:1296
 msgid "-- Actions --"
 msgstr "-- Ações --"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1240
+#: addons/web/static/src/xml/base.xml:1297
 msgid "Add Advanced Filter"
 msgstr "Adiciona Filtro Avançado"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1241
+#: addons/web/static/src/xml/base.xml:1298
 msgid "Save Filter"
 msgstr "Salvar Filtro"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1247
+#: addons/web/static/src/xml/base.xml:1305
 msgid "Filter Name:"
 msgstr "Nome do Filtro"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1249
+#: addons/web/static/src/xml/base.xml:1307
 msgid "(Any existing filter with the same name will be replaced)"
 msgstr "(Qualquer filtro existente com o mesmo nome será substituído)"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1376
 msgid "Custom Filters"
-msgstr ""
+msgstr "Filtros personalizados"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1379
 msgid "Save current filter"
-msgstr ""
+msgstr "Salvar o filtro atual"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1381
 msgid "Filter name"
-msgstr ""
+msgstr "Nome do filtro"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1383
 msgid "Share with all users"
-msgstr ""
+msgstr "Compartilhar com todos os usuários"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1392
+#: addons/web/static/src/js/search.js:298
+#: addons/web/static/src/xml/base.xml:1299
 msgid "Add to Dashboard"
 msgstr "Adicionar ao Painel"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1394
 msgid "Title of new Dashboard item"
-msgstr ""
+msgstr "Título do novo item do painel"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1395
 msgid "save"
-msgstr ""
+msgstr "salvar"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1399
 msgid "Select Dashboard to add this filter to"
-msgstr ""
+msgstr "Escolha o Painel para adicionar este filtro"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1406
 msgid "Advanced Search"
-msgstr ""
+msgstr "Busca Avançada"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1411
 msgid "Add a condition"
-msgstr ""
+msgstr "Adicionar uma condição"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1412
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1475
+#: addons/web/static/src/xml/base.xml:1509
 msgid "Save & New"
 msgstr "Salvar & Novo"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1476
+#: addons/web/static/src/xml/base.xml:1510
 msgid "Save & Close"
 msgstr "Salvar & Fechar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1559
+#: addons/web/static/src/xml/base.xml:1617
 msgid ""
 "This wizard will export all data that matches the current search criteria to "
 "a CSV file.\n"
@@ -1416,67 +1432,67 @@ msgstr ""
 "ser reimportados após a modificação."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1566
+#: addons/web/static/src/xml/base.xml:1624
 msgid "Export Type:"
 msgstr "Tipo de Exportação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1568
+#: addons/web/static/src/xml/base.xml:1626
 msgid "Import Compatible Export"
 msgstr "Importar Exportação Compatível"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1569
+#: addons/web/static/src/xml/base.xml:1627
 msgid "Export all Data"
 msgstr "Exportar todos os Dados"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1572
+#: addons/web/static/src/xml/base.xml:1630
 msgid "Export Formats"
 msgstr "Formatos de Exportação"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1578
+#: addons/web/static/src/xml/base.xml:1636
 msgid "Available fields"
 msgstr "Campos Disponíveis"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1580
+#: addons/web/static/src/xml/base.xml:1638
 msgid "Fields to export"
 msgstr "Campos para exportar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1582
+#: addons/web/static/src/xml/base.xml:1640
 msgid "Save fields list"
 msgstr "Salvar lista de campos"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1596
+#: addons/web/static/src/xml/base.xml:1654
 msgid "Remove All"
 msgstr "Remover Tudo"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1607
+#: addons/web/static/src/xml/base.xml:1666
 msgid "Name"
 msgstr "Nome"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1639
+#: addons/web/static/src/xml/base.xml:1699
 msgid "Save as:"
 msgstr "Salvar como:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1645
+#: addons/web/static/src/xml/base.xml:1706
 msgid "Saved exports:"
 msgstr "Exportações salvas"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1663
+#: addons/web/static/src/xml/base.xml:1748
 msgid "1. Import a .CSV file"
 msgstr "Importar um arquivo CSV."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1664
+#: addons/web/static/src/xml/base.xml:1749
 msgid ""
 "Select a .CSV file to import. If you need a sample of file to import,\n"
 "       you should use the export tool with the \"Import Compatible\" option."
@@ -1487,57 +1503,57 @@ msgstr ""
 "Compatível\"."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1668
+#: addons/web/static/src/xml/base.xml:1753
 msgid "CSV File:"
 msgstr "Arquivo CSV:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1671
+#: addons/web/static/src/xml/base.xml:1756
 msgid "2. Check your file format"
 msgstr "Verifique seu formato de arquivo"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1674
+#: addons/web/static/src/xml/base.xml:1759
 msgid "Import Options"
 msgstr "Opções de importação"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1678
+#: addons/web/static/src/xml/base.xml:1763
 msgid "Does your file have titles?"
 msgstr "O seu arquivo tem títulos?"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1684
+#: addons/web/static/src/xml/base.xml:1769
 msgid "Separator:"
 msgstr "Separador:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1686
+#: addons/web/static/src/xml/base.xml:1771
 msgid "Delimiter:"
 msgstr "Delimitador:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1690
+#: addons/web/static/src/xml/base.xml:1775
 msgid "Encoding:"
 msgstr "Codificação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1693
+#: addons/web/static/src/xml/base.xml:1778
 msgid "UTF-8"
 msgstr "UTF-8"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1694
+#: addons/web/static/src/xml/base.xml:1779
 msgid "Latin 1"
 msgstr "Latin 1"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1697
+#: addons/web/static/src/xml/base.xml:1782
 msgid "Lines to skip"
 msgstr "Linhas para ignorar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1697
+#: addons/web/static/src/xml/base.xml:1782
 msgid ""
 "For use if CSV files have titles on multiple lines, skips more than a single "
 "line during import"
@@ -1548,15 +1564,15 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1713
 msgid "--- Don't Import ---"
-msgstr ""
+msgstr "--- Não Importar ---"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1724
+#: addons/web/static/src/xml/base.xml:1809
 msgid "The import failed due to:"
 msgstr "A importação falhou devido a:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1726
+#: addons/web/static/src/xml/base.xml:1811
 msgid "Here is a preview of the file we could not import:"
 msgstr "Aqui está uma visualização do arquivo que não pode ser importado:"
 

From 83f15b73630a202d250db8d19283bb9bf6435e0b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 30 Jul 2012 09:52:10 +0200
Subject: [PATCH 263/312] small_layout_change_in_wall

bzr revid: fp@openerp.com-20120730075210-mdzu549s018i72rz
---
 addons/mail/static/src/js/mail.js   |  8 ++++----
 addons/mail/static/src/xml/mail.xml | 21 +++++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f488225d8b6..0f50cbb1549 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -521,7 +521,7 @@ openerp.mail = function(session) {
             this.params.parent_id = this.params.parent_id || false;
             this.params.thread_level = this.params.thread_level || 0;
             this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false;
-            this.params.msg_more_limit = this.params.msg_more_limit || 150;
+            this.params.msg_more_limit = this.params.msg_more_limit || 250;
             this.params.limit = this.params.limit || 100;
             // this.params.limit = 3; // tmp for testing
             this.params.offset = this.params.offset || 0;
@@ -758,11 +758,11 @@ openerp.mail = function(session) {
             // expand feature
             this.$element.find('div.oe_mail_msg_body:last').expander({
                 slicePoint: this.params.msg_more_limit,
-                expandText: 'see more',
-                userCollapseText: 'see less',
+                expandText: 'read more',
+                userCollapseText: '[^]',
                 detailClass: 'oe_mail_msg_tail',
                 moreClass: 'oe_mail_expand',
-                lesClass: 'oe_mail_reduce',
+                lessClass: 'oe_mail_reduce',
                 });
         },
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bf8d7fd1475..86d115f29c8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -33,7 +33,7 @@
                 <!-- contains threads -->
             </ul>
             <div class="oe_mail_wall_more">
-                <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
+                <button class="oe_mail_wall_button_more" type="button">See more...</button>
             </div>
         </div>
         <div class="oe_mail_wall_aside">
@@ -129,7 +129,7 @@
                         <t t-if="display['show_delete']">
                                 <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Hide</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
@@ -143,16 +143,17 @@
                     <h1 t-if="record.subject" class="oe_mail_msg_title">
                         <t t-raw="record.subject"/>
                     </h1>
-                    <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
-                        <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
-                    </div>
-                    <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
-                        <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
-                        <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
+                        
+                        <div class="oe_mail_msg_record_body">
+                            <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
+                            <t t-raw="record.body"/>
+                        </div>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
+                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
+                      <li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote
@@ -160,8 +161,8 @@
                       -->
                       <li t-if="record.attachment_ids.length > 0">
                           <a href="#" class="oe_mail_msg_view_attachments">
-                              <t t-if="record.attachment_ids.length == 1">Attachment</t>
-                              <t t-if="record.attachment_ids.length > 1">Attachments (<t t-raw="record.attachment_ids.length"/>)</t>
+                              <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
+                              <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
                           </a>
                       </li>
                     </ul>

From f920e391e05fa1334d45d9ef5e3e28957cb27952 Mon Sep 17 00:00:00 2001
From: "vta@openerp.com" <>
Date: Mon, 30 Jul 2012 10:50:27 +0200
Subject: [PATCH 264/312] [IMP] search view: review of the search views.

bzr revid: qdp-launchpad@openerp.com-20120730085027-0khspe8pl0t4118j
---
 addons/account_voucher/account_voucher_view.xml           | 1 +
 addons/event/report/report_event_registration_view.xml    | 1 +
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 4 ++--
 addons/mrp_operations/mrp_operations_view.xml             | 1 +
 addons/mrp_repair/mrp_repair_view.xml                     | 1 +
 addons/point_of_sale/report/pos_order_report_view.xml     | 1 +
 addons/procurement/procurement_view.xml                   | 1 +
 addons/product/product_view.xml                           | 1 +
 addons/project/res_partner_view.xml                       | 2 --
 9 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 50967f04c40..dc347d41b98 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -133,6 +133,7 @@
                     <field name="period_id"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                    <separator/>
                     <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 22df2268efc..ed8b66aa948 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -56,6 +56,7 @@
                     <field name="user_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('event_state','=','draft')]" help="Events which are in New state"/>
                     <filter icon="terp-check" string="Confirm" domain="[('event_state','=','confirm')]" help="Events which are in confirm state"/>
+                    <separator/>
                     <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="event_type" widget="selection"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index f4e849d29d5..90305c772cb 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -89,11 +89,11 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                <filter name="others" position="after">
+                <xpath expr="//filter[@name='others']" position="after">
                     <separator/>
                     <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
                     <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> 
-                </filter>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 0aea493494f..f8ff9f4eada 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -131,6 +131,7 @@
                 <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="In Progress" name="Current" domain="[('state','=','startworking')]"/>
                 <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pause')]"/>
+                <separator/>
                 <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                     help="Production started late"/>
                 <group expand="0" string="Group By...">
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 5cf3e3c7cff..739c8f108a7 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -196,6 +196,7 @@
                   <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                   <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                   <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
+                  <separator/>
                   <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                   <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 11057b3b133..297ac7e8c7f 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -43,6 +43,7 @@
                     <filter icon="terp-dolar" string="Not Invoiced" domain="[('state','=',('paid'))]"/>
                     <separator/>
                     <filter icon="terp-go-year" string="Year" name="year" domain="[('year','=',time.strftime('%%Y'))]" help="POS ordered created during current year"/>
+                    <separator/>
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
                          help="POS ordered created by today"/>
                     <separator/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 3a21ebb8a9c..da1be6b150d 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -122,6 +122,7 @@
                     <field name="product_id" />
                     <field name="state" />
                     <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
+                    <separator/>
                     <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
                     <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
                     <separator/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6bffec464b0..7acb58c588c 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -15,6 +15,7 @@
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
                    <separator/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
+                   <separator />
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 09170c43434..e16c18d1582 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -28,7 +28,5 @@
                 </xpath>
             </field>
        </record>
-       
    </data>
 </openerp>
-

From 55214947e36b45d8735646522e04736be1966d08 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 30 Jul 2012 11:21:27 +0200
Subject: [PATCH 266/312] [REF] l10n_ca: replaced tabs with 4 spaces

bzr revid: qdp-launchpad@openerp.com-20120730092127-a21xgdqiwbwr4210
---
 addons/l10n_ca/account_chart_en.xml    | 1052 ++++++++++-----------
 addons/l10n_ca/account_chart_fr.xml    | 1154 ++++++++++++------------
 addons/l10n_ca/account_tax_code_en.xml |  152 ++--
 addons/l10n_ca/account_tax_code_fr.xml |  152 ++--
 addons/l10n_ca/fiscal_templates_en.xml | 1042 ++++++++++-----------
 addons/l10n_ca/fiscal_templates_fr.xml | 1042 ++++++++++-----------
 6 files changed, 2297 insertions(+), 2297 deletions(-)

diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 14cbc993b2b..0d67e081d08 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -11,389 +11,389 @@
             <field name="user_type" ref="account.data_account_type_view"/>
         </record>
 
-	<!-- ASSET -->
+    <!-- ASSET -->
 
-	<record id="chart1_en" model="account.account.template">
-		<field name="code">1</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ASSETS</field>
-	</record>
-	
-	<record id="chart11_en" model="account.account.template">
-		<field name="code">11</field>
-		<field name="parent_id" ref="chart1_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CURRENT ASSETS</field>
-	</record>
-	
-	<record id="chart111_en" model="account.account.template">
-		<field name="code">111</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CASH</field>
-	</record>
+    <record id="chart1_en" model="account.account.template">
+        <field name="code">1</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ASSETS</field>
+    </record>
+    
+    <record id="chart11_en" model="account.account.template">
+        <field name="code">11</field>
+        <field name="parent_id" ref="chart1_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CURRENT ASSETS</field>
+    </record>
+    
+    <record id="chart111_en" model="account.account.template">
+        <field name="code">111</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CASH</field>
+    </record>
 
-	<record id="chart1111_en" model="account.account.template">
-		<field name="code">1111</field>
-		<field name="parent_id" ref="chart111_en"/>
-		<field name="type">liquidity</field>
-		<field name="user_type" ref="account.data_account_type_bank"/>
-		<field name="name">Checking Account</field>
-	</record>
+    <record id="chart1111_en" model="account.account.template">
+        <field name="code">1111</field>
+        <field name="parent_id" ref="chart111_en"/>
+        <field name="type">liquidity</field>
+        <field name="user_type" ref="account.data_account_type_bank"/>
+        <field name="name">Checking Account</field>
+    </record>
 
-	<record id="chart112_en" model="account.account.template">
-		<field name="code">112</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TREASURY OR TREASURY EQUIVALENTS</field>
-	</record>
+    <record id="chart112_en" model="account.account.template">
+        <field name="code">112</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TREASURY OR TREASURY EQUIVALENTS</field>
+    </record>
 
-	<record id="chart113_en" model="account.account.template">
-		<field name="code">113</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CERTIFICATES OF DEPOSITS</field>
-	</record>
+    <record id="chart113_en" model="account.account.template">
+        <field name="code">113</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CERTIFICATES OF DEPOSITS</field>
+    </record>
 
-	<record id="chart114_en" model="account.account.template">
-		<field name="code">114</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">STOCKS</field>
-	</record>
+    <record id="chart114_en" model="account.account.template">
+        <field name="code">114</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">STOCKS</field>
+    </record>
 
-	<record id="chart115_en" model="account.account.template">
-		<field name="code">115</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACCOUNTS RECEIVABLES</field>
-	</record>
+    <record id="chart115_en" model="account.account.template">
+        <field name="code">115</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACCOUNTS RECEIVABLES</field>
+    </record>
 
-	<record id="chart1151_en" model="account.account.template">
-		<field name="code">1151</field>
-		<field name="parent_id" ref="chart115_en"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">Customers Account</field>
-	</record>
+    <record id="chart1151_en" model="account.account.template">
+        <field name="code">1151</field>
+        <field name="parent_id" ref="chart115_en"/>
+        <field name="type">receivable</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">Customers Account</field>
+    </record>
 
-	<record id="chart1152_en" model="account.account.template">
-		<field name="code">1152</field>
-		<field name="parent_id" ref="chart115_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ALLOWANCE FOR DOUBTFUL ACCOUNTS</field>
-	</record>
+    <record id="chart1152_en" model="account.account.template">
+        <field name="code">1152</field>
+        <field name="parent_id" ref="chart115_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ALLOWANCE FOR DOUBTFUL ACCOUNTS</field>
+    </record>
 
-	<record id="chart116_en" model="account.account.template">
-		<field name="code">116</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PREPAID EXPENSES</field>
-	</record>
+    <record id="chart116_en" model="account.account.template">
+        <field name="code">116</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PREPAID EXPENSES</field>
+    </record>
 
-	<record id="chart117_en" model="account.account.template">
-		<field name="code">117</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INVESTMENTS HELD FOR TRADING</field>
-	</record>
+    <record id="chart117_en" model="account.account.template">
+        <field name="code">117</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INVESTMENTS HELD FOR TRADING</field>
+    </record>
 
-	<record id="chart118_en" model="account.account.template">
-		<field name="code">118</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TAXES RECEIVABLES</field>
-	</record>
+    <record id="chart118_en" model="account.account.template">
+        <field name="code">118</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TAXES RECEIVABLES</field>
+    </record>
 
-	<record id="chart1181_en" model="account.account.template">
-		<field name="code">1181</field>
-		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">GST receivable</field>
-	</record>
+    <record id="chart1181_en" model="account.account.template">
+        <field name="code">1181</field>
+        <field name="parent_id" ref="chart118_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">GST receivable</field>
+    </record>
 
-	<record id="chart1182_en" model="account.account.template">
-		<field name="code">1182</field>
-		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">PST/QST receivable</field>
-	</record>
+    <record id="chart1182_en" model="account.account.template">
+        <field name="code">1182</field>
+        <field name="parent_id" ref="chart118_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">PST/QST receivable</field>
+    </record>
 
-	<record id="chart1183_en" model="account.account.template">
-		<field name="code">1183</field>
-		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">HST receivable</field>
-	</record>
+    <record id="chart1183_en" model="account.account.template">
+        <field name="code">1183</field>
+        <field name="parent_id" ref="chart118_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">HST receivable</field>
+    </record>
 
-	<record id="chart15_en" model="account.account.template">
-		<field name="code">15</field>
-		<field name="parent_id" ref="chart1_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-CURRENT ASSETS</field>
-	</record>
+    <record id="chart15_en" model="account.account.template">
+        <field name="code">15</field>
+        <field name="parent_id" ref="chart1_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-CURRENT ASSETS</field>
+    </record>
 
-	<record id="chart151_en" model="account.account.template">
-		<field name="code">151</field>
-		<field name="parent_id" ref="chart15_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INVESTMENTS AVAILABLE FOR SALE</field>
-	</record>
+    <record id="chart151_en" model="account.account.template">
+        <field name="code">151</field>
+        <field name="parent_id" ref="chart15_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INVESTMENTS AVAILABLE FOR SALE</field>
+    </record>
 
-	<record id="chart152_en" model="account.account.template">
-		<field name="code">152</field>
-		<field name="parent_id" ref="chart15_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TANGIBLE ASSETS</field>
-	</record>
+    <record id="chart152_en" model="account.account.template">
+        <field name="code">152</field>
+        <field name="parent_id" ref="chart15_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TANGIBLE ASSETS</field>
+    </record>
 
-	<record id="chart1527_en" model="account.account.template">
-		<field name="code">1527</field>
-		<field name="parent_id" ref="chart152_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACCUMULATED DEPRECIATIONS</field>
-	</record>
+    <record id="chart1527_en" model="account.account.template">
+        <field name="code">1527</field>
+        <field name="parent_id" ref="chart152_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACCUMULATED DEPRECIATIONS</field>
+    </record>
 
-	<record id="chart153_en" model="account.account.template">
-		<field name="code">153</field>
-		<field name="parent_id" ref="chart15_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTANGIBLE ASSETS</field>
-	</record>
+    <record id="chart153_en" model="account.account.template">
+        <field name="code">153</field>
+        <field name="parent_id" ref="chart15_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTANGIBLE ASSETS</field>
+    </record>
 
-	<record id="chart1531_en" model="account.account.template">
-		<field name="code">1531</field>
-		<field name="parent_id" ref="chart153_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS</field>
-	</record>
+    <record id="chart1531_en" model="account.account.template">
+        <field name="code">1531</field>
+        <field name="parent_id" ref="chart153_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS</field>
+    </record>
 
-	<!-- LIABILITIES -->
+    <!-- LIABILITIES -->
 
-	<record id="chart2_en" model="account.account.template">
-		<field name="code">2</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">LIABILITIES</field>
-	</record>
+    <record id="chart2_en" model="account.account.template">
+        <field name="code">2</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">LIABILITIES</field>
+    </record>
 
-	<record id="chart21_en" model="account.account.template">
-		<field name="code">21</field>
-		<field name="parent_id" ref="chart2_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CURRENT LIABILITIES</field>
-	</record>
+    <record id="chart21_en" model="account.account.template">
+        <field name="code">21</field>
+        <field name="parent_id" ref="chart2_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CURRENT LIABILITIES</field>
+    </record>
 
-	<record id="chart211_en" model="account.account.template">
-		<field name="code">211</field>
-		<field name="parent_id" ref="chart21_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACCOUNTS PAYABLES</field>
-	</record>
+    <record id="chart211_en" model="account.account.template">
+        <field name="code">211</field>
+        <field name="parent_id" ref="chart21_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACCOUNTS PAYABLES</field>
+    </record>
 
-	<record id="chart2111_en" model="account.account.template">
-		<field name="code">2111</field>
-		<field name="parent_id" ref="chart211_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">Suppliers Account</field>
-	</record>
+    <record id="chart2111_en" model="account.account.template">
+        <field name="code">2111</field>
+        <field name="parent_id" ref="chart211_en"/>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">Suppliers Account</field>
+    </record>
 
-	<record id="chart212_en" model="account.account.template">
-		<field name="code">212</field>
-		<field name="parent_id" ref="chart21_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TAXES PAYABLES</field>
-	</record>
+    <record id="chart212_en" model="account.account.template">
+        <field name="code">212</field>
+        <field name="parent_id" ref="chart21_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TAXES PAYABLES</field>
+    </record>
 
-	<record id="chart2121_en" model="account.account.template">
-		<field name="code">2121</field>
-		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">GST to pay</field>
-	</record>
+    <record id="chart2121_en" model="account.account.template">
+        <field name="code">2121</field>
+        <field name="parent_id" ref="chart212_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">GST to pay</field>
+    </record>
 
-	<record id="chart2122_en" model="account.account.template">
-		<field name="code">2122</field>
-		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">PST/QST to pay</field>
-	</record>
+    <record id="chart2122_en" model="account.account.template">
+        <field name="code">2122</field>
+        <field name="parent_id" ref="chart212_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">PST/QST to pay</field>
+    </record>
 
-	<record id="chart2123_en" model="account.account.template">
-		<field name="code">2123</field>
-		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">HST to pay</field>
-	</record>
+    <record id="chart2123_en" model="account.account.template">
+        <field name="code">2123</field>
+        <field name="parent_id" ref="chart212_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">HST to pay</field>
+    </record>
 
-	<record id="chart213_en" model="account.account.template">
-		<field name="code">213</field>
-		<field name="parent_id" ref="chart21_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CURRENT FINANCIAL DEBTS</field>
-	</record>
+    <record id="chart213_en" model="account.account.template">
+        <field name="code">213</field>
+        <field name="parent_id" ref="chart21_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CURRENT FINANCIAL DEBTS</field>
+    </record>
 
-	<record id="chart25_en" model="account.account.template">
-		<field name="code">25</field>
-		<field name="parent_id" ref="chart2_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-CURRENT LIABILITIES</field>
-	</record>
+    <record id="chart25_en" model="account.account.template">
+        <field name="code">25</field>
+        <field name="parent_id" ref="chart2_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-CURRENT LIABILITIES</field>
+    </record>
 
-	<record id="chart251_en" model="account.account.template">
-		<field name="code">251</field>
-		<field name="parent_id" ref="chart25_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-CURRENT FINANCIAL DEBTS</field>
-	</record>
+    <record id="chart251_en" model="account.account.template">
+        <field name="code">251</field>
+        <field name="parent_id" ref="chart25_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-CURRENT FINANCIAL DEBTS</field>
+    </record>
 
-	<record id="chart252_en" model="account.account.template">
-		<field name="code">252</field>
-		<field name="parent_id" ref="chart25_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
-	</record>
+    <record id="chart252_en" model="account.account.template">
+        <field name="code">252</field>
+        <field name="parent_id" ref="chart25_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
+    </record>
 
-	<record id="chart253_en" model="account.account.template">
-		<field name="code">253</field>
-		<field name="parent_id" ref="chart25_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DEFERRED TAXES</field>
-	</record>
+    <record id="chart253_en" model="account.account.template">
+        <field name="code">253</field>
+        <field name="parent_id" ref="chart25_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DEFERRED TAXES</field>
+    </record>
 
-	<record id="chart259_en" model="account.account.template">
-		<field name="code">259</field>
-		<field name="parent_id" ref="chart25_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER NON-CURRENT LIABILITIES</field>
-	</record>
+    <record id="chart259_en" model="account.account.template">
+        <field name="code">259</field>
+        <field name="parent_id" ref="chart25_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER NON-CURRENT LIABILITIES</field>
+    </record>
 
-	<!-- EQUITY -->
+    <!-- EQUITY -->
 
-	<record id="chart3_en" model="account.account.template">
-		<field name="code">3</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">EQUITY</field>
-	</record>
+    <record id="chart3_en" model="account.account.template">
+        <field name="code">3</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">EQUITY</field>
+    </record>
 
-	<record id="chart31_en" model="account.account.template">
-		<field name="code">31</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">SHARE CAPITAL</field>
-	</record>
+    <record id="chart31_en" model="account.account.template">
+        <field name="code">31</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">SHARE CAPITAL</field>
+    </record>
 
-	<record id="chart32_en" model="account.account.template">
-		<field name="code">32</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PREMIUMS</field>
-	</record>
+    <record id="chart32_en" model="account.account.template">
+        <field name="code">32</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PREMIUMS</field>
+    </record>
 
-	<record id="chart33_en" model="account.account.template">
-		<field name="code">33</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">RETAINED EARNINGS</field>
-	</record>
+    <record id="chart33_en" model="account.account.template">
+        <field name="code">33</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">RETAINED EARNINGS</field>
+    </record>
 
-	<record id="chart34_en" model="account.account.template">
-		<field name="code">34</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DIVIDENDS</field>
-	</record>
+    <record id="chart34_en" model="account.account.template">
+        <field name="code">34</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DIVIDENDS</field>
+    </record>
 
-	<record id="chart35_en" model="account.account.template">
-		<field name="code">35</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TRANSLATION ADJUSTMENTS</field>
-	</record>
+    <record id="chart35_en" model="account.account.template">
+        <field name="code">35</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TRANSLATION ADJUSTMENTS</field>
+    </record>
 
-	<record id="chart36_en" model="account.account.template">
-		<field name="code">36</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CONTRIBUTED SURPLUS</field>
-	</record>
+    <record id="chart36_en" model="account.account.template">
+        <field name="code">36</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CONTRIBUTED SURPLUS</field>
+    </record>
 
-	<!-- INCOME -->
+    <!-- INCOME -->
 
-	<record id="chart4_en" model="account.account.template">
-		<field name="code">4</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INCOMES</field>
-	</record>
+    <record id="chart4_en" model="account.account.template">
+        <field name="code">4</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INCOMES</field>
+    </record>
 
-	<record id="chart41_en" model="account.account.template">
-		<field name="code">41</field>
-		<field name="parent_id" ref="chart4_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OPERATING INCOMES</field>
-	</record>
+    <record id="chart41_en" model="account.account.template">
+        <field name="code">41</field>
+        <field name="parent_id" ref="chart4_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OPERATING INCOMES</field>
+    </record>
 
-	<record id="chart411_en" model="account.account.template">
-		<field name="code">411</field>
-		<field name="parent_id" ref="chart41_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Inside Sales</field>
-	</record>
+    <record id="chart411_en" model="account.account.template">
+        <field name="code">411</field>
+        <field name="parent_id" ref="chart41_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Inside Sales</field>
+    </record>
 
         <record id="chart412_en" model="account.account.template">
                 <field name="code">412</field>
@@ -419,223 +419,223 @@
                 <field name="name">International Sales</field>
         </record>
 
-	<record id="chart419_en" model="account.account.template">
-		<field name="code">419</field>
-		<field name="parent_id" ref="chart41_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER OPERATING INCOMES</field>
-	</record>
+    <record id="chart419_en" model="account.account.template">
+        <field name="code">419</field>
+        <field name="parent_id" ref="chart41_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER OPERATING INCOMES</field>
+    </record>
 
-	<record id="chart42_en" model="account.account.template">
-		<field name="code">42</field>
-		<field name="parent_id" ref="chart4_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-OPERATING INCOMES</field>
-	</record>
+    <record id="chart42_en" model="account.account.template">
+        <field name="code">42</field>
+        <field name="parent_id" ref="chart4_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-OPERATING INCOMES</field>
+    </record>
 
-	<record id="chart421_en" model="account.account.template">
-		<field name="code">421</field>
-		<field name="parent_id" ref="chart42_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTERESTS</field>
-	</record>
+    <record id="chart421_en" model="account.account.template">
+        <field name="code">421</field>
+        <field name="parent_id" ref="chart42_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTERESTS</field>
+    </record>
 
-	<record id="chart429_en" model="account.account.template">
-		<field name="code">429</field>
-		<field name="parent_id" ref="chart42_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER NON-OPERATING INCOMES</field>
-	</record>
+    <record id="chart429_en" model="account.account.template">
+        <field name="code">429</field>
+        <field name="parent_id" ref="chart42_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER NON-OPERATING INCOMES</field>
+    </record>
 
-	<!-- EXPENSES -->
+    <!-- EXPENSES -->
 
-	<record id="chart5_en" model="account.account.template">
-		<field name="code">5</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">EXPENSES</field>
-	</record>
+    <record id="chart5_en" model="account.account.template">
+        <field name="code">5</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">EXPENSES</field>
+    </record>
 
-	<record id="chart51_en" model="account.account.template">
-		<field name="code">51</field>
-		<field name="parent_id" ref="chart5_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OPERATING EXPENSES</field>
-	</record>
+    <record id="chart51_en" model="account.account.template">
+        <field name="code">51</field>
+        <field name="parent_id" ref="chart5_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OPERATING EXPENSES</field>
+    </record>
 
-	<record id="chart511_en" model="account.account.template">
-		<field name="code">511</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">COST OF GOODS SOLD</field>
-	</record>
+    <record id="chart511_en" model="account.account.template">
+        <field name="code">511</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">COST OF GOODS SOLD</field>
+    </record>
 
-	<record id="chart5111_en" model="account.account.template">
-		<field name="code">5111</field>
-		<field name="parent_id" ref="chart511_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Inside Purchases</field>
-	</record>
+    <record id="chart5111_en" model="account.account.template">
+        <field name="code">5111</field>
+        <field name="parent_id" ref="chart511_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Inside Purchases</field>
+    </record>
 
-	<record id="chart5112_en" model="account.account.template">
-		<field name="code">5112</field>
-		<field name="parent_id" ref="chart511_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Purchases in harmonized provinces</field>
-	</record>
+    <record id="chart5112_en" model="account.account.template">
+        <field name="code">5112</field>
+        <field name="parent_id" ref="chart511_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Purchases in harmonized provinces</field>
+    </record>
 
-	<record id="chart5113_en" model="account.account.template">
-		<field name="code">5113</field>
-		<field name="parent_id" ref="chart511_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Purchases in non-harmonized provinces</field>
-	</record>
+    <record id="chart5113_en" model="account.account.template">
+        <field name="code">5113</field>
+        <field name="parent_id" ref="chart511_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Purchases in non-harmonized provinces</field>
+    </record>
 
-	<record id="chart5114_en" model="account.account.template">
-		<field name="code">5114</field>
-		<field name="parent_id" ref="chart511_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">International Purchases</field>
-	</record>
+    <record id="chart5114_en" model="account.account.template">
+        <field name="code">5114</field>
+        <field name="parent_id" ref="chart511_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">International Purchases</field>
+    </record>
 
-	<record id="chart512_en" model="account.account.template">
-		<field name="code">512</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">LABOUR EXPENSES</field>
-	</record>
+    <record id="chart512_en" model="account.account.template">
+        <field name="code">512</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">LABOUR EXPENSES</field>
+    </record>
 
-	<record id="chart5121_en" model="account.account.template">
-		<field name="code">5121</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Salaries, wages and commissions</field>
-	</record>
+    <record id="chart5121_en" model="account.account.template">
+        <field name="code">5121</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Salaries, wages and commissions</field>
+    </record>
 
-	<record id="chart5122_en" model="account.account.template">
-		<field name="code">5122</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Holidays</field>
-	</record>
+    <record id="chart5122_en" model="account.account.template">
+        <field name="code">5122</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Holidays</field>
+    </record>
 
-	<record id="chart5123_en" model="account.account.template">
-		<field name="code">5123</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Employment Insurance</field>
-	</record>
+    <record id="chart5123_en" model="account.account.template">
+        <field name="code">5123</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Employment Insurance</field>
+    </record>
 
-	<record id="chart5124_en" model="account.account.template">
-		<field name="code">5124</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Health Services Fund</field>
-	</record>
+    <record id="chart5124_en" model="account.account.template">
+        <field name="code">5124</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Health Services Fund</field>
+    </record>
 
-	<record id="chart5125_en" model="account.account.template">
-		<field name="code">5125</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Annuities</field>
-	</record>
+    <record id="chart5125_en" model="account.account.template">
+        <field name="code">5125</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Annuities</field>
+    </record>
 
-	<record id="chart5126_en" model="account.account.template">
-		<field name="code">5126</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Parental Insurance</field>
-	</record>
+    <record id="chart5126_en" model="account.account.template">
+        <field name="code">5126</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Parental Insurance</field>
+    </record>
 
-	<record id="chart5127_en" model="account.account.template">
-		<field name="code">5127</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Labour Health and Safety</field>
-	</record>
+    <record id="chart5127_en" model="account.account.template">
+        <field name="code">5127</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Labour Health and Safety</field>
+    </record>
 
-	<record id="chart5128_en" model="account.account.template">
-		<field name="code">5128</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Labour Standards</field>
-	</record>
+    <record id="chart5128_en" model="account.account.template">
+        <field name="code">5128</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Labour Standards</field>
+    </record>
 
-	<record id="chart513_en" model="account.account.template">
-		<field name="code">513</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">SALES EXPENSES</field>
-	</record>
+    <record id="chart513_en" model="account.account.template">
+        <field name="code">513</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">SALES EXPENSES</field>
+    </record>
 
-	<record id="chart514_en" model="account.account.template">
-		<field name="code">514</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">GENERAL EXPENSES</field>
-	</record>
+    <record id="chart514_en" model="account.account.template">
+        <field name="code">514</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">GENERAL EXPENSES</field>
+    </record>
 
-	<record id="chart515_en" model="account.account.template">
-		<field name="code">515</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">RESEARCH AND DEVELOPMENT EXPENSES</field>
-	</record>
+    <record id="chart515_en" model="account.account.template">
+        <field name="code">515</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">RESEARCH AND DEVELOPMENT EXPENSES</field>
+    </record>
 
-	<record id="chart519_en" model="account.account.template">
-		<field name="code">519</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER OPERATING EXPENSES</field>
-	</record>
+    <record id="chart519_en" model="account.account.template">
+        <field name="code">519</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER OPERATING EXPENSES</field>
+    </record>
 
-	<record id="chart55_en" model="account.account.template">
-		<field name="code">55</field>
-		<field name="parent_id" ref="chart5_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-OPERATING EXPENSES</field>
-	</record>
+    <record id="chart55_en" model="account.account.template">
+        <field name="code">55</field>
+        <field name="parent_id" ref="chart5_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-OPERATING EXPENSES</field>
+    </record>
 
-	<record id="chart551_en" model="account.account.template">
-		<field name="code">551</field>
-		<field name="parent_id" ref="chart55_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTEREST EXPENSES</field>
-	</record>
+    <record id="chart551_en" model="account.account.template">
+        <field name="code">551</field>
+        <field name="parent_id" ref="chart55_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTEREST EXPENSES</field>
+    </record>
 
-	<record id="chart559_en" model="account.account.template">
-		<field name="code">559</field>
-		<field name="parent_id" ref="chart55_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER NON-OPERATING EXPENSES</field>
-	</record>
+    <record id="chart559_en" model="account.account.template">
+        <field name="code">559</field>
+        <field name="parent_id" ref="chart55_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER NON-OPERATING EXPENSES</field>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index e50ac7ff4dc..dbf4f9aad7c 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
      
-	<!-- Account Templates-->
+    <!-- Account Templates-->
         <record id="chart0_fr" model="account.account.template">
             <field name="code">0</field>
             <field name="type">view</field>
@@ -10,663 +10,663 @@
             <field name="name">Account Chart CA FR</field>
         </record>
 
-	<!-- ACTIF -->
+    <!-- ACTIF -->
 
-	<record id="chart1_fr" model="account.account.template">
-		<field name="code">1</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACTIF</field>
-	</record>
-	
-	<record id="chart11_fr" model="account.account.template">
-		<field name="code">11</field>
-		<field name="parent_id" ref="chart1_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACTIFS COURANTS</field>
-	</record>
-	
-	<record id="chart111_fr" model="account.account.template">
-		<field name="code">111</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ENCAISSE</field>
-	</record>
+    <record id="chart1_fr" model="account.account.template">
+        <field name="code">1</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACTIF</field>
+    </record>
+    
+    <record id="chart11_fr" model="account.account.template">
+        <field name="code">11</field>
+        <field name="parent_id" ref="chart1_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACTIFS COURANTS</field>
+    </record>
+    
+    <record id="chart111_fr" model="account.account.template">
+        <field name="code">111</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ENCAISSE</field>
+    </record>
 
-	<record id="chart1111_fr" model="account.account.template">
-		<field name="code">1111</field>
-		<field name="parent_id" ref="chart111_fr"/>
-		<field name="type">liquidity</field>
-		<field name="user_type" ref="account.data_account_type_bank"/>
-		<field name="name">Compte chèque</field>
-	</record>
+    <record id="chart1111_fr" model="account.account.template">
+        <field name="code">1111</field>
+        <field name="parent_id" ref="chart111_fr"/>
+        <field name="type">liquidity</field>
+        <field name="user_type" ref="account.data_account_type_bank"/>
+        <field name="name">Compte chèque</field>
+    </record>
 
-	<record id="chart1112_fr" model="account.account.template">
-		<field name="code">1112</field>
-		<field name="parent_id" ref="chart111_fr"/>
-		<field name="type">liquidity</field>
-		<field name="user_type" ref="account.data_account_type_cash"/>
-		<field name="name">Petite caisse</field>
-	</record>
+    <record id="chart1112_fr" model="account.account.template">
+        <field name="code">1112</field>
+        <field name="parent_id" ref="chart111_fr"/>
+        <field name="type">liquidity</field>
+        <field name="user_type" ref="account.data_account_type_cash"/>
+        <field name="name">Petite caisse</field>
+    </record>
 
-	<record id="chart112_fr" model="account.account.template">
-		<field name="code">112</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE</field>
-	</record>
+    <record id="chart112_fr" model="account.account.template">
+        <field name="code">112</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE</field>
+    </record>
 
-	<record id="chart113_fr" model="account.account.template">
-		<field name="code">113</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CERTIFICATS DE DÉPÔTS</field>
-	</record>
+    <record id="chart113_fr" model="account.account.template">
+        <field name="code">113</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CERTIFICATS DE DÉPÔTS</field>
+    </record>
 
-	<record id="chart114_fr" model="account.account.template">
-		<field name="code">114</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">STOCKS</field>
-	</record>
+    <record id="chart114_fr" model="account.account.template">
+        <field name="code">114</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">STOCKS</field>
+    </record>
 
-	<record id="chart115_fr" model="account.account.template">
-		<field name="code">115</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">COMPTES CLIENTS</field>
-	</record>
+    <record id="chart115_fr" model="account.account.template">
+        <field name="code">115</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">COMPTES CLIENTS</field>
+    </record>
 
-	<record id="chart1151_fr" model="account.account.template">
-		<field name="code">1151</field>
-		<field name="parent_id" ref="chart115_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">Comptes clients</field>
-	</record>
+    <record id="chart1151_fr" model="account.account.template">
+        <field name="code">1151</field>
+        <field name="parent_id" ref="chart115_fr"/>
+        <field name="type">receivable</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">Comptes clients</field>
+    </record>
 
-	<record id="chart1152_fr" model="account.account.template">
-		<field name="code">1152</field>
-		<field name="parent_id" ref="chart115_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
-	</record>
+    <record id="chart1152_fr" model="account.account.template">
+        <field name="code">1152</field>
+        <field name="parent_id" ref="chart115_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
+    </record>
 
-	<record id="chart116_fr" model="account.account.template">
-		<field name="code">116</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS PAYÉS D'AVANCE</field>
-	</record>
+    <record id="chart116_fr" model="account.account.template">
+        <field name="code">116</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS PAYÉS D'AVANCE</field>
+    </record>
 
-	<record id="chart117_fr" model="account.account.template">
-		<field name="code">117</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION</field>
-	</record>
+    <record id="chart117_fr" model="account.account.template">
+        <field name="code">117</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION</field>
+    </record>
 
-	<record id="chart118_fr" model="account.account.template">
-		<field name="code">118</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMPÔTS À RECEVOIR</field>
-	</record>
+    <record id="chart118_fr" model="account.account.template">
+        <field name="code">118</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMPÔTS À RECEVOIR</field>
+    </record>
 
-	<record id="chart1181_fr" model="account.account.template">
-		<field name="code">1181</field>
-		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TPS à recevoir</field>
-	</record>
+    <record id="chart1181_fr" model="account.account.template">
+        <field name="code">1181</field>
+        <field name="parent_id" ref="chart118_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TPS à recevoir</field>
+    </record>
 
-	<record id="chart1182_fr" model="account.account.template">
-		<field name="code">1182</field>
-		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVP/TVQ à recevoir</field>
-	</record>
+    <record id="chart1182_fr" model="account.account.template">
+        <field name="code">1182</field>
+        <field name="parent_id" ref="chart118_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TVP/TVQ à recevoir</field>
+    </record>
 
-	<record id="chart1183_fr" model="account.account.template">
-		<field name="code">1183</field>
-		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVH à recevoir</field>
-	</record>
+    <record id="chart1183_fr" model="account.account.template">
+        <field name="code">1183</field>
+        <field name="parent_id" ref="chart118_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TVH à recevoir</field>
+    </record>
 
-	<record id="chart15_fr" model="account.account.template">
-		<field name="code">15</field>
-		<field name="parent_id" ref="chart1_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACTIFS NON-COURANTS</field>
-	</record>
+    <record id="chart15_fr" model="account.account.template">
+        <field name="code">15</field>
+        <field name="parent_id" ref="chart1_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACTIFS NON-COURANTS</field>
+    </record>
 
-	<record id="chart151_fr" model="account.account.template">
-		<field name="code">151</field>
-		<field name="parent_id" ref="chart15_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PLACEMENTS DISPONIBLES À LA VENTE</field>
-	</record>
+    <record id="chart151_fr" model="account.account.template">
+        <field name="code">151</field>
+        <field name="parent_id" ref="chart15_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PLACEMENTS DISPONIBLES À LA VENTE</field>
+    </record>
 
-	<record id="chart152_fr" model="account.account.template">
-		<field name="code">152</field>
-		<field name="parent_id" ref="chart15_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMMOBILISATIONS CORPORELLES</field>
-	</record>
+    <record id="chart152_fr" model="account.account.template">
+        <field name="code">152</field>
+        <field name="parent_id" ref="chart15_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMMOBILISATIONS CORPORELLES</field>
+    </record>
 
-	<record id="chart1527_fr" model="account.account.template">
-		<field name="code">1527</field>
-		<field name="parent_id" ref="chart152_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AMORTISSEMENTS CUMULÉS</field>
-	</record>
+    <record id="chart1527_fr" model="account.account.template">
+        <field name="code">1527</field>
+        <field name="parent_id" ref="chart152_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AMORTISSEMENTS CUMULÉS</field>
+    </record>
 
-	<record id="chart153_fr" model="account.account.template">
-		<field name="code">153</field>
-		<field name="parent_id" ref="chart15_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMMOBILISATIONS INCORPORELLES</field>
-	</record>
+    <record id="chart153_fr" model="account.account.template">
+        <field name="code">153</field>
+        <field name="parent_id" ref="chart15_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMMOBILISATIONS INCORPORELLES</field>
+    </record>
 
-	<record id="chart1531_fr" model="account.account.template">
-		<field name="code">1531</field>
-		<field name="parent_id" ref="chart153_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS</field>
-	</record>
+    <record id="chart1531_fr" model="account.account.template">
+        <field name="code">1531</field>
+        <field name="parent_id" ref="chart153_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS</field>
+    </record>
 
-	<!-- PASSIF -->
+    <!-- PASSIF -->
 
-	<record id="chart2_fr" model="account.account.template">
-		<field name="code">2</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PASSIF</field>
-	</record>
+    <record id="chart2_fr" model="account.account.template">
+        <field name="code">2</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PASSIF</field>
+    </record>
 
-	<record id="chart21_fr" model="account.account.template">
-		<field name="code">21</field>
-		<field name="parent_id" ref="chart2_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PASSIFS COURANTS</field>
-	</record>
+    <record id="chart21_fr" model="account.account.template">
+        <field name="code">21</field>
+        <field name="parent_id" ref="chart2_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PASSIFS COURANTS</field>
+    </record>
 
-	<record id="chart211_fr" model="account.account.template">
-		<field name="code">211</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field>
-	</record>
+    <record id="chart211_fr" model="account.account.template">
+        <field name="code">211</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field>
+    </record>
 
-	<record id="chart2111_fr" model="account.account.template">
-		<field name="code">2111</field>
-		<field name="parent_id" ref="chart211_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">Comptes fournisseurs</field>
-	</record>
+    <record id="chart2111_fr" model="account.account.template">
+        <field name="code">2111</field>
+        <field name="parent_id" ref="chart211_fr"/>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">Comptes fournisseurs</field>
+    </record>
 
-	<record id="chart212_fr" model="account.account.template">
-		<field name="code">212</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES COMPTES CRÉDITEURS</field>
-	</record>
+    <record id="chart212_fr" model="account.account.template">
+        <field name="code">212</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES COMPTES CRÉDITEURS</field>
+    </record>
 
-	<record id="chart213_fr" model="account.account.template">
-		<field name="code">213</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMPÔTS À PAYER</field>
-	</record>
+    <record id="chart213_fr" model="account.account.template">
+        <field name="code">213</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMPÔTS À PAYER</field>
+    </record>
 
-	<record id="chart2131_fr" model="account.account.template">
-		<field name="code">2131</field>
-		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TPS à payer</field>
-	</record>
+    <record id="chart2131_fr" model="account.account.template">
+        <field name="code">2131</field>
+        <field name="parent_id" ref="chart213_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_liability"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TPS à payer</field>
+    </record>
 
-	<record id="chart2132_fr" model="account.account.template">
-		<field name="code">2132</field>
-		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVP/TVQ à payer</field>
-	</record>
+    <record id="chart2132_fr" model="account.account.template">
+        <field name="code">2132</field>
+        <field name="parent_id" ref="chart213_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_liability"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TVP/TVQ à payer</field>
+    </record>
 
-	<record id="chart2133_fr" model="account.account.template">
-		<field name="code">2133</field>
-		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVH à payer</field>
-	</record>
+    <record id="chart2133_fr" model="account.account.template">
+        <field name="code">2133</field>
+        <field name="parent_id" ref="chart213_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_liability"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TVH à payer</field>
+    </record>
 
-	<record id="chart214_fr" model="account.account.template">
-		<field name="code">214</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DETTES FINANCIÈRES COURANTES</field>
-	</record>
+    <record id="chart214_fr" model="account.account.template">
+        <field name="code">214</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DETTES FINANCIÈRES COURANTES</field>
+    </record>
 
-	<record id="chart215_fr" model="account.account.template">
-		<field name="code">215</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION</field>
-	</record>
+    <record id="chart215_fr" model="account.account.template">
+        <field name="code">215</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION</field>
+    </record>
 
-	<record id="chart25_fr" model="account.account.template">
-		<field name="code">25</field>
-		<field name="parent_id" ref="chart2_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PASSIFS NON-COURANTS</field>
-	</record>
+    <record id="chart25_fr" model="account.account.template">
+        <field name="code">25</field>
+        <field name="parent_id" ref="chart2_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PASSIFS NON-COURANTS</field>
+    </record>
 
-	<record id="chart251_fr" model="account.account.template">
-		<field name="code">251</field>
-		<field name="parent_id" ref="chart25_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DETTES FINANCIÈRES NON-COURANTES</field>
-	</record>
+    <record id="chart251_fr" model="account.account.template">
+        <field name="code">251</field>
+        <field name="parent_id" ref="chart25_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DETTES FINANCIÈRES NON-COURANTES</field>
+    </record>
 
-	<record id="chart252_fr" model="account.account.template">
-		<field name="code">252</field>
-		<field name="parent_id" ref="chart25_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI</field>
-	</record>
+    <record id="chart252_fr" model="account.account.template">
+        <field name="code">252</field>
+        <field name="parent_id" ref="chart25_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI</field>
+    </record>
 
-	<record id="chart253_fr" model="account.account.template">
-		<field name="code">253</field>
-		<field name="parent_id" ref="chart25_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMPÔTS DIFFÉRÉS</field>
-	</record>
+    <record id="chart253_fr" model="account.account.template">
+        <field name="code">253</field>
+        <field name="parent_id" ref="chart25_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMPÔTS DIFFÉRÉS</field>
+    </record>
 
-	<record id="chart254_fr" model="account.account.template">
-		<field name="code">254</field>
-		<field name="parent_id" ref="chart25_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES PASSIFS NON-COURANTS</field>
-	</record>
+    <record id="chart254_fr" model="account.account.template">
+        <field name="code">254</field>
+        <field name="parent_id" ref="chart25_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES PASSIFS NON-COURANTS</field>
+    </record>
 
-	<!-- CAPITAUX PROPRES -->
+    <!-- CAPITAUX PROPRES -->
 
-	<record id="chart3_fr" model="account.account.template">
-		<field name="code">3</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CAPITAUX PROPRES</field>
-	</record>
+    <record id="chart3_fr" model="account.account.template">
+        <field name="code">3</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CAPITAUX PROPRES</field>
+    </record>
 
-	<record id="chart31_fr" model="account.account.template">
-		<field name="code">31</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CAPITAL-ACTIONS</field>
-	</record>
+    <record id="chart31_fr" model="account.account.template">
+        <field name="code">31</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CAPITAL-ACTIONS</field>
+    </record>
 
-	<record id="chart32_fr" model="account.account.template">
-		<field name="code">32</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PRIMES</field>
-	</record>
+    <record id="chart32_fr" model="account.account.template">
+        <field name="code">32</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PRIMES</field>
+    </record>
 
-	<record id="chart33_fr" model="account.account.template">
-		<field name="code">33</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">BÉNÉFICES NON RÉPARTIS</field>
-	</record>
+    <record id="chart33_fr" model="account.account.template">
+        <field name="code">33</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">BÉNÉFICES NON RÉPARTIS</field>
+    </record>
 
-	<record id="chart34_fr" model="account.account.template">
-		<field name="code">34</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DIVIDENDES</field>
-	</record>
+    <record id="chart34_fr" model="account.account.template">
+        <field name="code">34</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DIVIDENDES</field>
+    </record>
 
-	<record id="chart35_fr" model="account.account.template">
-		<field name="code">35</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ÉCARTS DE CONVERSION</field>
-	</record>
+    <record id="chart35_fr" model="account.account.template">
+        <field name="code">35</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ÉCARTS DE CONVERSION</field>
+    </record>
 
-	<record id="chart36_fr" model="account.account.template">
-		<field name="code">36</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">SURPLUS D'APPORT</field>
-	</record>
+    <record id="chart36_fr" model="account.account.template">
+        <field name="code">36</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">SURPLUS D'APPORT</field>
+    </record>
 
-	<record id="chart39_fr" model="account.account.template">
-		<field name="code">39</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL</field>
-	</record>
+    <record id="chart39_fr" model="account.account.template">
+        <field name="code">39</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL</field>
+    </record>
 
         <!-- PRODUITS -->
 
-	<record id="chart4_fr" model="account.account.template">
-		<field name="code">4</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PRODUITS</field>
-	</record>
+    <record id="chart4_fr" model="account.account.template">
+        <field name="code">4</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PRODUITS</field>
+    </record>
 
-	<record id="chart41_fr" model="account.account.template">
-		<field name="code">41</field>
-		<field name="parent_id" ref="chart4_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PRODUITS D'EXPLOITATION</field>
-	</record>
+    <record id="chart41_fr" model="account.account.template">
+        <field name="code">41</field>
+        <field name="parent_id" ref="chart4_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PRODUITS D'EXPLOITATION</field>
+    </record>
 
-	<record id="chart411_fr" model="account.account.template">
-		<field name="code">411</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Ventes</field>
-	</record>
+    <record id="chart411_fr" model="account.account.template">
+        <field name="code">411</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Ventes</field>
+    </record>
 
-	<record id="chart412_fr" model="account.account.template">
-		<field name="code">412</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Ventes avec des provinces harmonisées</field>
-	</record>
-	
-	<record id="chart413_fr" model="account.account.template">
-		<field name="code">413</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Ventes avec des provinces non-harmonisées</field>
-	</record>
+    <record id="chart412_fr" model="account.account.template">
+        <field name="code">412</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Ventes avec des provinces harmonisées</field>
+    </record>
+    
+    <record id="chart413_fr" model="account.account.template">
+        <field name="code">413</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Ventes avec des provinces non-harmonisées</field>
+    </record>
 
-	<record id="chart414_fr" model="account.account.template">
-		<field name="code">414</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Ventes à l'étranger</field>
-	</record>
+    <record id="chart414_fr" model="account.account.template">
+        <field name="code">414</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Ventes à l'étranger</field>
+    </record>
 
-	<record id="chart419_fr" model="account.account.template">
-		<field name="code">419</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
-	</record>
+    <record id="chart419_fr" model="account.account.template">
+        <field name="code">419</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
+    </record>
 
-	<record id="chart42_fr" model="account.account.template">
-		<field name="code">42</field>
-		<field name="parent_id" ref="chart4_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PRODUITS NON LIÉS À L'EXPLOITATION</field>
-	</record>
+    <record id="chart42_fr" model="account.account.template">
+        <field name="code">42</field>
+        <field name="parent_id" ref="chart4_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PRODUITS NON LIÉS À L'EXPLOITATION</field>
+    </record>
 
-	<record id="chart425_fr" model="account.account.template">
-		<field name="code">425</field>
-		<field name="parent_id" ref="chart42_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTÉRÊTS</field>
-	</record>
+    <record id="chart425_fr" model="account.account.template">
+        <field name="code">425</field>
+        <field name="parent_id" ref="chart42_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTÉRÊTS</field>
+    </record>
 
-	<record id="chart429_fr" model="account.account.template">
-		<field name="code">429</field>
-		<field name="parent_id" ref="chart42_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
-	</record>
+    <record id="chart429_fr" model="account.account.template">
+        <field name="code">429</field>
+        <field name="parent_id" ref="chart42_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
+    </record>
 
-	<!-- CHARGES -->
+    <!-- CHARGES -->
 
-	<record id="chart5_fr" model="account.account.template">
-		<field name="code">5</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CHARGES</field>
-	</record>
+    <record id="chart5_fr" model="account.account.template">
+        <field name="code">5</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CHARGES</field>
+    </record>
 
-	<record id="chart51_fr" model="account.account.template">
-		<field name="code">51</field>
-		<field name="parent_id" ref="chart5_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CHARGES D'EXPLOITATION</field>
-	</record>
+    <record id="chart51_fr" model="account.account.template">
+        <field name="code">51</field>
+        <field name="parent_id" ref="chart5_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CHARGES D'EXPLOITATION</field>
+    </record>
 
-	<record id="chart511_fr" model="account.account.template">
-		<field name="code">511</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">COÛT DES PRODUITS VENDUS</field>
-	</record>
-	
+    <record id="chart511_fr" model="account.account.template">
+        <field name="code">511</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">COÛT DES PRODUITS VENDUS</field>
+    </record>
+    
         <record id="chart5111_fr" model="account.account.template">
-		<field name="code">5111</field>
-		<field name="parent_id" ref="chart511_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Achats</field>
-	</record>
+        <field name="code">5111</field>
+        <field name="parent_id" ref="chart511_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Achats</field>
+    </record>
 
-	<record id="chart5112_fr" model="account.account.template">
-		<field name="code">5112</field>
-		<field name="parent_id" ref="chart511_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Achats dans des provinces harmonisées</field>
-	</record>
-	
-	<record id="chart5113_fr" model="account.account.template">
-		<field name="code">5113</field>
-		<field name="parent_id" ref="chart511_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Achats dans des provinces non-harmonisées</field>
-	</record>
+    <record id="chart5112_fr" model="account.account.template">
+        <field name="code">5112</field>
+        <field name="parent_id" ref="chart511_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Achats dans des provinces harmonisées</field>
+    </record>
+    
+    <record id="chart5113_fr" model="account.account.template">
+        <field name="code">5113</field>
+        <field name="parent_id" ref="chart511_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Achats dans des provinces non-harmonisées</field>
+    </record>
 
-	<record id="chart5114_fr" model="account.account.template">
-		<field name="code">5114</field>
-		<field name="parent_id" ref="chart511_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Achats à l'étranger</field>
-	</record>
+    <record id="chart5114_fr" model="account.account.template">
+        <field name="code">5114</field>
+        <field name="parent_id" ref="chart511_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Achats à l'étranger</field>
+    </record>
 
-	<record id="chart512_fr" model="account.account.template">
-		<field name="code">512</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">SALAIRES ET CHARGES SOCIALES</field>
-	</record>
+    <record id="chart512_fr" model="account.account.template">
+        <field name="code">512</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">SALAIRES ET CHARGES SOCIALES</field>
+    </record>
 
-	<record id="chart51201_fr" model="account.account.template">
-		<field name="code">51201</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Salaires</field>
-	</record>
+    <record id="chart51201_fr" model="account.account.template">
+        <field name="code">51201</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Salaires</field>
+    </record>
 
-	<record id="chart51202_fr" model="account.account.template">
-		<field name="code">51202</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Vacances</field>
-	</record>
+    <record id="chart51202_fr" model="account.account.template">
+        <field name="code">51202</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Vacances</field>
+    </record>
 
-	<record id="chart51203_fr" model="account.account.template">
-		<field name="code">51203</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Assurance Emploi</field>
-	</record>
+    <record id="chart51203_fr" model="account.account.template">
+        <field name="code">51203</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Assurance Emploi</field>
+    </record>
 
-	<record id="chart51204_fr" model="account.account.template">
-		<field name="code">51204</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Fonds des services de santé</field>
-	</record>
+    <record id="chart51204_fr" model="account.account.template">
+        <field name="code">51204</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Fonds des services de santé</field>
+    </record>
 
-	<record id="chart51205_fr" model="account.account.template">
-		<field name="code">51205</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Rentes</field>
-	</record>
+    <record id="chart51205_fr" model="account.account.template">
+        <field name="code">51205</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Rentes</field>
+    </record>
 
-	<record id="chart51206_fr" model="account.account.template">
-		<field name="code">51206</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Assurance parental</field>
-	</record>
+    <record id="chart51206_fr" model="account.account.template">
+        <field name="code">51206</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Assurance parental</field>
+    </record>
 
-	<record id="chart51207_fr" model="account.account.template">
-		<field name="code">51207</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Santé et sécurité au travail</field>
-	</record>
+    <record id="chart51207_fr" model="account.account.template">
+        <field name="code">51207</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Santé et sécurité au travail</field>
+    </record>
 
-	<record id="chart51208_fr" model="account.account.template">
-		<field name="code">51208</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Normes du travail</field>
-	</record>
+    <record id="chart51208_fr" model="account.account.template">
+        <field name="code">51208</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Normes du travail</field>
+    </record>
 
-	<record id="chart513_fr" model="account.account.template">
-		<field name="code">513</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS SUR VENTE</field>
-	</record>
+    <record id="chart513_fr" model="account.account.template">
+        <field name="code">513</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS SUR VENTE</field>
+    </record>
 
-	<record id="chart514_fr" model="account.account.template">
-		<field name="code">514</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS GÉNÉRAUX</field>
-	</record>
+    <record id="chart514_fr" model="account.account.template">
+        <field name="code">514</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS GÉNÉRAUX</field>
+    </record>
 
-	<record id="chart515_fr" model="account.account.template">
-		<field name="code">515</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS DE RECHERCHE ET DÉVELOPPEMENT</field>
-	</record>
+    <record id="chart515_fr" model="account.account.template">
+        <field name="code">515</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS DE RECHERCHE ET DÉVELOPPEMENT</field>
+    </record>
 
-	<record id="chart519_fr" model="account.account.template">
-		<field name="code">519</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES FRAIS D'EXPLOITATION</field>
-	</record>
+    <record id="chart519_fr" model="account.account.template">
+        <field name="code">519</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES FRAIS D'EXPLOITATION</field>
+    </record>
 
-	<record id="chart52_fr" model="account.account.template">
-		<field name="code">52</field>
-		<field name="parent_id" ref="chart5_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS NON LIÉS À L'EXPLOITATION</field>
-	</record>
+    <record id="chart52_fr" model="account.account.template">
+        <field name="code">52</field>
+        <field name="parent_id" ref="chart5_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS NON LIÉS À L'EXPLOITATION</field>
+    </record>
 
-	<record id="chart521_fr" model="account.account.template">
-		<field name="code">521</field>
-		<field name="parent_id" ref="chart52_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTÉRÊTS DÉBITEURS</field>
-	</record>
+    <record id="chart521_fr" model="account.account.template">
+        <field name="code">521</field>
+        <field name="parent_id" ref="chart52_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTÉRÊTS DÉBITEURS</field>
+    </record>
 
-	<record id="chart529_fr" model="account.account.template">
-		<field name="code">529</field>
-		<field name="parent_id" ref="chart52_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
-	</record>
+    <record id="chart529_fr" model="account.account.template">
+        <field name="code">529</field>
+        <field name="parent_id" ref="chart52_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_code_en.xml b/addons/l10n_ca/account_tax_code_en.xml
index bb628a39f15..d446f431c96 100644
--- a/addons/l10n_ca/account_tax_code_en.xml
+++ b/addons/l10n_ca/account_tax_code_en.xml
@@ -2,99 +2,99 @@
 <openerp>
     <data>
 
-	<record model="account.tax.code.template" id="vat_code_tax_en">
-		<field name="name">Tax</field>
-	</record>
-	
-	<record model="account.tax.code.template" id="vat_code_balance_net_en">
-		<field name="name">Tax Balance</field>
-		<field name="parent_id" ref="vat_code_tax_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_tax_en">
+        <field name="name">Tax</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_balance_net_en">
+        <field name="name">Tax Balance</field>
+        <field name="parent_id" ref="vat_code_tax_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tva_en">
-		<field name="name">Taxes paid</field>
-		<field name="parent_id" ref="vat_code_balance_net_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tva_en">
+        <field name="name">Taxes paid</field>
+        <field name="parent_id" ref="vat_code_balance_net_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_gst_en">
-		<field name="name">GST paid</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_gst_en">
+        <field name="name">GST paid</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_pst_en">
-		<field name="name">PST paid</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_pst_en">
+        <field name="name">PST paid</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_hst_en">
-		<field name="name">HST paid</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_hst_en">
+        <field name="name">HST paid</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_en">
-		<field name="name">Taxes received</field>
-		<field name="parent_id" ref="vat_code_balance_net_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_en">
+        <field name="name">Taxes received</field>
+        <field name="parent_id" ref="vat_code_balance_net_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_gst_en">
-		<field name="name">GST received</field>
-		<field name="parent_id" ref="vat_code_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_gst_en">
+        <field name="name">GST received</field>
+        <field name="parent_id" ref="vat_code_payable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_pst_en">
-		<field name="name">PST received</field>
-		<field name="parent_id" ref="vat_code_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_pst_en">
+        <field name="name">PST received</field>
+        <field name="parent_id" ref="vat_code_payable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_hst_en">
-		<field name="name">HST received</field>
-		<field name="parent_id" ref="vat_code_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_hst_en">
+        <field name="name">HST received</field>
+        <field name="parent_id" ref="vat_code_payable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_net_en">
-		<field name="name">Taxes Base</field>
-		<field name="parent_id" ref="vat_code_tax_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_net_en">
+        <field name="name">Taxes Base</field>
+        <field name="parent_id" ref="vat_code_tax_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_en">
-		<field name="name">Base of Sales Tax</field>
-		<field name="parent_id" ref="vat_code_base_net_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_en">
+        <field name="name">Base of Sales Tax</field>
+        <field name="parent_id" ref="vat_code_base_net_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_gst_en">
-		<field name="name">Base of GST for Sales</field>
-		<field name="parent_id" ref="vat_code_base_receivable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_gst_en">
+        <field name="name">Base of GST for Sales</field>
+        <field name="parent_id" ref="vat_code_base_receivable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_pst_en">
-		<field name="name">Base of PST for Sales</field>
-		<field name="parent_id" ref="vat_code_base_receivable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_pst_en">
+        <field name="name">Base of PST for Sales</field>
+        <field name="parent_id" ref="vat_code_base_receivable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_hst_en">
-		<field name="name">Base of HST for Sales</field>
-		<field name="parent_id" ref="vat_code_base_receivable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst_en">
+        <field name="name">Base of HST for Sales</field>
+        <field name="parent_id" ref="vat_code_base_receivable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_en">
-		<field name="name">Base of Purchases Tax</field>
-		<field name="parent_id" ref="vat_code_base_net_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_en">
+        <field name="name">Base of Purchases Tax</field>
+        <field name="parent_id" ref="vat_code_base_net_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_gst_en">
-		<field name="name">Base of GST for Purchases</field>
-		<field name="parent_id" ref="vat_code_base_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_gst_en">
+        <field name="name">Base of GST for Purchases</field>
+        <field name="parent_id" ref="vat_code_base_payable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_pst_en">
-		<field name="name">Base of PST for Purchases</field>
-		<field name="parent_id" ref="vat_code_base_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_pst_en">
+        <field name="name">Base of PST for Purchases</field>
+        <field name="parent_id" ref="vat_code_base_payable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_hst_en">
-		<field name="name">Base of HST for Purchases</field>
-		<field name="parent_id" ref="vat_code_base_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst_en">
+        <field name="name">Base of HST for Purchases</field>
+        <field name="parent_id" ref="vat_code_base_payable_en"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_code_fr.xml b/addons/l10n_ca/account_tax_code_fr.xml
index d8abf73dd93..2b6acd2b992 100644
--- a/addons/l10n_ca/account_tax_code_fr.xml
+++ b/addons/l10n_ca/account_tax_code_fr.xml
@@ -2,99 +2,99 @@
 <openerp>
     <data>
 
-	<record model="account.tax.code.template" id="vat_code_tax_fr">
-		<field name="name">Taxes</field>
-	</record>
-	
-	<record model="account.tax.code.template" id="vat_code_balance_net_fr">
-		<field name="name">Balance des taxes à payer</field>
-		<field name="parent_id" ref="vat_code_tax_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_tax_fr">
+        <field name="name">Taxes</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_balance_net_fr">
+        <field name="name">Balance des taxes à payer</field>
+        <field name="parent_id" ref="vat_code_tax_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tva_fr">
-		<field name="name">Taxes payées</field>
-		<field name="parent_id" ref="vat_code_balance_net_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tva_fr">
+        <field name="name">Taxes payées</field>
+        <field name="parent_id" ref="vat_code_balance_net_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tps_fr">
-		<field name="name">TPS payée</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tps_fr">
+        <field name="name">TPS payée</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tvp_fr">
-		<field name="name">TVP/TVQ payée</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tvp_fr">
+        <field name="name">TVP/TVQ payée</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tvh_fr">
-		<field name="name">TVH payée</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tvh_fr">
+        <field name="name">TVH payée</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_fr">
-		<field name="name">Taxes reçues</field>
-		<field name="parent_id" ref="vat_code_balance_net_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_fr">
+        <field name="name">Taxes reçues</field>
+        <field name="parent_id" ref="vat_code_balance_net_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_tps_fr">
-		<field name="name">TPS reçue</field>
-		<field name="parent_id" ref="vat_code_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_tps_fr">
+        <field name="name">TPS reçue</field>
+        <field name="parent_id" ref="vat_code_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_tvp_fr">
-		<field name="name">TVP/TVQ reçue</field>
-		<field name="parent_id" ref="vat_code_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_tvp_fr">
+        <field name="name">TVP/TVQ reçue</field>
+        <field name="parent_id" ref="vat_code_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_tvh_fr">
-		<field name="name">TVH reçue</field>
-		<field name="parent_id" ref="vat_code_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_tvh_fr">
+        <field name="name">TVH reçue</field>
+        <field name="parent_id" ref="vat_code_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_net_fr">
-		<field name="name">Base de taxes</field>
-		<field name="parent_id" ref="vat_code_tax_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_net_fr">
+        <field name="name">Base de taxes</field>
+        <field name="parent_id" ref="vat_code_tax_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_fr">
-		<field name="name">Base des taxes de ventes</field>
-		<field name="parent_id" ref="vat_code_base_net_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_fr">
+        <field name="name">Base des taxes de ventes</field>
+        <field name="parent_id" ref="vat_code_base_net_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_tps_fr">
-		<field name="name">Base de la TPS pour les ventes</field>
-		<field name="parent_id" ref="vat_code_base_receivable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_tps_fr">
+        <field name="name">Base de la TPS pour les ventes</field>
+        <field name="parent_id" ref="vat_code_base_receivable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_tvp_fr">
-		<field name="name">Base de la TVP/TVQ pour les ventes</field>
-		<field name="parent_id" ref="vat_code_base_receivable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_tvp_fr">
+        <field name="name">Base de la TVP/TVQ pour les ventes</field>
+        <field name="parent_id" ref="vat_code_base_receivable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_tvh_fr">
-		<field name="name">Base de la TVH pour les ventes</field>
-		<field name="parent_id" ref="vat_code_base_receivable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_tvh_fr">
+        <field name="name">Base de la TVH pour les ventes</field>
+        <field name="parent_id" ref="vat_code_base_receivable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_fr">
-		<field name="name">Base des taxes d'achats</field>
-		<field name="parent_id" ref="vat_code_base_net_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_fr">
+        <field name="name">Base des taxes d'achats</field>
+        <field name="parent_id" ref="vat_code_base_net_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_tps_fr">
-		<field name="name">Base de la TPS pour les achats</field>
-		<field name="parent_id" ref="vat_code_base_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_tps_fr">
+        <field name="name">Base de la TPS pour les achats</field>
+        <field name="parent_id" ref="vat_code_base_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_tvp_fr">
-		<field name="name">Base de la TVP/TVQ pour les achats</field>
-		<field name="parent_id" ref="vat_code_base_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_tvp_fr">
+        <field name="name">Base de la TVP/TVQ pour les achats</field>
+        <field name="parent_id" ref="vat_code_base_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_tvh_fr">
-		<field name="name">Base de la TVH pour les achats</field>
-		<field name="parent_id" ref="vat_code_base_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_tvh_fr">
+        <field name="name">Base de la TVH pour les achats</field>
+        <field name="parent_id" ref="vat_code_base_payable_fr"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml
index 54f9c21b5e1..68e881c3541 100644
--- a/addons/l10n_ca/fiscal_templates_en.xml
+++ b/addons/l10n_ca/fiscal_templates_en.xml
@@ -2,656 +2,656 @@
 <openerp>
     <data>
 
-	<!-- Fiscal Position Templates -->
+    <!-- Fiscal Position Templates -->
 
-	<record id="fiscal_position_template_1_en" model="account.fiscal.position.template">
-		<field name="name">Provincial Regime</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_1_en" model="account.fiscal.position.template">
+        <field name="name">Provincial Regime</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_21_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (12%)</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_21_en" model="account.fiscal.position.template">
+        <field name="name">Harmonized Provinces Regime (12%)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_22_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (13%)</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_22_en" model="account.fiscal.position.template">
+        <field name="name">Harmonized Provinces Regime (13%)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_23_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (13.5%)</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_23_en" model="account.fiscal.position.template">
+        <field name="name">Harmonized Provinces Regime (13.5%)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_24_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (15%)</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_24_en" model="account.fiscal.position.template">
+        <field name="name">Harmonized Provinces Regime (15%)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_3_en" model="account.fiscal.position.template">
-		<field name="name">Non-Harmonized Provinces Regime</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_3_en" model="account.fiscal.position.template">
+        <field name="name">Non-Harmonized Provinces Regime</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_4_en" model="account.fiscal.position.template">
-		<field name="name">International Regime</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_4_en" model="account.fiscal.position.template">
+        <field name="name">International Regime</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
         <!-- PURCHASES TAXES -->
 
-	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
+    <!--  Alberta Fiscal Position Tax Templates (default is gst) -->
 
-	<record id="fiscal_position_tax_template_21_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+    </record>
 
-	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+    </record>
 
-	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
+    <!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+    </record>
 
-	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+    </record>
 
-	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+    </record>
 
-	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
+    <!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+    </record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
+    <!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+    </record>
 
-	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
+    <!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+    </record>
 
 
         <!-- SALES TAXES -->
 
 
-	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
+    <!--  Alberta Fiscal Position Tax Templates (default is gst) -->
 
-	<record id="fiscal_position_tax_template_21_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+    </record>
 
-	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12c_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_12c_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_12_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_12_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_12_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_12_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_12_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_12_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_12_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_12_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+    </record>
 
-	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
+    <!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+    </record>
 
-	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+    </record>
 
-	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+    </record>
 
-	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
+    <!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+    </record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
+    <!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+    </record>
 
-	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
+    <!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_4_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+    </record>
 
-	<!-- Fiscal Position Account Templates - Products -->
+    <!-- Fiscal Position Account Templates - Products -->
 
-	<record id="fiscal_position_product_template_21_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart412_en" />
-	</record>
+    <record id="fiscal_position_product_template_21_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart412_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_22_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart412_en" />
-	</record>
+    <record id="fiscal_position_product_template_22_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart412_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_23_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart412_en" />
-	</record>
+    <record id="fiscal_position_product_template_23_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart412_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_24_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart412_en" />
-	</record>
+    <record id="fiscal_position_product_template_24_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart412_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_3_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart413_en" />
-	</record>
+    <record id="fiscal_position_product_template_3_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart413_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_4_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart414_en" />
-	</record>
+    <record id="fiscal_position_product_template_4_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart414_en" />
+    </record>
 
-	<!-- Fiscal Position Account Templates - Charges -->
+    <!-- Fiscal Position Account Templates - Charges -->
 
-	<record id="fiscal_position_charge_template_21_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5112_en" />
-	</record>
+    <record id="fiscal_position_charge_template_21_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5112_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_22_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5112_en" />
-	</record>
+    <record id="fiscal_position_charge_template_22_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5112_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_23_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5112_en" />
-	</record>
+    <record id="fiscal_position_charge_template_23_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5112_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_24_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5112_en" />
-	</record>
+    <record id="fiscal_position_charge_template_24_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5112_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_3_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5113_en" />
-	</record>
+    <record id="fiscal_position_charge_template_3_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5113_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_4_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5114_en" />
-	</record>
+    <record id="fiscal_position_charge_template_4_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5114_en" />
+    </record>
 
     </data>
 </openerp>    
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 0acd7388a52..722517366a8 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -2,656 +2,656 @@
 <openerp>
     <data>
 
-	<!-- Fiscal Position Templates -->
+    <!-- Fiscal Position Templates -->
 
-	<record id="fiscal_position_template_1_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provincial</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_1_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provincial</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_21_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Harmonisées (12%)</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_21_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Harmonisées (12%)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_22_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Harmonisées (13%)</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_22_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Harmonisées (13%)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_23_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Harmonisées (13.5%)</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_23_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Harmonisées (13.5%)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_24_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Harmonisées (15%)</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_24_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Harmonisées (15%)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_3_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Non-Harmonisées</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_3_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Non-Harmonisées</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_4_fr" model="account.fiscal.position.template">
-		<field name="name">Régime International</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_4_fr" model="account.fiscal.position.template">
+        <field name="name">Régime International</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
         <!-- PURCHASES TAXES -->
 
-	<!--  Alberta Fiscal Position Tax Templates (default is tps) -->
+    <!--  Alberta Fiscal Position Tax Templates (default is tps) -->
 
-	<record id="fiscal_position_tax_template_21_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+    </record>
 
-	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
+    <!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+    </record>
 
-	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
+    <!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+    </record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
+    <!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+    </record>
 
-	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
+    <!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+    </record>
 
 
         <!-- SALES TAXES -->
 
 
-	<!--  Alberta Fiscal Position Tax Templates (default is tps) -->
+    <!--  Alberta Fiscal Position Tax Templates (default is tps) -->
 
-	<record id="fiscal_position_tax_template_21_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+    </record>
 
-	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12c_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_12c_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_12_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_12_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_12_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_12_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_12_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_12_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_12_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_12_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
+    <!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+    </record>
 
-	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
+    <!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+    </record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
+    <!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+    </record>
 
-	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
+    <!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_4_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_4_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+    </record>
 
-	<!-- Fiscal Position Account Templates - Products -->
+    <!-- Fiscal Position Account Templates - Products -->
 
-	<record id="fiscal_position_product_template_21_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart412_fr" />
-	</record>
+    <record id="fiscal_position_product_template_21_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart412_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_22_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart412_fr" />
-	</record>
+    <record id="fiscal_position_product_template_22_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart412_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_23_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart412_fr" />
-	</record>
+    <record id="fiscal_position_product_template_23_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart412_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_24_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart412_fr" />
-	</record>
+    <record id="fiscal_position_product_template_24_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart412_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_3_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart413_fr" />
-	</record>
+    <record id="fiscal_position_product_template_3_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart413_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_4_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart414_fr" />
-	</record>
+    <record id="fiscal_position_product_template_4_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart414_fr" />
+    </record>
 
-	<!-- Fiscal Position Account Templates - Charges -->
+    <!-- Fiscal Position Account Templates - Charges -->
 
-	<record id="fiscal_position_charge_template_21_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5112_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_21_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5112_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_22_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5112_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_22_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5112_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_23_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5112_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_23_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5112_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_24_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5112_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_24_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5112_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_3_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5113_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_3_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5113_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_4_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5114_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_4_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5114_fr" />
+    </record>
 
     </data>
 </openerp>    

From 3b13bdd427bad4503fe951a50810c22eed01abd8 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 30 Jul 2012 11:48:37 +0200
Subject: [PATCH 267/312] [IMP] remove dirty tabs, improve identation

bzr revid: abo@openerp.com-20120730094837-5nu4sctbtgzl9rdp
---
 addons/purchase/purchase_view.xml | 135 +++++++++++++++---------------
 1 file changed, 67 insertions(+), 68 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 682e9de3b2c..7f8742d3bd8 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -7,6 +7,7 @@
             id="base.menu_purchase_root"
             groups="group_purchase_manager,group_purchase_user"
             sequence="40"/>
+
         <menuitem id="menu_procurement_management" name="Purchase"
             parent="base.menu_purchase_root" sequence="1" />
 
@@ -54,12 +55,12 @@
             action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories"
             parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/>
 
-    <!--supplier menu-->
+    <!--Supplier menu-->
     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
         parent="menu_procurement_management"
         action="base.action_partner_supplier_form" sequence="15"/>
 
-          <!--Inventory control-->
+      <!--Inventory control-->
       <menuitem id="menu_procurement_management_inventory" name="Receive Products"
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
@@ -80,11 +81,11 @@
         <field name="domain">[('type','=','in_invoice')]</field>
         <field name="context">{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
         <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">
-                Use this menu to control the invoices to be received from your supplier.
-                OpenERP generates draft invoices from your purchase orders or receptions, according to your settings.
-                Once you receive a supplier invoice, you can match it with the draft invoice and validate it.
-            </field>
+        <field name="help">
+            Use this menu to control the invoices to be received from your supplier.
+            OpenERP generates draft invoices from your purchase orders or receptions, according to your settings.
+            Once you receive a supplier invoice, you can match it with the draft invoice and validate it.
+        </field>
     </record>
 
      <menuitem name="Based on Draft Invoices"
@@ -93,7 +94,7 @@
           parent="menu_procurement_management_invoice"
           sequence="13"/>
 
-      <!--product menu-->
+      <!-- Product menu-->
       <menuitem id="menu_procurement_management_product" name="Products"
           parent="base.menu_purchase_root" sequence="8"/>
 
@@ -140,7 +141,7 @@
             <field name="key2">client_action_multi</field>
         </record>
 
-       <record model="ir.ui.view" id="purchase_order_calendar">
+        <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
             <field name="model">purchase.order</field>
             <field name="type">calendar</field>
@@ -223,11 +224,11 @@
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
                                 <div class="oe_subtotal_footer_separator oe_inline">
-				    <label for="amount_total"/>
+                                    <label for="amount_total"/>
                                     <button name="button_dummy"
-				    	states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                                        states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
                                 </div>
-			        <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
+                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
                             </group>
                             <div class="oe_clear"/>
                             <label for="notes"/>
@@ -245,7 +246,7 @@
                                     <field name="invoice_method"/>
                                     <field name="invoiced"/>
                                     <field name="fiscal_position"/>
-				    <!-- we do not need these fields anymore, the information is in open chatter -->
+                                    <!-- We do not need these fields anymore, the information is in open chatter -->
                                     <field name="validator" groups="base.group_no_one"/>
                                     <field name="date_approve" groups="base.group_no_one"/>
                                 </group>
@@ -256,7 +257,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                   <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -268,29 +269,29 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                 <group>
-                    <field name="name" string="Reference"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-                </group>
-              </search>
+                    <group>
+                        <field name="name" string="Reference"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
+                        <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                        <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="product_id"/>
+                        <field name="create_uid"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -300,34 +301,34 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                 <group>
-                    <field name="name" string="Reference"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-mail-message-new"
-                        string="Inbox" help="Unread messages"
-                        name="needaction_pending"
-                        domain="[('needaction_pending','=',True)]"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-                </group>
-              </search>
+                    <group>
+                        <field name="name" string="Reference"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-mail-message-new"
+                            string="Inbox" help="Unread messages"
+                            name="needaction_pending"
+                            domain="[('needaction_pending','=',True)]"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+                        <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                        <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="product_id"/>
+                        <field name="create_uid"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -559,9 +560,7 @@
             parent="menu_procurement_management_invoice"
             sequence="72"/>
 
-        <!--
-            Procurements
-        -->
+        <!-- Procurements -->
 
         <record id="view_procurement_form_inherit" model="ir.ui.view">
             <field name="name">procurement.order.form.inherit</field>

From 11e85bec65269a6bf8b6102c978589711e0ba098 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Jul 2012 17:37:14 +0530
Subject: [PATCH 268/312] [IMP] improved search view.

bzr revid: tpa@tinyerp.com-20120730120714-flizwpfl7gr7bmgw
---
 openerp/addons/base/ir/ir.xml                 | 134 +++++++-----------
 openerp/addons/base/ir/ir_filters.xml         |   3 +-
 .../addons/base/ir/workflow/workflow_view.xml |  13 +-
 openerp/addons/base/module/module_view.xml    |  26 ++--
 openerp/addons/base/res/ir_property_view.xml  |   2 -
 openerp/addons/base/res/res_bank_view.xml     |   2 -
 openerp/addons/base/res/res_company_view.xml  |   4 +-
 openerp/addons/base/res/res_lang_view.xml     |  14 +-
 openerp/addons/base/res/res_partner_view.xml  |  30 ++--
 9 files changed, 84 insertions(+), 144 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 25537cef4b3..ffdb4e4e247 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -71,7 +71,6 @@
                     <field name="name"
                         filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
                         string="Client Action"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
@@ -203,7 +202,6 @@
                 <search string="Sequences">
                     <field name="name" string="Sequence"/>
                     <field name="code"/>
-                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
@@ -392,12 +390,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Report Xml">
-                    <group col="10" colspan="4">
-                        <field name="name"
-                            filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
-                            string="Report"/>
-                    </group>
-                    <newline/>
+                    <field name="name"
+                        filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
+                        string="Report"/>
                     <group expand="0" string="Group By" colspan="4">
                         <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'report_type'}"/>
                     </group>
@@ -499,11 +494,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Open a Window">
-                    <group col="10" colspan="4">
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
-                        <field name="view_type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
+                    <field name="view_type"/>
                     <group expand="0" string="Group By" colspan="4">
                         <filter string="View Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'view_type'}"/>
                     </group>
@@ -661,7 +653,6 @@
             <field name="arch" type="xml">
                 <search string="Views">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-stock_zoom"
                         string="Search"
                         domain="[('type', '=', 'search')]"/>
@@ -671,10 +662,8 @@
                     <filter icon="gtk-new"
                         string="Form"
                         domain="[('type', '=','form')]"/>
-                    <separator orientation="vertical"/>
                     <field name="inherit_id"/>
                     <field name="type"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -802,31 +791,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Attachments">
-                    <group colspan="4" col="10">
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
-                        <field name="create_date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-stage"
-                            string="URL"
-                            domain="[('type','=','url')]"/>
-                        <filter icon="terp-stock_align_left_24"
-                            string="Binary"
-                            domain="[('type','=','binary')]"/>
-                        <filter name="my_documents_filter" 
-                            string="My Document(s)"
-                            icon="terp-personal"
-                            domain="[('create_uid','=',uid)]"
-                            help="Filter on my documents"/>
-                        <separator orientation="vertical"/>
-                        <field name="create_uid"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
+                    <field name="create_date"/>
+                    <filter icon="terp-stage"
+                        string="URL"
+                        domain="[('type','=','url')]"/>
+                    <filter icon="terp-stock_align_left_24"
+                        string="Binary"
+                        domain="[('type','=','binary')]"/>
+                    <separator/>
+                    <filter name="my_documents_filter" 
+                        string="My Document(s)"
+                        icon="terp-personal"
+                        domain="[('create_uid','=',uid)]"
+                        help="Filter on my documents"/>
+                    <field name="create_uid"/>
+                    <field name="type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
                         <filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
                         <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
@@ -955,10 +939,10 @@
             <field name="arch" type="xml">
                 <search string="Model Description">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"
                         string="In Memory"
                         domain="[('osv_memory', '=', True)]"/>
+                    <separator/>
                     <filter icon="terp-stock_align_left_24"
                         string="Custom"
                         domain="[('state', '=', 'manual')]"/>
@@ -1035,22 +1019,21 @@
             <field name="arch" type="xml">
                 <search string="Fields">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+"
                         string="Required"
                         domain="[('required', '=', True)]"/>
+                    <separator/>
                     <filter icon="terp-dialog-close"
                         string="Readonly"
                         domain="[('readonly', '=', True)]"/>
+                    <separator/>
                     <filter icon="terp-translate"
                         string="Translate"
                         domain="[('translate', '=', True)]"/>
-                    <newline/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
@@ -1107,14 +1090,11 @@
                     <field name="name"
                         filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]"
                         string="External Identifier"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"
                         string="Updatable"
                         domain="[('noupdate', '=', False)]"/>
-                    <separator orientation="vertical"/>
                     <field name="res_id"/>
                     <field name="noupdate"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -1240,7 +1220,6 @@
                     <filter icon="terp-gdu-smart-failing"
                         string="Untranslated"
                         domain="['|',('value', '=', False),('value','=','')]"/>
-                    <separator orientation="vertical"/>
                     <field name="lang"/>
                     <field name="src"/>
                     <field name="value"/>
@@ -1469,11 +1448,9 @@
             <field name="arch" type="xml">
                 <search string="Scheduled Actions">
                     <field name="name" string="Scheduled Action"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id" widget="selection"/>
+                    <field name="user_id"/>
                     <field name="nextcall"/>
                     <field name="active"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Execution" icon="terp-go-month"
@@ -1554,18 +1531,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Access Controls">
-                    <group>
-                        <field name="name" string="Access Control"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
-                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
-                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
-                        <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                        <field name="group_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Access Control"/>
+                    <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+                    <separator/>
+                    <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                    <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
+                    <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
+                    <field name="model_id"/>
+                    <field name="group_id"/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
                         <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
@@ -1651,17 +1624,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Record Rules">
-                    <group>
-                        <field name="name" string="Record Rule"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
-                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
-                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
-                        <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                        <field name="groups"/>
-                    </group>
+                    <field name="name" string="Record Rule"/>
+                    <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
+                    <separator/>
+                    <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                    <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
+                    <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
+                    <field name="model_id"/>
+                    <field name="groups"/>
                 </search>
             </field>
         </record>
@@ -1794,13 +1764,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Server Actions">
-                    <group col="10" colspan="4">
-                        <field name="name" string="Server Action"/>
-                    <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Server Action"/>
+                    <field name="model_id"/>
+                    <field name="state"/>
                     <group expand="0" string="Group By" colspan="4" col="4">
                         <filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -1878,14 +1844,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Actions">
-                    <group>
-                        <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
-                        <separator orientation="vertical"/>
-                        <field name="action_id"/>
-                        <field name="category_id"/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
+                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
+                    <field name="action_id"/>
+                    <field name="category_id"/>
+                    <field name="state"/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" context="{'group_by': 'category_id'}" icon="terp-folder-orange"/>
                     </group>
diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index 55ebd11de4a..fec6b0a604e 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -54,13 +54,12 @@
             <field name="arch" type="xml">
                 <search string="Filters">
                     <field name="name" string="Filter Name"/>
-                    <separator orientation="vertical"/>
                     <filter string="Personal" domain="[('user_id','!=',False)]" help="Filters visible only for one user"/>
                     <filter string="Shared" domain="[('user_id','=',False)]" help="Filters shared with all users"/>
+                    <separator/>
                     <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
                         name="my_filters"
                         string="My Filters"/>
-                    <separator orientation="vertical"/>
                     <field name="model_id"/>
                     <field name="user_id"/>
                 </search>
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index 00662a68f29..f27755e2987 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -164,16 +164,14 @@
         <field name="arch" type="xml">
             <search string="Workflow Activity">
                 <field name="name" string="Workflow Activity"/>
-                <separator orientation="vertical"/>
                 <filter icon="terp-camera_test" string="Flow Start"
                 domain="[('flow_start', '=',True)]" />
+                <separator/>
                 <filter icon="terp-gtk-stop" string="Flow Stop"
                 domain="[('flow_stop', '=',True)]" />
-                <separator orientation="vertical"/>
                 <field name="wkf_id"/>
                 <field name="action_id"/>
                 <field name="kind"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
                 </group>
@@ -242,7 +240,6 @@
         <field name="arch" type="xml">
             <search string="Transition">
                 <field name="signal" filter_domain="['|', ('signal','ilike',self), ('condition','ilike',self)]" string="Workflow Transition"/>
-                <separator orientation="vertical"/>
                 <field name="act_from"/>
                 <field name="act_to"/>
             </search>
@@ -301,10 +298,8 @@
         <field name="arch" type="xml">
             <search string="Workflow Instances">
                 <field name="res_type" string="Resource Object"/>
-                <separator orientation="vertical"/>
                 <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
-                <separator orientation="vertical"/>
-                <field name="wkf_id" widget="selection"/>
+                <field name="wkf_id"/>
                 <field name="res_id"/>
                 <field name="state"/>
         </search>
@@ -366,10 +361,8 @@
         <field name="arch" type="xml">
             <search string="Workflow Workitems">
                 <field name="state" string="State"/>
-                <separator orientation="vertical"/>
                 <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
-                <separator orientation="vertical"/>
-                <field name="wkf_id" widget="selection"/>
+                <field name="wkf_id"/>
                 <field name="act_id"/>
                 <field name="subflow_id"/>
                 <field name="inst_id"/>
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index bd74abfa92d..8e12b9c932a 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -41,21 +41,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search modules">
-                    <group col='10' colspan='4'>
-                        <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
-                        <field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
-                        <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
-                        <filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
-                        <filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
-                        <separator orientation="vertical"/>
-                        <field name="category_id"/>
-                        <newline/>
-                        <group expand="0" string="Group By...">
-                            <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
-                            <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
-                        </group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
+                    <field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
+                    <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
+                    <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
+                    <filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
+                    <field name="category_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                     </group>
                </search>
             </field>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 8ca8e98bb32..b7d3324b3f6 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -9,12 +9,10 @@
             <field name="arch" type="xml">
                 <search string="Parameters">
                     <field name="name" string="Name"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-project"
                         string="Generic"
                         help="Parameters that are used by all resources."
                         domain="[('res_id','=',False)]"/>
-                    <separator orientation="vertical"/>
                     <field name="fields_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </search>
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 13419f7a881..4409f23a501 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -146,9 +146,7 @@
             <field name="arch" type="xml">
                 <search string="Bank Accounts">
                     <field name="bank_name" filter_domain="['|', ('bank_name','ilike',self), ('acc_number','ilike',self)]" string="Bank Name"/>
-                    <separator orientation="vertical"/>
                     <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
-                    <separator orientation="vertical"/>
                     <field name="company_id" invisible="context.get('company_hide', True)"/>
                     <field name="partner_id"/>
                 </search>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 6e46ce4e073..8637da10f4c 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -178,8 +178,8 @@
             <field name="arch" type="xml">
                 <search string="Multi Company">
                     <field name="name" string="Name"/>
-                    <field name="company_id" widget="selection"/>
-                    <field name="company_dest_id" widget="selection"/>
+                    <field name="company_id"/>
+                    <field name="company_dest_id"/>
                     <field name="object_id"/>
                 </search>
             </field>
diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml
index c7811ce4d09..3d91b977dab 100644
--- a/openerp/addons/base/res/res_lang_view.xml
+++ b/openerp/addons/base/res/res_lang_view.xml
@@ -108,15 +108,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Languages">
-                     <group>
-                        <field name="name"
-                            filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
-                            string="Language"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="direction"/>
-                    </group>
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
+                        string="Language"/>
+                    <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
+                    <field name="direction"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index b5b7c4366f9..27caa708cb6 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -245,22 +245,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Partner">
-                   <group col='10' colspan='4'>
-                        <field name="name"
-                            filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
-                            string="Partner"/>
-                        <separator orientation="vertical"/>
-                        <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
-                        <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
-                        <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
-                        <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-                        <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-                        <separator orientation="vertical"/>
-                        <field name="category_id"/>
-                        <field name="user_id"/>
-                        <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
-                   </group>
-                   <newline />
+                   <field name="name"
+                       filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
+                       string="Partner"/>
+                   <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
+                   <separator/>
+                   <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
+                   <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
+                   <separator/>
+                   <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                   <separator/>
+                   <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                   <field name="category_id"/>
+                   <field name="user_id"/>
+                   <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
                    <group expand="0" string="Group By...">
                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
                        <filter string="Company" context="{'group_by': 'parent_id'}"/>

From c5429e357c54fd78880236d7677aa1d1e6e93838 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 30 Jul 2012 14:42:28 +0200
Subject: [PATCH 269/312] [FIX] give access to stock.picking.out instead of
 stock.picking the chatter is now properly displayed in the Delivery Orders

bzr revid: abo@openerp.com-20120730124228-vd6mtk3erhxj5b9h
---
 addons/portal_sale/portal_sale_view.xml         | 2 +-
 addons/portal_sale/security/ir.model.access.csv | 1 +
 addons/portal_sale/security/portal_security.xml | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index b868d89b920..7743573fda6 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -4,7 +4,7 @@
 
         <record id="action_picking_tree" model="ir.actions.act_window">
             <field name="name">Delivery Orders</field>
-            <field name="res_model">stock.picking</field>
+            <field name="res_model">stock.picking.out</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/portal_sale/security/ir.model.access.csv b/addons/portal_sale/security/ir.model.access.csv
index 5a016f00a05..32266499af7 100644
--- a/addons/portal_sale/security/ir.model.access.csv
+++ b/addons/portal_sale/security/ir.model.access.csv
@@ -2,6 +2,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sale_order,sale.order,sale.model_sale_order,portal.group_portal_member,1,0,0,0
 access_sale_order_line,sale.order.line,sale.model_sale_order_line,portal.group_portal_member,1,0,0,0
 access_stock_picking,stock.picking,stock.model_stock_picking,portal.group_portal_member,1,0,0,0
+access_stock_picking.out,stock.picking.out,stock.model_stock_picking_out,portal.group_portal_member,1,0,0,0
 access_stock_move,stock.move,stock.model_stock_move,portal.group_portal_member,1,0,0,0
 access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,portal.group_portal_member,1,0,0,0
 access_account_invoice,account.invoice,account.model_account_invoice,portal.group_portal_member,1,0,0,0
diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index 9eb90224b5a..f69fd283db6 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -17,6 +17,13 @@
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
 
+        <record id="portal_stock_picking_user_rule" model="ir.rule">
+            <field name="name">Portal Personal Delivery Orders Out</field>
+            <field ref="stock.model_stock_picking_out" name="model_id"/>
+            <field name="domain_force">[('partner_id','child_of',[user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+        </record>
+
         <record id="portal_account_invoice_user_rule" model="ir.rule">
             <field name="name">Portal Personal Account Invoices</field>
             <field ref="account.model_account_invoice" name="model_id"/>

From d14c62fbe803f22c1fc9e9a6c8e62b8fd4a211cf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 30 Jul 2012 15:28:40 +0200
Subject: [PATCH 270/312] [IMP] copywriting summary of modules

bzr revid: fp@openerp.com-20120730132840-bchv2hmp40uqkwvb
---
 addons/account_accountant/__openerp__.py | 2 +-
 addons/account_voucher/__openerp__.py    | 2 +-
 addons/crm/__openerp__.py                | 2 +-
 addons/event/__openerp__.py              | 2 +-
 addons/hr/__openerp__.py                 | 2 +-
 addons/hr_evaluation/__openerp__.py      | 2 +-
 addons/hr_holidays/__openerp__.py        | 2 +-
 addons/hr_recruitment/__openerp__.py     | 2 +-
 addons/hr_timesheet_sheet/__openerp__.py | 4 ++--
 addons/mail/__openerp__.py               | 2 +-
 addons/mrp/__openerp__.py                | 2 +-
 addons/point_of_sale/__openerp__.py      | 2 +-
 addons/project_issue/__openerp__.py      | 2 +-
 addons/purchase/__openerp__.py           | 2 +-
 addons/sale/__openerp__.py               | 2 +-
 addons/stock/__openerp__.py              | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index ff4e3faa3b6..7c97112b875 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -24,7 +24,7 @@
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
     "sequence": 10,
-    "summary": "Accounts Moves, Journals, Chart of Accounts",
+    "summary": "Financial and Analytic Accounting",
     "description": """
 Accounting Access Rights.
 =========================
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 0b37bdbd4a2..135c2bc828b 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "eInvoicing & Payments",
     "version" : "1.0",
     "author" : 'OpenERP SA',
-    "summary": 'Supplier & Customer Invoices, Payments',
+    "summary": 'Send Invoices and Track Payments',
     "description": """
 eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra.
 ==============================================================================================================================================================================================
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 6b0d0e1e2c9..643908c1098 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Customer Relationship Management',
     "sequence": 2,
-    "summary": "Agenda, Leads, Opportunities",
+    "summary": "Leads, Opportunities, Agenda",
     'description': """
 The generic OpenERP Customer Relationship Management.
 =====================================================
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 34707d1c0f6..75c79f06835 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -25,7 +25,7 @@
     'name': 'Events Organisation',
     'version': '0.1',
     'category': 'Tools',
-    'summary': 'Invitations, Subscriptions',
+    'summary': 'For Trainings, Conferences & Meetings',
     'description': """
 Organization and management of Events.
 ======================================
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index ebf8d7ba83e..39dad795c0b 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -26,7 +26,7 @@
     "category": "Human Resources",
     "sequence": 12,
     "website": "http://www.openerp.com",
-    "summary": "Hierarchy, Jobs, Departments",
+    "summary": "All Infos on Employees",
     "description": """
 Module for Human Resource Management.
 =====================================
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 4748883b1ce..bb1322bccf3 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -25,7 +25,7 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "website": "http://www.openerp.com",
-    "summary": "Top-Down and Bottom-Up Evaluation",
+    "summary": "Periodical Evaluations, Surveys",
     "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"],
     "depends": ["hr","base_calendar","survey"],
     "description": """
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index c8c2bad3489..45dd9ea39a5 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -26,7 +26,7 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "sequence": 28,
-    "summary": "Allocation and Leave Requests, Reporting by Department",
+    "summary": "Holidays, Allocation and Leave Requests",
     "website": "http://www.openerp.com",
     "description": """
 This module allows you to manage leaves and leave's requests.
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index fe6c86c684d..0de2eb5c94e 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 24,
-    "summary": "Job Descriptions, Recruitment Process",
+    "summary": "Recruitment Process, Job Descriptions",
     'description': """
 Manages job positions and the recruitment process.
 ==================================================
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index cc788d95a83..1acaa5780b8 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    'name': 'Timesheets Validation',
+    'name': 'Timesheets',
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 16,
-    "summary": "Attendances, Activities, Timing",
+    "summary": "Timesheets, Attendances, Activities",
     'description': """
 This module helps you to easily encode and validate timesheet and attendances within the same view.
 ===================================================================================================
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index ee22b0c153f..323a647c334 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category':'Social Network',
     "sequence": 2,
-    "summary": "Discussions, Feeds, Alerts",
+    "summary": "Discussions, Mailing Lists, News",
     'description': """
 A bussiness oriented Social Networking with a fully-integrated email 
 and message management.
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index d7a14237eb0..eae0d004836 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -27,7 +27,7 @@
     "website" : "http://www.openerp.com",
     "category" : "Manufacturing",
     "sequence": 18,
-    "summary": "Manufacturing, Production, Bill of Materials",
+    "summary": "Manufacturing Orders, Bill of Materials, Routing",
     "images" : ["images/bill_of_materials.jpeg", "images/manufacturing_order.jpeg", "images/planning_manufacturing_order.jpeg", "images/production_analysis.jpeg", "images/production_dashboard.jpeg","images/routings.jpeg","images/work_centers.jpeg"],
     "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
     "description": """
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 9a39871f0c0..9d985d40408 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0.1',
     'category': 'Point Of Sale',
     "sequence": 6,
-    "summary": "Touchscreen to Manage your Shop",
+    "summary": "Touchscreen Interface for Shops",
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index fa7d002f571..d5e7ee1985f 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Project Management',
     "sequence": 22,
-    "summary": "Multi Level Support",
+    "summary": "Support, Bug Traker, Helpdesk",
     'description': """
 This module provides Issues/Bugs Management in Project.
 =======================================================
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index cb2e8f093aa..eb8df0ff77b 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.1',
     'category': 'Purchase Management',
     "sequence": 19,
-    "summary": "Requests for Quotation, Invoicing Control",
+    "summary": "RfQ, Purchase Orders, Delivery & Invoicing Control",
     'description': """
 Purchase Management module is for generating a purchase order for purchase of goods from a supplier.
 ====================================================================================================
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index f5bf1adb436..b6be6f7b1e3 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Sales Management',
     "sequence": 14,
-    "summary": "Quotations, Sales, Invoicing",
+    "summary": "Quotations, Sale Orders, Invoicing",
     'description': """
 The base module to manage quotations and sales orders.
 ======================================================
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index d061fb4b033..0f0f758f4d6 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Warehouse Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "summary": "Incoming Shipments, Deliveries, Inventory, Stock",
+    "summary": "Inventory, Logistic, Storage",
     "description" : """
 OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
 ======================================================================================================

From f2ee1381caa2eb9783e861fd8667c72f9d7dca6a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 30 Jul 2012 15:58:00 +0200
Subject: [PATCH 271/312] [IMP] Breadcrumb: avoid having the same title twice
 (Eg: confirm quotation)

bzr revid: fme@openerp.com-20120730135800-a0zotamtoez3ur5e
---
 addons/web/static/src/js/views.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2e22b8b64c5..e47981a4284 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -505,6 +505,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         });
         this.getParent().push_breadcrumb({
             widget: this,
+            action: this.action,
             show: function(index, $e) {
                 var view_to_select = views[index];
                 self.$element.show();
@@ -513,9 +514,27 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                 }
             },
             get_title: function() {
-                return _.map(views, function(v) {
-                    return self.views[v].controller.get('title');
+                var id;
+                var currentIndex;
+                _.each(self.getParent().breadcrumbs, function(bc, i) {
+                    if (bc.widget === self) {
+                        currentIndex = i;
+                    }
                 });
+                var next = self.getParent().breadcrumbs.slice(currentIndex + 1)[0];
+                var titles = _.map(views, function(v) {
+                    var controller = self.views[v].controller;
+                    if (v === 'form') {
+                        id = controller.datarecord.id;
+                    }
+                    return controller.get('title');
+                });
+                if (next && next.action.res_id && self.active_view === 'form' && self.model === next.action.res_model && id === next.action.res_id) {
+                    // If the current active view is a formview and the next item in the breadcrumbs
+                    // is an action on same object (model / res_id), then we omit the current formview's title
+                    titles.pop();
+                }
+                return titles;
             }
         });
     },

From 1fc30258ff1b48a6a803aa3eb74409a059a4afff Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 30 Jul 2012 16:29:43 +0200
Subject: [PATCH 272/312] [FIX] mrp: add the stock.group_locations group

bzr revid: stw@openerp.com-20120730142943-1ruwsyaf5pvehbzm
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3177d578997..0449f590127 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -686,8 +686,8 @@
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group>
-                                <group groups="stock.group_locations">
+                            <group groups="stock.group_locations">
+                                <group>
                                     <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
                                 </group>
                                 <group>

From 458ae014875ff24284f296cd9e02279fb84d6975 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 30 Jul 2012 17:00:52 +0200
Subject: [PATCH 273/312] [FIX] fixed kanban columns size

bzr revid: fp@openerp.com-20120730150052-muadhzkp2ky75g0z
---
 addons/web_kanban/static/src/js/kanban.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index cd12953adcd..c00aa7838d1 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -295,10 +295,10 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             if (!group.state.folded) {
                 if (182*unfolded>=self.$element.width()) {
                     group.$element.css('width', "170px");
-                } else if (262*unfolded>self.$element.width()) {
-                    group.$element.css('width', Math.round(100/unfolded) + '%');
-                } else {
+                } else if (262*unfolded<self.$element.width()) {
                     group.$element.css('width', "250px");
+                } else {
+                    group.$element.css('width', Math.floor(self.$element.width()/unfolded) + 'px');
                 }
             }
         });

From 6acccf6d6a4f79452ca93bbf4630590cb1bc39f6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 30 Jul 2012 18:05:38 +0200
Subject: [PATCH 274/312] [IMP] FormView: use name_get for the form title

bzr revid: fme@openerp.com-20120730160538-ankpno3upsrnt8y1
---
 addons/web/static/src/js/view_form.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 7f802be2100..469df4b9131 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -302,7 +302,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this._super();
     },
     on_record_loaded: function(record) {
-        var self = this, set_values = [];
+        var self = this, defs = [];
         if (!record) {
             this.set({ 'title' : undefined });
             this.do_warn("Form", "The record could not be found in the database.", true);
@@ -310,7 +310,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         this.datarecord = record;
         this._actualize_mode();
-        this.set({ 'title' : record.id ? record.name : "New record" });
+
+        var titleDef = $.Deferred();
+        if (record.id) {
+            this.dataset.name_get(record.id).then(function(names) {
+                self.set({ 'title' : names[0][1] });
+            }).always(function() {
+                titleDef.resolve();
+            });
+        } else {
+            this.set({ 'title' : "New record" });
+            titleDef.resolve();
+        }
+        defs.push(titleDef);
 
         if (this.qweb) {
             this.kill_current_form();
@@ -322,9 +334,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         _(this.fields).each(function (field, f) {
             field._dirty_flag = false;
             var result = field.set_value(self.datarecord[f] || false);
-            set_values.push(result);
+            defs.push(result);
         });
-        return $.when.apply(null, set_values).pipe(function() {
+        return $.when.apply(null, defs).pipe(function() {
             if (!record.id) {
                 // New record: Second pass in order to trigger the onchanges
                 // respecting the fields order defined in the view

From 084ed3b064a04b8ce5d0b4a12ae05a13f296a218 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 31 Jul 2012 09:51:28 +0530
Subject: [PATCH 275/312] [FIX]crm lead report removed field categ_id

bzr revid: jam@tinyerp.com-20120731042128-hdhpt51af4dfjzej
---
 addons/crm/report/crm_lead_report_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index b519e32972e..42beb7b5279 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -87,7 +87,6 @@
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
-                        <field name="categ_id"/>
                         <field name="type_id"/>
                         <field name="channel_id"/>
                         <field name="company_id" groups="base.group_multi_company"/>
@@ -110,7 +109,6 @@
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Category" name="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />

From f167f30be4e043326f7380f29ae8ced82cca192d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 31 Jul 2012 04:58:13 +0000
Subject: [PATCH 276/312] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120727052243-xrl1r6fydhcwuh0m
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045710-cxy8rrcdr2zup8f2
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043651-14gixnflr4c18adp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120731045813-sh4afry66idk2pod
---
 openerp/addons/base/i18n/ja.po | 26 +++++++++++++-------------
 openerp/addons/base/i18n/ru.po | 12 ++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index f4d05595b25..b004fb3625a 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-07-19 05:44+0000\n"
+"PO-Revision-Date: 2012-07-31 02:31+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-20 04:37+0000\n"
-"X-Generator: Launchpad (build 15644)\n"
+"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -1002,7 +1002,7 @@ msgstr "オマーン"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp
 msgid "MRP"
-msgstr "MRP（資材所要量計画）"
+msgstr "MRP"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -6423,7 +6423,7 @@ msgstr "多対1項目の属性削除"
 #. module: base
 #: model:ir.module.category,name:base.module_category_accounting_and_finance
 msgid "Accounting & Finance"
-msgstr "会計と金融"
+msgstr "会計と財務"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
@@ -6961,7 +6961,7 @@ msgstr ""
 #: field:res.request,act_to:0
 #: field:res.request.history,act_to:0
 msgid "To"
-msgstr ""
+msgstr "宛先"
 
 #. module: base
 #: view:ir.sequence:0
@@ -7472,7 +7472,7 @@ msgstr "アクセスの作成"
 #: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "都道府県"
 
 #. module: base
 #: field:ir.actions.server,copy_object:0
@@ -7703,7 +7703,7 @@ msgstr "販売員"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
 msgid "Accounting and Finance"
-msgstr "会計と金融"
+msgstr "会計と財務"
 
 #. module: base
 #: code:addons/base/module/module.py:429
@@ -8215,7 +8215,7 @@ msgstr "中国語 / 简体中文"
 #: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
-msgstr ""
+msgstr "町名番地"
 
 #. module: base
 #: model:res.country,name:base.yu
@@ -11238,7 +11238,7 @@ msgid ""
 "(default: 465)"
 msgstr ""
 "接続の暗号化方式を選択：\n"
-"・ なし: SMTPセッションはクリアテキストで行われる。\n"
+"・ なし: SMTPセッションはクリアテキストで行われます。\n"
 "・ TLS（STARTTLS）：TLS暗号化はSMTPセッションの開始において要求されます（推奨）。\n"
 "・ SSL/TLS：SMTPセッションは専用のポート（デフォルト：465）によってSSL/TLSで暗号化されます。"
 
@@ -12022,7 +12022,7 @@ msgstr "%m - 月[01,12]."
 #: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
-msgstr "市"
+msgstr "市区町村"
 
 #. module: base
 #: model:res.country,name:base.qa
@@ -12413,7 +12413,7 @@ msgstr "あなたが作成 / 書き込みたいオブジェクト。もし、そ
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Not Installed"
-msgstr "インストールされていません。"
+msgstr "未インストール"
 
 #. module: base
 #: view:workflow.activity:0
@@ -12982,7 +12982,7 @@ msgstr "発注時の二重検証"
 #: field:res.company,street2:0
 #: field:res.partner.address,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "町名番地2"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_update
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 633734c1e67..c3ba2f63acd 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-01-31 16:29+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
+"PO-Revision-Date: 2012-07-26 16:30+0000\n"
+"Last-Translator: Rinat Karimov <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-27 05:22+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -2732,7 +2732,7 @@ msgstr "Очистить ID"
 #. module: base
 #: view:res.groups:0
 msgid "Inherited"
-msgstr ""
+msgstr "Унаследованный"
 
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -6614,7 +6614,7 @@ msgstr "Совет"
 #. module: base
 #: view:res.company:0
 msgid "Header/Footer of Reports"
-msgstr ""
+msgstr "Заголовок/подвал отчетов"
 
 #. module: base
 #: code:addons/base/res/res_users.py:746

From 84ea8f59d703c4b5e8dfb0fdde4468ac0a7b410c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 31 Jul 2012 04:58:41 +0000
Subject: [PATCH 277/312] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120731045841-1532ttai3o223dln
---
 addons/account/i18n/es_EC.po       |    2 +-
 addons/account_asset/i18n/es_EC.po |    2 +-
 addons/hr_payroll/i18n/he.po       | 1119 ++++++++++++++++++++++++++++
 addons/sale_crm/i18n/ja.po         |   32 +-
 addons/sale_margin/i18n/ja.po      |   14 +-
 addons/stock_planning/i18n/ja.po   |    8 +-
 6 files changed, 1148 insertions(+), 29 deletions(-)
 create mode 100644 addons/hr_payroll/i18n/he.po

diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 5b6bbffea1f..fba1c8ed099 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
 "X-Generator: Launchpad (build 15702)\n"
 
 #. module: account
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
index b9e3fc013a5..ec12e6c4a58 100644
--- a/addons/account_asset/i18n/es_EC.po
+++ b/addons/account_asset/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
 "X-Generator: Launchpad (build 15702)\n"
 
 #. module: account_asset
diff --git a/addons/hr_payroll/i18n/he.po b/addons/hr_payroll/i18n/he.po
new file mode 100644
index 00000000000..9b54273f823
--- /dev/null
+++ b/addons/hr_payroll/i18n/he.po
@@ -0,0 +1,1119 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-07-31 03:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.line:0 view:hr.salary.rule:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,input_ids:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0 view:hr.payslip:0 view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "("
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contribution.register,company_id:0
+#: field:hr.payroll.structure,company_id:0 field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0 field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.run:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0 field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip report:payslip:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0 report:paylip.details:0 report:payslip:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_select:0 help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Total Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
+msgid ""
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,state:0 field:hr.payslip.run,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,employee_id:0 field:hr.payslip.line,employee_id:0
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Children Definition"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0 field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0 field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,active:0 help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,register_id:0 help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "PaySlip Batch"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,child_ids:0 field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:872
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0 field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,category_id:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,credit_note:0 field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,active:0 field:hr.salary.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:861
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0 field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Credit"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:861
+#: code:addons/hr_payroll/hr_payroll.py:866
+#: code:addons/hr_payroll/hr_payroll.py:872
+#: code:addons/hr_payroll/hr_payroll.py:889
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Refund"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.input,code:0
+#: field:hr.payslip.line,code:0 field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0 field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,sequence:0 field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0 field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 report:paylip.details:0
+msgid "Register Name"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:664
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,struct_id:0 view:hr.payroll.structure:0 view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contribution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0 selection:hr.payslip.run,state:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:889
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Days"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0 field:hr.contribution.register,note:0
+#: field:hr.payroll.structure,note:0 field:hr.payslip,name:0
+#: field:hr.payslip,note:0 field:hr.payslip.input,name:0
+#: view:hr.payslip.line:0 field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0 field:hr.rule.input,name:0
+#: view:hr.salary.rule:0 field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
+msgid "Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:866
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.contribution.register,name:0
+#: field:hr.payroll.structure,name:0 field:hr.payslip.line,name:0
+#: field:hr.payslip.run,name:0 field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0 view:hr.payslip.line:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,sequence:0 help:hr.salary.rule,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will be used to compute the % fields values; in general it is on basic, "
+"but you can also use categories code fields in lowercase as a variable names "
+"(hra, ma, lta, etc.) and the variable basic."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.line,total:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 5a7e0b77495..44e1c1cc23a 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-06 21:31+0000\n"
+"PO-Revision-Date: 2012-07-30 16:29+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
@@ -31,12 +31,12 @@ msgstr "注文参照は、会社ごとに固有でなければなりません。
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr "販売見積書(%s)を移動"
+msgstr "受注見積（%s）に変換"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr "見積りへ移動"
+msgstr "見積に変換"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
@@ -48,7 +48,7 @@ msgstr "データ不足です。"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr "顧客の住所が不明確です。"
+msgstr "顧客の住所が定義されていません。"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
@@ -58,7 +58,7 @@ msgstr "営業する。"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr "_作成"
+msgstr "作成"
 
 #. module: sale_crm
 #: view:sale.order:0
@@ -69,22 +69,22 @@ msgstr "私の営業チーム"
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
-msgstr "発注書を作成後、これをチェックしオポチュニティを終了します。"
+msgstr "発注書を作成後、商談を終了するためにこれをチェックします。"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr "私のオポチュニティ"
+msgstr "私の商談"
 
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Convert to Quote"
-msgstr "見積りへ移動"
+msgstr "見積に変換"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr "お店"
+msgstr "店"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -95,12 +95,12 @@ msgstr "顧客"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr "オポチュニティ: %s"
+msgstr "商談：%s"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr "オポチュニティ成立"
+msgstr "商談を閉じる"
 
 #. module: sale_crm
 #: view:board.board:0
@@ -111,7 +111,7 @@ msgstr "段階別私の計画売上高"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr "オポチュニティの'%s' は、見積に変換されました。"
+msgstr "商談 %s は見積に変換されました。"
 
 #. module: sale_crm
 #: view:sale.order:0
@@ -122,7 +122,7 @@ msgstr "営業チーム"
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
-msgstr "見積り作成"
+msgstr "見積作成"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -132,4 +132,4 @@ msgstr "キャンセル"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr "受注"
+msgstr "受注オーダー"
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
index 6d04bd6e6e0..e9c76e11755 100644
--- a/addons/sale_margin/i18n/ja.po
+++ b/addons/sale_margin/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-04-20 04:29+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-30 16:32+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:17+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "発注参照は、会社ごとにユニークでなければなりません。"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -30,7 +30,7 @@ msgstr "原価"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
 msgid "Sales Order"
-msgstr "受注"
+msgstr "受注オーダー"
 
 #. module: sale_margin
 #: help:sale.order,margin:0
@@ -48,4 +48,4 @@ msgstr "粗利益"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "受注明細"
+msgstr "受注オーダー行"
diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
index e3911d336ff..ed3b63ac1bc 100644
--- a/addons/stock_planning/i18n/ja.po
+++ b/addons/stock_planning/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-04 23:38+0000\n"
+"PO-Revision-Date: 2012-07-30 16:28+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -1184,7 +1184,7 @@ msgstr "誰がこの予測を作成したのか、検証したのかを示しま
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_team_id:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_left:0

From 8728f342db1539a435a2878ceef48ca82e0b0906 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 31 Jul 2012 05:10:54 +0000
Subject: [PATCH 278/312] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120731051054-ka5p2jd5qfwbvq0n
---
 addons/web/i18n/pt_BR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index 516ef990a6d..b76288d0387 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-30 04:59+0000\n"
+"X-Launchpad-Export-Date: 2012-07-31 05:10+0000\n"
 "X-Generator: Launchpad (build 15702)\n"
 
 #. openerp-web

From 2a7e9cecabd8f7d886508da9fdf1ccf6cd51e1bc Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 31 Jul 2012 11:32:02 +0530
Subject: [PATCH 279/312] [FIX] crm_partner_assign : fixed the wrong conflct
 reslove by vta on trunk merge

bzr revid: jam@tinyerp.com-20120731060202-c90tj0mxtnnfem00
---
 .../report/crm_lead_report_view.xml           | 57 ++++---------------
 1 file changed, 10 insertions(+), 47 deletions(-)

diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index d5d76a026a7..9b8e66964d3 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -16,62 +16,25 @@
                     <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
                     <group  expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
-                        <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
-                        <field name="categ_id" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="creation_date"/>
-                        <field name="opening_date"/>
-                        <field name="date_closed"/>
-                    </group>
-                    <group  expand="1" string="Group By...">
-                        <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
-                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                        <filter string="Section" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
-                        <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'grade_id'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
-                    <group>
-                        <filter icon="terp-check"
-                            string="Current"
-                            domain="[('state','in',('draft','open'))]"/>
-                        <filter icon="terp-dialog-close"
-                            string="Closed"
-                            domain="[('state','=','done')]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id"
-                            widget="selection"
-                            context="{'invisible_section': False}"/>
-                        <field name="grade_id"/>
-                        <field name="user_id"/>
-                        <field name="partner_assigned_id"/>
-                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters...">
                       <field name="partner_id"/>
-                      <separator orientation="vertical"/>
+                      <separator/>
                       <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
-                      <separator orientation="vertical"/>
+                      <separator />
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
                       <field name="creation_date"/>
                       <field name="opening_date"/>
                       <field name="date_closed"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                       <filter string="Salesperson" name="user" icon="terp-personal"
+                    </group>
+                    <group  expand="1" string="Group By...">
+                        <filter string="Salesperson" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
-                       <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                        <separator orientation="vertical" />
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
+                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                         <filter string="Section" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
+                                domain="[]"
+                                context="{'group_by':'section_id'}" />
                         <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'grade_id'}" />
-
-                        <separator orientation="vertical" />
+                                domain="[]" context="{'group_by':'grade_id'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />

From 685e30543b8933060a7dce4311f891ff219a484b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 31 Jul 2012 12:00:02 +0200
Subject: [PATCH 280/312] [FIX] name_get should always use an array of ids

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 469df4b9131..65afd4a36d6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -313,7 +313,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
 
         var titleDef = $.Deferred();
         if (record.id) {
-            this.dataset.name_get(record.id).then(function(names) {
+            this.dataset.name_get([record.id]).then(function(names) {
                 self.set({ 'title' : names[0][1] });
             }).always(function() {
                 titleDef.resolve();

From c82a87bbd85f3cedde4e058c90f39ea3d634aab4 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 31 Jul 2012 12:54:02 +0200
Subject: [PATCH 281/312] [FIX] hr_timesheet_invoice: Add the default values
 for the account journal and the account in the account.analytic.line (Invoice
 Tasks Work)

bzr revid: stw@openerp.com-20120731105402-wqq9qv5db1si6na9
---
 .../hr_timesheet_invoice.py                   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 54257f5efba..a4f08a854ec 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -126,6 +126,25 @@ class account_analytic_line(osv.osv):
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
     }
 
+    def _default_journal(self, cr, uid, context=None):
+        proxy = self.pool.get('hr.employee')
+        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        employee = proxy.browse(cr, uid, record_ids[0], context=context)
+        return employee.journal_id and employee.journal_id.id or False
+
+    def _default_general_account(self, cr, uid, context=None):
+        proxy = self.pool.get('hr.employee')
+        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        employee = proxy.browse(cr, uid, record_ids[0], context=context)
+        if employee.product_id and employee.product_id.property_account_income:
+            return employee.product_id.property_account_income.id
+        return False
+
+    _defaults = {
+        'journal_id' : _default_journal,
+        'general_account_id' : _default_general_account,
+    }
+
     def write(self, cr, uid, ids, vals, context=None):
         self._check_inv(cr, uid, ids, vals)
         return super(account_analytic_line,self).write(cr, uid, ids, vals,

From 09fe39c0b61e0ffa5f2a98f913e9770770bbc4db Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 31 Jul 2012 13:08:45 +0200
Subject: [PATCH 282/312] [IMP] rec_name assertion and fallback

bzr revid: al@openerp.com-20120731110845-nt11isvr96tuc207
---
 openerp/osv/orm.py | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index a62561fc95d..a18c4195dc2 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -657,7 +657,7 @@ class BaseModel(object):
     _columns = {}
     _constraints = []
     _defaults = {}
-    _rec_name = 'name'
+    _rec_name = False
     _parent_name = 'parent_id'
     _parent_store = False
     _parent_order = False
@@ -1054,6 +1054,13 @@ class BaseModel(object):
             assert self._log_access, "TransientModels must have log_access turned on, "\
                                      "in order to implement their access rights policy"
 
+        # Validate rec_name
+        if self._rec_name:
+            assert self.rec_name in self._columns
+        else:
+            self._rec_name = 'name'
+
+
     def __export_row(self, cr, uid, row, fields, context=None):
         if context is None:
             context = {}
@@ -1567,6 +1574,12 @@ class BaseModel(object):
             res.extend(self.pool.get(parent).fields_get_keys(cr, user, context))
         return res
 
+    def _rec_name_fallback(self, cr, uid, context=None):
+        rec_name = self._rec_name
+        if rec_name not in self._columns:
+            rec_name = self._columns.keys()[0] if len(self._columns.keys()) > 0 else "id"
+        return rec_name
+
     #
     # Overload this method if you need a window title which depends on the context
     #
@@ -1859,8 +1872,7 @@ class BaseModel(object):
         return view
 
     def _get_default_search_view(self, cr, user, context=None):
-        """ Generates a single-field tree view, using _rec_name if
-        it's one of the columns or the first column it finds otherwise
+        """ Generates a single-field search view, based on _rec_name.
 
         :param cr: database cursor
         :param int user: user id
@@ -1868,17 +1880,12 @@ class BaseModel(object):
         :returns: a tree view as an lxml document
         :rtype: etree._Element
         """
-        _rec_name = self._rec_name
-        if _rec_name not in self._columns:
-            _rec_name = self._columns.keys()[0] if len(self._columns.keys()) > 0 else "id"
-
         view = etree.Element('search', string=self._description)
-        etree.SubElement(view, 'field', name=_rec_name)
+        etree.SubElement(view, 'field', name=self._rec_name_fallback(cr,uid,context))
         return view
 
     def _get_default_tree_view(self, cr, user, context=None):
-        """ Generates a single-field tree view, using _rec_name if
-        it's one of the columns or the first column it finds otherwise
+        """ Generates a single-field tree view, based on _rec_name.
 
         :param cr: database cursor
         :param int user: user id
@@ -1886,12 +1893,8 @@ class BaseModel(object):
         :returns: a tree view as an lxml document
         :rtype: etree._Element
         """
-        _rec_name = self._rec_name
-        if _rec_name not in self._columns:
-            _rec_name = self._columns.keys()[0] if len(self._columns.keys()) > 0 else "id"
-
         view = etree.Element('tree', string=self._description)
-        etree.SubElement(view, 'field', name=_rec_name)
+        etree.SubElement(view, 'field', name=self._rec_name_fallback(cr,uid,context))
         return view
 
     def _get_default_calendar_view(self, cr, user, context=None):
@@ -1918,7 +1921,7 @@ class BaseModel(object):
             return False
 
         view = etree.Element('calendar', string=self._description)
-        etree.SubElement(view, 'field', name=self._rec_name)
+        etree.SubElement(view, 'field', self._rec_name_get(cr,uid,context))
 
         if (self._date_name not in self._columns):
             date_found = False
@@ -2276,8 +2279,13 @@ class BaseModel(object):
             return []
         if isinstance(ids, (int, long)):
             ids = [ids]
-        return [(r['id'], tools.ustr(r[self._rec_name])) for r in self.read(cr, user, ids,
-            [self._rec_name], context, load='_classic_write')]
+
+        rec_name = self._rec_name
+        if rec_name not in self._columns:
+            res = [(r['id'], "%s,%s"%(self._name,r['id'])) for r in self.read(cr, user, ids, ['id'], context, load='_classic_write')]
+        else:
+            res = [(r['id'], tools.ustr(r[rec_name])) for r in self.read(cr, user, ids, [rec_name], context, load='_classic_write')]
+        return res
 
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
         """Search for records that have a display name matching the given ``name`` pattern if compared

From cb1c6c08af0dad5380f1457a18d2cdb095a767bc Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Tue, 31 Jul 2012 16:58:04 +0530
Subject: [PATCH 283/312] [IMP]Improve search view in all modules

bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
---
 addons/account/account_invoice_view.xml       |  8 ++--
 addons/account/account_view.xml               | 40 +++++++++----------
 addons/account/project/project_view.xml       |  8 ++--
 .../account_analytic_entries_report_view.xml  |  6 +--
 .../report/account_entries_report_view.xml    |  6 +--
 .../report/account_invoice_report_view.xml    |  6 +--
 .../account_analytic_analysis_menu.xml        |  4 +-
 addons/account_asset/account_asset_view.xml   |  4 +-
 .../report/account_asset_report_view.xml      |  4 +-
 .../account_bank_statement_view.xml           |  6 +--
 addons/account_coda/account_coda_view.xml     | 12 +++---
 .../report/account_followup_report.xml        |  2 +-
 .../wizard/account_followup_print_view.xml    |  2 +-
 .../account_payment/account_payment_view.xml  |  2 +-
 .../account_voucher/account_voucher_view.xml  |  6 +--
 .../account_voucher_sales_receipt_view.xml    |  2 +-
 .../voucher_payment_receipt_view.xml          |  8 ++--
 .../voucher_sales_purchase_view.xml           |  8 ++--
 addons/audittrail/audittrail_view.xml         |  2 +-
 addons/base_calendar/base_calendar_view.xml   |  4 +-
 addons/base_calendar/crm_meeting_view.xml     |  4 +-
 addons/caldav/caldav_view.xml                 |  4 +-
 addons/crm/crm_lead_view.xml                  | 14 +++----
 addons/crm/crm_phonecall_view.xml             |  6 +--
 addons/crm/crm_report_view.xml                | 10 ++---
 addons/crm/report/crm_lead_report_view.xml    |  4 +-
 .../crm/report/crm_phonecall_report_view.xml  |  4 +-
 addons/crm_claim/crm_claim_view.xml           |  4 +-
 .../report/crm_claim_report_view.xml          |  6 +--
 .../crm_fundraising/crm_fundraising_view.xml  |  4 +-
 .../report/crm_fundraising_report_view.xml    |  6 +--
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  6 +--
 .../report/crm_helpdesk_report_view.xml       |  6 +--
 .../report/crm_lead_report_view.xml           |  4 +-
 addons/document/document_view.xml             |  4 +-
 addons/email_template/email_template_view.xml |  2 +-
 addons/event/event_view.xml                   |  6 +--
 .../report/report_event_registration_view.xml |  4 +-
 addons/hr/hr_view.xml                         |  2 +-
 addons/hr_attendance/hr_attendance_view.xml   |  2 +-
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  6 +--
 .../report/hr_evaluation_report_view.xml      |  4 +-
 addons/hr_expense/hr_expense_view.xml         |  6 +--
 .../report/hr_expense_report_view.xml         |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       |  6 +--
 addons/hr_payroll/hr_payroll_view.xml         |  6 +--
 addons/hr_recruitment/hr_recruitment_view.xml |  4 +-
 .../report/hr_recruitment_report_view.xml     |  6 +--
 .../hr_timesheet_invoice_report_view.xml      |  8 ++--
 .../report/report_analytic_view.xml           |  2 +-
 .../hr_timesheet_sheet_view.xml               |  6 +--
 .../report/timesheet_report_view.xml          |  4 +-
 addons/idea/idea_view.xml                     |  2 +-
 addons/lunch/lunch_view.xml                   |  6 +--
 addons/mail/mail_message_view.xml             |  2 +-
 .../marketing_campaign_view.xml               | 10 ++---
 .../report/campaign_analysis_view.xml         |  6 +--
 addons/membership/membership_view.xml         |  2 +-
 .../report/report_membership_view.xml         |  4 +-
 addons/mrp/mrp_view.xml                       |  8 ++--
 addons/mrp_operations/mrp_operations_view.xml |  4 +-
 .../report/mrp_workorder_analysis_view.xml    |  4 +-
 addons/mrp_repair/mrp_repair_view.xml         |  4 +-
 .../point_of_sale/account_statement_view.xml  |  4 +-
 addons/point_of_sale/point_of_sale_view.xml   | 12 +++---
 .../report/pos_order_report_view.xml          |  8 ++--
 addons/process/process_view.xml               |  2 +-
 addons/procurement/procurement_view.xml       |  2 +-
 addons/product/pricelist_view.xml             |  2 +-
 addons/product/product_view.xml               |  4 +-
 addons/project/project_view.xml               |  8 ++--
 addons/project/report/project_cumulative.xml  |  4 +-
 addons/project/report/project_report_view.xml |  6 +--
 addons/project_issue/project_issue_view.xml   |  8 ++--
 .../report/project_issue_report_view.xml      |  8 ++--
 .../project_long_term_view.xml                |  2 +-
 addons/purchase/purchase_view.xml             | 13 +++---
 .../purchase/report/purchase_report_view.xml  |  4 +-
 addons/purchase/stock_view.xml                |  6 +--
 .../purchase_requisition_view.xml             |  2 +-
 .../report_intrastat_view.xml                 |  2 +-
 addons/resource/resource_view.xml             |  4 +-
 addons/sale/report/sale_report_view.xml       |  6 +--
 addons/sale/sale_view.xml                     | 18 ++++-----
 .../stock/report/report_stock_move_view.xml   | 10 ++---
 addons/stock/report/report_stock_view.xml     |  2 +-
 addons/stock/stock_view.xml                   | 35 ++++++++--------
 addons/stock_planning/stock_planning_view.xml |  4 +-
 addons/subscription/subscription_view.xml     |  4 +-
 addons/survey/survey_view.xml                 |  8 ++--
 addons/wiki/wiki_view.xml                     |  2 +-
 92 files changed, 272 insertions(+), 276 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d039eb87906..f1a8c82b382 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -443,16 +443,16 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                     <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" string="Salesperson"/>
-                    <field name="journal_id"/>
-                    <field name="period_id" string="Period"/>
                     <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                     <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                     <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                     <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                     <separator/>
                     <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="journal_id"/>
+                    <field name="period_id" string="Period"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7c1d9ab8137..8a9f5ca59ff 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -210,9 +210,9 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
-                    <field name="user_type"/>
                     <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                     <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                    <field name="user_type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
@@ -427,11 +427,11 @@
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
-                    <field name="user_id"/>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
                     <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
                         <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
@@ -524,10 +524,10 @@
                 <search string="Search Bank Statements">
                     <field name="name" string="Bank Statement"/>
                     <field name="date"/>
-                    <field name="journal_id" domain="[('type', '=', 'cash')]" />
                     <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                     <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
                     <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                    <field name="journal_id" domain="[('type', '=', 'cash')]" />
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
@@ -562,10 +562,10 @@
                 <search string="Search Bank Statements">
                     <field name="name" string="Bank Statement"/>
                     <field name="date"/>
-                    <field name="period_id"/>
-                    <field name="journal_id" domain="[('type', '=', 'bank')]" />
                     <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                     <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                    <field name="period_id"/>
+                    <field name="journal_id" domain="[('type', '=', 'bank')]" />
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
@@ -1162,11 +1162,6 @@
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
                     <field name="date"/>
-                    <field name="move_id" string="Number (Move)"/>
-                    <field name="account_id"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id" context="{'journal_id':self}"/>
-                    <field name="period_id" context="{'period_id':self}"/>
                     <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1175,6 +1170,11 @@
                     <filter icon="terp-dolar_ok!" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" name="unreconciled"/>
                     <separator/>
                     <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                    <field name="move_id" string="Number (Move)"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id" context="{'journal_id':self}"/>
+                    <field name="period_id" context="{'period_id':self}"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1400,13 +1400,13 @@
                 <search string="Search Move">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id"/>
-                    <field name="period_id"/>
                     <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                     <separator/>
                     <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1620,10 +1620,10 @@
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
                     <field name="name" string="Journal Entry Model"/>
-                    <field name="journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
                     <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
                     <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
+                    <field name="journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
@@ -1795,9 +1795,9 @@
                 <search string="Entry Subscription">
                     <field name="name" string="Account Subscription"/>
                     <field name="date_start"/>
-                    <field name="model_id"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
                     <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
+                    <field name="model_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -2055,11 +2055,11 @@
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
-                    <field name="parent_id"/>
-                    <field name="user_type"/>
                     <field name="type"/>
                     <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
                     <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                    <field name="parent_id"/>
+                    <field name="user_type"/>
                     <group expand="0" string="Group By...">
                         <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
@@ -2235,9 +2235,9 @@
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
-                    <field name="chart_template_id"/>
                     <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                     <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
+                    <field name="chart_template_id"/>
                 </search>
             </field>
         </record>
@@ -2707,8 +2707,8 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <search string="Account Report">
                     <field name="name" string="Account Report"/>
-                    <field name="account_report_id"/>
                     <field name="type"/>
+                    <field name="account_report_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
                         <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7fd782f3cc6..de1a087d9c5 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -32,10 +32,10 @@
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
                     <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -178,13 +178,13 @@
                 <search string="Search Analytic Lines">
                     <field name="name" string="Analytic Line"/>
                     <field name="date"/>
-                    <field name="account_id"/>
-                    <field name="user_id"/>
                     <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
                     <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
                     <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
                     <separator/>
                     <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
+                    <field name="account_id"/>
+                    <field name="user_id"/>
                     <group string="Group By..." expand="0">
                         <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
                         <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index dd927928600..efb45f12a64 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -36,9 +36,6 @@
             <search string="Analytic Entries Analysis">
                 <field name="day" string="Day"/>
                 <field name="date"/>
-                <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                <field name="product_id" />
-                <field name="user_id"/>
                 <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -52,6 +49,9 @@
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="product_id" />
+                    <field name="user_id"/>
                 </group>
             </search>
         </field>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index fbe44ee8d12..8c445052094 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -70,9 +70,6 @@
                 <field name="date"/>
                 <field name="date_created"/>
                 <field name="date_maturity"/>
-                <field name="account_id"/>
-                <field name="journal_id"/>
-                <field name="period_id"/>
                 <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/>
                 <filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/>
                 <separator/>
@@ -81,6 +78,9 @@
                 <separator/>
                 <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
                 <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
+                <field name="account_id"/>
+                <field name="journal_id"/>
+                <field name="period_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="fiscalyear_id"/>
                     <field name="product_id"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 4af7bb038be..e3e0b210f20 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,9 +56,6 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
                 <field name="date"/>
-                <field name="partner_id"/>
-                <field name="user_id" />
-                <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 <filter icon="terp-go-year" string="Year" name="year" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="year"/>
                 <separator/>
                 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
@@ -69,6 +66,9 @@
                 <filter icon="terp-personal" string="Supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" help="Supplier Invoices And Refunds"/>
                 <filter icon="terp-dolar" string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" help="Customer And Supplier Invoices"/>
                 <filter icon="terp-dolar_ok!" string="Refund" domain="['|', ('type','=','out_refund'),('type','=','in_refund')]" help="Customer And Supplier Refunds"/>
+                <field name="partner_id"/>
+                <field name="user_id" />
+                <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index ef9fbcdf130..bca6b2ab260 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -21,8 +21,6 @@
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
                     <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
                     <separator/>
@@ -32,6 +30,8 @@
                     <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
                     <separator/>
                     <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index b91fdf7e0c1..cdc772ad65d 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -232,10 +232,10 @@
             <search string="Account Asset">
                 <field name="name" string="Asset"/>
                 <field name="purchase_date"/>
-                <field name="category_id"/>
-                <field name="partner_id"/>
                 <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
                 <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
+                <field name="category_id"/>
+                <field name="partner_id"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index e916b7401df..a6652890ec5 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -45,12 +45,12 @@
             <search string="Assets Analysis">
                 <field name="purchase_date"/>
                 <field name="depreciation_date"/>
-                <field name="asset_id"/>
-                <field name="asset_category_id"/>
                 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
                 <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
                 <separator/>
                 <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines" context="{'unposted_value_visible': 0}"/>
+                <field name="asset_id"/>
+                <field name="asset_category_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index e16e316b6b9..c77fb896840 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -125,14 +125,14 @@
             <search string="Search Bank Transactions">
                 <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
                 <field name="val_date"/>
-                <field name="journal_id"/>
-                <field name="statement_id"/>
-                <field name="globalisation_id" string="Glob. Id"/>
                 <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
                 <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
                 <separator/>
                 <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
                 <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
+                <field name="journal_id"/>
+                <field name="statement_id"/>
+                <field name="globalisation_id" string="Glob. Id"/>
                 <group string="Extended Filters..." expand="0">
                     <field name="account_id"/>
                     <field name="partner_id"/>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 5af713a501d..07f397c663f 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -13,12 +13,12 @@
         <field name="arch" type="xml">
             <search string="CODA Bank Account Configuration">
                 <field name="name" filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]" string="CODA Bank Account"/>
+                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
                 <field name="bank_id"/>
                 <field name="journal"/>
                 <field name="currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
-                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
-                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
                 <group expand="0" string="Group By...">
                     <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
                     <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
@@ -381,11 +381,11 @@
             <search string="Search CODA Bank Statements">
                 <field name="name" string="CODA Bank Statement"/>
                 <field name="date"/>
+                <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
                 <field name="period_id"/>
                 <field name="coda_bank_account_id"/>
                 <field name="journal_id" domain="[('type', '=', 'bank')]"/>
-                <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
-                <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
                 <group expand="0" string="Group By...">
                     <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                     <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
@@ -466,10 +466,10 @@
             <search string="Search Bank Transactions">
                 <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
                 <field name="val_date"/>
-                <field name="statement_id"/>
-                <field name="globalisation_id" string="Glob. Id"/>
                 <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
                 <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                <field name="statement_id"/>
+                <field name="globalisation_id" string="Glob. Id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="coda_bank_account_id"/>
                     <field name="account_id"/>
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index dbdafdbeb0b..c881475dc43 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -42,13 +42,13 @@
                 <search string="Follow-ups Sent">
                     <field name="date_move"/>
                     <field name="date_move_last"/>
-                    <field name="partner_id"/>
                     <field name="balance"/>
                     <filter icon="terp-go-year" string="This Fiscal year" name="fiscalyear" domain="[('period_id','in','current_year')]"
                         help="Follow-up Entries with period in current year"/>
                     <separator/>
                     <filter icon="terp-camera_test" string="Not Litigation" domain="[('blocked','=', False)]"
                         help = "Including journal entries marked as a litigation"/>
+                    <field name="partner_id"/>
                     <group expand="1" string="Group By...">
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index f6bef24e975..2949177205f 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -42,10 +42,10 @@
             <field name="arch" type="xml">
                 <search string="Partner to Remind">
                     <field name="date_followup"/>
+                    <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
                     <field name="partner_id"/>
                     <field name="max_followup_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
                 </search>
             </field>
         </record>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 147bb31d78e..e7100e4f2d5 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -214,12 +214,12 @@
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <field name="reference" string="Payment Order"/>
-                    <field name="mode"/>
                     <field name="state"/>
                     <field name="date_done"/>
                     <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                     <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
                     <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
+                    <field name="mode"/>
                     <group expand="0" string="Group By...">
                         <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index dc347d41b98..b212c07acb3 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -128,13 +128,13 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
-                    <field name="period_id"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <separator/>
                     <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
+                    <field name="period_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index b94164af1a4..527c959c2ad 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -50,10 +50,10 @@
             <search string="Sales Receipt Analysis">
                 <field name="date"/>
                 <field name="date_due"/>
-                <field name="partner_id"/>
                 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Vouchers"/>
                 <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help = "Pro-forma Vouchers"/>
                 <filter string="Posted" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Validated Vouchers"/>
+                <field name="partner_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="journal_id"/>
                     <field name="account_id"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ea62e536b9d..3d97c20b25a 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -10,11 +10,11 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <field name="partner_id" string="Customer"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -34,11 +34,11 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 1f8faef7372..8390f20b4f0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -9,11 +9,11 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                     <field name="period_id"/>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -32,11 +32,11 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <field name="partner_id" string="Customer"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                     <field name="period_id"/>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 60ec0949413..65eca09a9a1 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -64,9 +64,9 @@
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
                     <field name="name" string="Audittrail Rule"/>
-                    <field name="object_id" string="Model"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
                     <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
+                    <field name="object_id" string="Model"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 3cc24c09599..600e30d686a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -86,12 +86,12 @@
                 <search string="Search Invitations">
                     <field name="email" string="Email"/>
                     <field name="event_date"/>
-                    <field name="user_id" string="Responsible"/>
                     <field name="cutype" string="Invitation type"/>
                     <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" />
                     <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" />
                     <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" />
                     <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" />
+                    <field name="user_id" string="Responsible"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
@@ -395,12 +395,12 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                     <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
-                    <field name="user_id"/>
                     <field name="show_as"/>
                     <field name="class" string="Privacy"/>
                     <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" />
                     <separator/>
                     <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" />
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" />
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 2fae24de104..c99c77e4799 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -303,11 +303,11 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
-                <field name="user_id"/>
-                <field name="partner_ids"/>
                 <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                 <separator/>
                 <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/>
+                <field name="user_id"/>
+                <field name="partner_ids"/>
             </search>
         </field>
     </record>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 5a93fceabeb..f439ce7f81b 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -143,11 +143,11 @@
                 <tree string="Calendars" toolbar="1">
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="user_id"/>
-                    <field name="collection_id" required="1"/>
                     <field name="has_webcal" groups="base.group_no_one" />
                     <field name="calendar_color" groups="base.group_no_one" />
                     <field name="calendar_order" groups="base.group_no_one" />
+                    <field name="user_id"/>
+                    <field name="collection_id" required="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 870d6ed7c1e..b2a22d43bd5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -353,9 +353,6 @@
                 <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="subjects"/>
                 <field name="create_date"/>
-                <field name="user_id"/>
-                <field name="section_id" context="{'invisible_section': False}"/>
-                <field name="country_id" context="{'invisible_country': False}"/>
                 <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                 <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
                 <separator/>
@@ -367,6 +364,9 @@
                 <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                <field name="user_id"/>
+                <field name="section_id" context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
@@ -584,10 +584,6 @@
             <search string="Search Opportunities">
                 <field name="name" string="Opportunity / Customer"
                     filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="user_id"/>
-                <field name="country_id"/>
-                <field name="partner_id"/>
-                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                 <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                 <separator/>
                 <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
@@ -598,6 +594,10 @@
                 <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                         help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                <field name="user_id"/>
+                <field name="country_id"/>
+                <field name="partner_id"/>
+                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                     <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3958d4a7721..2953e963647 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -216,9 +216,6 @@
             <search string="Search Phonecalls">
                <field name="name" string="Phonecalls"/>
                <field name="date"/>
-               <field name="partner_id"/>
-               <field name="user_id"/>
-               <field name="section_id" string="Sales Team"/>
                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                <separator/>
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
@@ -227,6 +224,9 @@
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="Phone Calls that are assigned to me or to my team(s)" />
+               <field name="partner_id"/>
+               <field name="user_id"/>
+               <field name="section_id" string="Sales Team"/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index f46be9b6dfa..eaed4564424 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -71,10 +71,10 @@
                 <search string="Cases by Team and Type">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="section_id"/>
-                    <field name="category2_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
+                    <field name="section_id"/>
+                    <field name="category2_id"/>
                </search>
             </field>
         </record>
@@ -156,9 +156,9 @@
                 <search string="Cases by Team and Stage">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="section_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
+                    <field name="section_id"/>
                </search>
             </field>
         </record>
@@ -225,9 +225,9 @@
                 <search string="Cases by Section, Category and Stage">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="section_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
+                    <field name="section_id"/>
                </search>
             </field>
         </record>
@@ -311,9 +311,9 @@
                 <search string="Search Cases by User">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="section_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
+                    <field name="section_id"/>
                </search>
             </field>
     </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 42beb7b5279..9d0050be69c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -70,8 +70,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <field name="section_id" context="{'invisible_section': False}"/>
-                    <field name="user_id" string="Salesperson"/>
                     <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
                     <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
                     <separator/>
@@ -84,6 +82,8 @@
                             help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
+                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 26db9c1df66..2eeff7a0981 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -51,8 +51,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
-                    <field name="user_id" string="Salesperson"/>
                     <filter icon="terp-gtk-go-back-rtl" string="Todo" domain="[('state','in',('draft','open'))]"
                         help="Phone calls which are in draft and open state"/>
                     <filter icon="terp-camera_test" string="Held" domain="[('state','=','done')]"
@@ -64,6 +62,8 @@
                             help="Phone calls that are assigned to one of the sale teams I manage"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index e16ed3d4029..6c508049e5e 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -199,13 +199,13 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                     <field name="name" string="Claims"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <separator/>
                     <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index e6d1b5a2cfe..adfb97a28f0 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -53,9 +53,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="user_id" string="Salesperson"/>
-                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
@@ -65,6 +62,9 @@
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
                     <group  expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 3abfbe89eab..7ee3f35d2a6 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -174,8 +174,6 @@
                     <search string="Search Funds">
                         <field name="name" string="Fund Description"/>
                         <field name="state"/>
-                        <field name="user_id"/>
-                        <field name="section_id" string="Sales Team"/>
                         <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
@@ -184,6 +182,8 @@
                         <separator/>
                         <filter string="Assigned to Me or to My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                 help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
+                        <field name="user_id"/>
+                        <field name="section_id" string="Sales Team"/>
                         <group expand="0" string="Group By...">
                             <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                             <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 3459495f671..028635b083c 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -77,9 +77,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="user_id" string="Salesperson"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
@@ -89,6 +86,9 @@
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="user_id" string="Salesperson"/>
                     <group  expand="0" string="Extended Filters...">
                         <field name="categ_id" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="create_date"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index f9f17781a61..0fb0cbf825f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -153,15 +153,15 @@
                 <search string="Search Helpdesk">
                     <field name="name" string="Query"/>
                     <field name="date"/>
-                    <field name="partner_id" />
-                    <field name="user_id"/>
-                    <field name="section_id" string="Sales Team"/>
                     <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Helpdesk Request" />
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Helpdesk Request" />
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="All pending Helpdesk Request" />
                     <separator/>
                     <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
+                    <field name="partner_id" />
+                    <field name="user_id"/>
+                    <field name="section_id" string="Sales Team"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
                         <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" />
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 2c7a9f06654..9aab23eab70 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -53,9 +53,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <field name="user_id" string="Salesperson"/>
-                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>   
-                    <field name="company_id" groups="base.group_multi_company"/>
                     <filter string="New" icon="terp-check" domain="[('state','=','draft')]" />
                     <filter string="Open" icon="terp-camera_test" domain="[('state','=','open')]" />
                     <filter string="Closed" icon="terp-dialog-close" domain="[('state','=','cancel')]" />
@@ -65,6 +62,9 @@
                     <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
                     <separator/>
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>   
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 9b8e66964d3..f88d7e91f00 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -9,12 +9,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
+                    <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
+                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
                     <field name="section_id" context="{'invisible_section': False}"/>
                     <field name="grade_id"/>
                     <field name="user_id"/>
                     <field name="partner_assigned_id"/>
-                    <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
-                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
                     <group  expand="0" string="Extended Filters...">
                       <field name="partner_id"/>
                       <separator/>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index fa65d75c875..3f5768b8c4a 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -171,11 +171,11 @@
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
                     <field name="name" string="Document Directory"/>
+                    <filter string="Static" domain="[('type','=','directory')]"/>
+                    <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
                     <field name="user_id" />
-                    <filter string="Static" domain="[('type','=','directory')]"/>
-                    <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index dcfbc1bcc6b..daa4d028651 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -123,8 +123,8 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
-                    <field name="model_id"/>
                     <field name="lang"/>
+                    <field name="model_id"/>
                     <group expand="0" string="Group by...">
                         <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
                         <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 77c06d8c389..6415ad10f99 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -330,7 +330,6 @@
                 <search string="Events">
                     <field name="name" string="Events"/>
                     <field name="type"/>
-                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
@@ -339,6 +338,7 @@
                     <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <separator/>
                     <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" />
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
@@ -515,14 +515,14 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                    <field name="event_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
+                    <field name="event_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index ed8b66aa948..f05fdcc09e1 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -52,12 +52,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event on Registration">
-                    <field name="event_id" string="Event"/>
-                    <field name="user_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('event_state','=','draft')]" help="Events which are in New state"/>
                     <filter icon="terp-check" string="Confirm" domain="[('event_state','=','confirm')]" help="Events which are in confirm state"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
+                    <field name="event_id" string="Event"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="event_type" widget="selection"/>
                         <field name="event_date"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c9c9ef77195..eada4f23602 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -415,9 +415,9 @@
             <field name="arch" type="xml">
                 <search string="Jobs">
                     <field name="name" string="Job"/>
-                    <field name="department_id"/>
                     <filter icon="terp-camera_test" domain="[('state','=','open')]" string="In Position" help="In Position"/>
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment" help="In Recruitment"/>
+                    <field name="department_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 843d58b4690..8a671e8438f 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -55,11 +55,11 @@
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
                     <field name="name" string="Attendance"/>
-                    <field name="employee_id"/>
                     <field name="action"/>
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
                     <separator/>
                     <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <field name="employee_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index ed7f17bbf40..2009e500bf9 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -43,8 +43,8 @@
                    <field name="name" string="Contracts"/>
                    <field name="date_start"/>
                    <field name="date_end"/>
-                   <field name="employee_id"/>
                    <field name="working_hours"/>
+                   <field name="employee_id"/>
                    <group expand="0" string="Group By...">
                        <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                        <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 6f998faa9e9..c67b5b51d1f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -231,10 +231,10 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                     <field name="date"/>
-                    <field name="employee_id" />
-                    <field name="plan_id"/>
                     <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
                     <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
+                    <field name="employee_id" />
+                    <field name="plan_id"/>
                     <group expand='0' string='Group by...'>
                         <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
                         <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
@@ -319,9 +319,9 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                     <field name="date_deadline"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                     <field name="user_to_review_id"/>
                     <field name="user_id" string="Interviewer"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index c08bce9f3a4..f92ff1efedb 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -45,11 +45,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
-                <field name="employee_id"/>
-                <field name="plan_id"/>
                 <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]" help = "In progress Evaluations"/>
                 <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]" help = "Final Validation Evaluations"/>
                 <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                <field name="employee_id"/>
+                <field name="plan_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="rating"/>
                     <field name="deadline"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 83772b6a3af..24514241916 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -138,12 +138,12 @@
                 <search string="Expense">
                     <field name="name" string="Expenses"/>
                     <field name="date"/>
-                    <field name="employee_id"/>
-                    <field name="department_id" string="Department" context="{'invisible_department': False}"/>
-                    <field name="user_id"  string="User"/>
                     <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
                     <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
                     <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+                    <field name="employee_id"/>
+                    <field name="department_id" string="Department" context="{'invisible_department': False}"/>
+                    <field name="user_id"  string="User"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 01d7a9b7bef..73ec45bde02 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -51,11 +51,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
-                <field name="employee_id"/>
-                <field name="department_id"/>
                 <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/>
                 <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" help = "Approved Expenses"/>
                 <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" help = "Invoiced Expenses"/>
+                <field name="employee_id"/>
+                <field name="department_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="product_id"/>
                     <field name="user_id"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9a715b48efa..29ca1e7b87d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -45,9 +45,6 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <field name="date_from"/>
-                    <field name="employee_id"/>
-                    <field name="department_id"/>
-                    <field name="holiday_status_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
@@ -59,6 +56,9 @@
                     <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
+                    <field name="holiday_status_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_date_from" string="Start Date" icon="terp-personal" domain="[]" context="{'group_by':'date_from'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f9b5ae67f94..b08ce6983c6 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -177,8 +177,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                    <field name="slip_id"/>
                     <field name="amount_select"/>
+                    <field name="slip_id"/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
                         <filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
                         <filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/>
@@ -360,10 +360,10 @@
                 <search string="Search Payslips">
                     <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
                     <field name="date_from"/>
-                    <field name="employee_id"/>
-                    <field name="payslip_run_id"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
                     <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
+                    <field name="employee_id"/>
+                    <field name="payslip_run_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
                         <filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 77b881de5e1..ad139b088d0 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -214,8 +214,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-                <field name="job_id"/>
-                <field name="user_id"/>
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                 <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                 <separator/>
@@ -227,6 +225,8 @@
                 <separator/>
                 <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
+                <field name="job_id"/>
+                <field name="user_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4c8d967845b..afb87aba4ff 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -49,15 +49,15 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
-                <field name="job_id"/>
-                <field name="department_id"/>
-                <field name="user_id" string="Responsible"/>
                 <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
                 <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
                 <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
                 <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
                 <separator/>
                 <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
+                <field name="job_id"/>
+                <field name="department_id"/>
+                <field name="user_id" string="Responsible"/>
                 <group expand="0" string="Extended Filters...">
                     <!--field name="job_id"/-->
                     <field name="priority"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 1fad5f92b2e..5048f2c9193 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -46,10 +46,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
+                    <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
                     <field name="user_id"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
-                    <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="date"/>
                         <field name="invoice_id"/>
@@ -140,8 +140,8 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <field name="name" string="Timesheet by users"/>
-                    <field name="user_id"/>
                     <field name="month"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -269,9 +269,9 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <field name="name" string="Timesheet by account"/>
+                    <field name="month"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id"/>
-                    <field name="month"/>
                 </search>
             </field>
         </record>
@@ -335,9 +335,9 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <field name="name" string="Timesheet by account"/>
+                    <field name="month"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id"/>
-                    <field name="month"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 05319b075e8..6dbbb85aea9 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,9 +114,9 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                     <field name="name" string="Analytic Lines"/>
+                    <field name="month"/>
                     <field name="product_id"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="month"/>
                </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 0c1e2e0771b..86ef3255286 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -23,9 +23,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account">
-                    <field name="sheet_id" />
                     <field name="name" groups="analytic.group_analytic_accounting"/>
                     <field name="invoice_rate"/>
+                    <field name="sheet_id" />
                 </search>
             </field>
         </record>
@@ -157,10 +157,10 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <field name="date_from"/>
-                    <field name="employee_id"/>
-                    <field name="department_id"/>
                     <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                     <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 1e061b12d36..9956ed2655e 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -48,11 +48,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <field name="account_id"/>
-                    <field name="user_id" />
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                    <field name="account_id"/>
+                    <field name="user_id" />
                     <group expand="0" string="Extended Filters...">
                         <field name="general_account_id"/>
                         <field name="to_invoice"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 8e1e4b50a5f..4508301ca8c 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -111,10 +111,10 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <field name="name" string="Idea"/>
-                <field name="category_ids"/>
                 <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
                 <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
                 <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" />
+                <field name="category_ids"/>
                 <group expand="0" string="Group By...">
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 40231d6c948..d953dfbd1a9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -76,9 +76,9 @@
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
                     <field name="date"/>
-                    <field name="user_id"/>
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
                     </group>
@@ -295,8 +295,8 @@
             <field name="arch" type="xml">
                 <search string="Products">
                     <field name="name" string="Product"/>
-                    <field name="category_id"/>
                     <field name="price"/>
+                    <field name="category_id"/>
                 </search>
             </field>
         </record>
@@ -370,9 +370,9 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <field name="date"/>
-                    <field name="user_id"/>
                     <field name="box"/>
                     <field name="amount"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
                     </group>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 796aaebf945..b967035bec3 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -78,7 +78,6 @@
             <field name="priority">25</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="user_id"/>
                     <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
                     <field name="type"/>
                     <filter icon="terp-personal+" string="My Feeds"
@@ -103,6 +102,7 @@
                             domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
                                         ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))
                                     ]"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index a3d8af6c048..61981c54928 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -114,12 +114,12 @@
         <field name="arch" type="xml">
             <search string="Campaigns">
                 <field name="name" string="Campaign"/>
-                <field name="object_id" string="Resource"/>
                 <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
                 <separator/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
+                <field name="object_id" string="Resource"/>
                 <group expand="0" string="Group By...">
                     <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
                     <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
@@ -211,14 +211,14 @@
             <search string="Segments">
                 <field name="name" string="Segment"/>
                 <field name="date_run"/>
-                <field name="campaign_id"/>
-                <field name="object_id"/>
                 <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
                 <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                 <separator/>
                 <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
                 <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
                 <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
+                <field name="campaign_id"/>
+                <field name="object_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
                     <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
@@ -407,13 +407,13 @@
             <search string="Marketing Campaign Activities">
                 <field name="res_name" string="Marketing Campaign Activity"/>
                 <field name="date"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
                 <field name="campaign_id"/>
                 <field name="segment_id"/>
                 <field name="object_id"/>
                 <field name="partner_id"/>
                 <field name="res_id"/>
-                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
                     <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 04b91a268b0..30913f1b532 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -32,14 +32,14 @@
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
                 <field name="date"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','todo')]"/>
+                <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]"/>
                 <field name="campaign_id"/>
                 <field name="activity_id"/>
                 <field name="segment_id"/>
                 <field name="partner_id"/>
                 <field name="country_id"/>
-                <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','todo')]"/>
-                <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
-                <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]"/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                     <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 3d5e008160e..18025408bd1 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -13,8 +13,8 @@
             <field name="arch" type="xml">
                 <search string="Membership Products">
                     <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/>
-                    <field name="categ_id" operator="child_of"/>
                     <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
+                    <field name="categ_id" operator="child_of"/>
                     <group  expand='0' string='Group by...'>
                         <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                         <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index bb66aca3f94..71e1c6f7876 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -36,11 +36,11 @@
             <field name="arch" type="xml">
                 <search string="Membership">
                     <field name="date_from"/>
+                    <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
+                    <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                     <field name="partner_id"/>
                     <field name="membership_id"/>
                     <field name="user_id"/>
-                    <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                    <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" name="salesman"
                             domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 232c8edf123..c6a226aeb40 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -88,8 +88,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="name" string="Name"/>
-                    <field name="group_id" />
                     <field name="composition"/>
+                    <field name="group_id" />
                     <group expand="0" string="Group By...">
                         <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
                     </group>
@@ -301,9 +301,9 @@
             <field name="arch" type="xml">
                 <search string="Routing">
                     <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
@@ -820,8 +820,6 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                     <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <field name="product_id"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" name="pending" domain="[('state','=','confirmed')]"
                         help="Manufacturing Orders which are waiting for raw materials."/>
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','ready')]"
@@ -831,6 +829,8 @@
                     <separator/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                         help="Production started late"/>
+                    <field name="product_id"/>
+                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index f8ff9f4eada..4e77100bb95 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -125,8 +125,6 @@
             <search string="Search Work Orders">
                 <field name="name" string="Work Orders"/>
                 <field name="date_planned"/>
-                <field name="workcenter_id"/>
-                <field name="production_id"/>
                 <field name="state"/>
                 <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="In Progress" name="Current" domain="[('state','=','startworking')]"/>
@@ -134,6 +132,8 @@
                 <separator/>
                 <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                     help="Production started late"/>
+                <field name="workcenter_id"/>
+                <field name="production_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
                     <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index c2ae1be9cd9..0c9ee4c6726 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -47,11 +47,11 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="date"/>
-                    <field name="product_id" />
-                    <field name="workcenter_id"/>
                     <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
                     <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
                     <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
+                    <field name="product_id" />
+                    <field name="workcenter_id"/>
                     <group expand="1" string="Group By...">
                         <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" />
                         <filter string="Work Center" name="Workcenter" icon="terp-go-home" context="{'group_by':'workcenter_id'}" />
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 739c8f108a7..24c8a0db2b2 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -190,14 +190,14 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <field name="name" string="Reair Orders"/>
-                  <field name="product_id"/>
-                  <field name="partner_id"/>
                   <field name="state"/>
                   <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                   <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                   <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
                   <separator/>
                   <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
+                  <field name="product_id"/>
+                  <field name="partner_id"/>
                   <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index b690e8d9ba7..8568c8d60d9 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -29,8 +29,8 @@
                 <search string="Search Cash Statements">
                     <field name="name" string="Cash Statement"/>
                     <field name="date"/>
-                    <field name="journal_id"/>
                     <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                    <field name="journal_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
@@ -48,9 +48,9 @@
                 <search string="Search Cash Statements">
                     <field name="name" string="Cash Statement"/>
                     <field name="date"/>
-                    <field name="journal_id"/>
                     <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                     <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                    <field name="journal_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 57dce86afcb..fc0de4c9198 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -140,11 +140,11 @@
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order"/>
                     <field name="date_order"/>
-                    <field name="user_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -831,9 +831,9 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Config">
                     <field name="name" />
-                    <field name="shop_id" />
                     <filter string="Active" domain="[('state', '=', 'active')]" />
                     <filter string="Inactive" domain="[('state', '=', 'inactive')]" />
+                    <field name="shop_id" />
                 </search>
             </field>
         </record>
@@ -978,12 +978,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Session">
-                    <field name="config_id" />
                     <field name="name" />
-                    <field name="user_id" />
                     <filter string="Open" domain="[('state', '=', 'opened')]" />
                     <separator/>
                     <filter string="Today" domain="[('start_at', '>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" />
+                    <field name="config_id" />
+                    <field name="user_id" />
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
                         <filter string="Point of Sales" domain="[]" context="{'group_by': 'user_id'}" />
@@ -1023,13 +1023,13 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name"/>
-                    <field name="user_id"/>
                     <field name="date_order"/>
-                    <field name="session_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
+                    <field name="user_id"/>
+                    <field name="session_id"/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 297ac7e8c7f..e103fe4e6c0 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -34,11 +34,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
-                    <field name="partner_id"/>
                     <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-dolar" string="Invoiced" domain="[('state','=',('invoiced'))]"/>
                     <filter icon="terp-dolar" string="Not Invoiced" domain="[('state','=',('paid'))]"/>
                     <separator/>
@@ -48,6 +44,10 @@
                          help="POS ordered created by today"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index a2d60f9bd0a..66dcb87289a 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -214,8 +214,8 @@
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
                 <field name="name" string="Process Node"/>
-                <field name="model_id"/>
                 <field name="kind" />
+                <field name="model_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index d7003c41b3e..247c081b8f9 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -119,7 +119,6 @@
                 <search string="Search Procurement">
                     <field name="origin" string="Procurement"/>
                     <field name="date_planned"/>
-                    <field name="product_id" />
                     <field name="state" />
                     <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
                     <separator/>
@@ -127,6 +126,7 @@
                     <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
                     <separator/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]" help="Procurement started late" />
+                    <field name="product_id" />
                     <group expand="0" string="Group By">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index f832a6d46c6..529add848bf 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -113,9 +113,9 @@
             <field name="arch" type="xml">
                 <search string="Products Price Search">
                     <field name="name" string="Products Price"/>
-                    <field name="currency_id"/>
                     <field name="type"/>
                     <field name="active" />
+                    <field name="currency_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3ddee91b468..e5161feea13 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,7 +10,6 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/>
-                   <field name="categ_id" operator="child_of"/>
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
                    <separator/>
@@ -19,8 +18,7 @@
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
-                   <separator orientation="vertical"/>
-                   <field name="categ_id" widget="selection" operator="child_of"/>
+                   <field name="categ_id" operator="child_of"/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 62665109ec1..9bb2a8e9a75 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -156,8 +156,6 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                     <field name="complete_name" string="Project Name"/>
-                    <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Partner"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
@@ -167,6 +165,8 @@
                     <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
                     <separator/>
                     <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+                    <field name="user_id" string="Project Manager"/>
+                    <field name="partner_id" string="Partner"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -627,8 +627,6 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
@@ -642,6 +640,8 @@
                     <separator/>
                     <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
                         help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index f9a377246b9..ae87b3f2fe2 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -55,8 +55,6 @@
             <field name="arch" type="xml">
                 <search string="Task's Analysis">
                     <field name="date"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
                     <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                     <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                     <separator/>
@@ -67,6 +65,8 @@
                     <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
                     <separator/>
                     <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 45c813bb596..ab880536ced 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -61,9 +61,6 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="date_deadline"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
-                    <field name="partner_id" />
                     <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "New tasks"/>
                     <filter string="In progress" icon="terp-check" domain="[('state', '=' ,'open')]" help = "In progress tasks"/>
                     <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending tasks"/>
@@ -73,6 +70,9 @@
                     <separator/>
                     <filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" />
                     <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id" />
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e96d416e51f..a46fb3d3c5b 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -206,8 +206,6 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                    <field name="user_id"/>
-                    <field name="project_id"/>
                     <field name="id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
@@ -215,6 +213,8 @@
                     <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                     <separator/>
                     <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
+                    <field name="user_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -344,11 +344,11 @@
                 <search string="Feature Tracker Search">
                     <field name="name" string="Feature description"/>
                     <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="project_id" string="Project"/>
                     <field name="state" groups="base.group_no_one"/>
                     <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                     <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
+                    <field name="user_id"/>
+                    <field name="project_id" string="Project"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 634e40a7d56..e0b505276d8 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -53,14 +53,14 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="creation_date"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
-                    <field name="partner_id"/>
-                    <field name="version_id"/>
                     <filter  icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/>
                     <filter  icon="terp-check" string="To Do" domain="[('state','=','open')]"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="version_id"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index d60ffb88b21..ed63218e37b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -271,12 +271,12 @@
                     <field name="name" string="Project Phases"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <field name="project_id"/>
                     <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
                     <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                     <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                     <separator/>
                     <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 012bca66bac..ddd752ccb99 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -269,14 +269,14 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -295,9 +295,6 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
@@ -305,6 +302,9 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -554,6 +554,5 @@
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index b0d386e667e..aa915c620f5 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,10 +53,10 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-                <field name="partner_id"/>
-                <field name="product_id"/>
                 <filter icon="terp-document-new" string="Quotations" name="quotes" domain="[('state','=','draft')]"/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Orders" name="orders" domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="user_id"/>
                     <field name="validator"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 7d1a6ea895f..2191e642ab2 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -47,15 +47,15 @@
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
                     <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <field name="stock_journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="purchase_id" />
                     <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
                     <filter icon="terp-dialog-close" name="done" string="Received" domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
                     <separator/>
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="purchase_id" />
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index af2106d5466..e0b8db4862f 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -135,13 +135,13 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                     <field name="name" string="Purchase Requisition"/>
-                    <field name="user_id" />
                     <field name="exclusive" />
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="Sent to Suppliers" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Purchase Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
                     <separator/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
+                    <field name="user_id" />
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 71dab48dd03..73cf99bec34 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -100,9 +100,9 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
-                    <field name="intrastat_id"/>
                     <field name="month"/>
                     <field name="type"/>
+                    <field name="intrastat_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index ddb31744e65..5b388469f3c 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,10 +11,10 @@
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <field name="name" string="Resource"/>
-                   <field name="user_id" string="User"/>
-                   <field name="company_id" groups="base.group_multi_company"/>
                    <field name="resource_type"/>
                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
+                   <field name="user_id" string="User"/>
+                   <field name="company_id" groups="base.group_multi_company"/>
                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 88c15e38d20..1ac6d425530 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -52,15 +52,15 @@
             <search string="Sales Analysis">
                 <field name="date"/>
                 <field name="date_confirm"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
-                <field name="user_id"/>
                 <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="Sales" domain="[('state','not in',('draft','done','cancel'))]"/>
                 <separator/>
                 <filter icon="terp-accessories-archiver" string="Picked" domain="[('shipped','=',True)]"/>
                 <separator/>
                 <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <field name="user_id"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="shop_id"/>
                     <field name="categ_id"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ee440ffe4df..48e823250dc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -359,8 +359,6 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
@@ -368,6 +366,8 @@
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator/>
                     <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -523,13 +523,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
+                    <separator/>
+                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
-                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
-                    <separator/>
-                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
@@ -546,10 +546,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <field name="order_id"/>
-                    <field name="order_partner_id"/>
-                    <field name="product_id"/>
-                    <field name="salesman_id"/>
                     <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
                     <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
@@ -557,6 +553,10 @@
                     <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
+                    <field name="order_id"/>
+                    <field name="order_partner_id"/>
+                    <field name="product_id"/>
+                    <field name="salesman_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 69f26dbb374..56d17976aad 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -56,14 +56,14 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Moves Analysis">
-                <field name="product_id" default_focus="1"/>
-                <field name="partner_id" context="{'contact_display':'partner'}"/>
                 <filter string="Done" name="done" icon="terp-dialog-close" domain="[('state','=','done')]" help = "Completed Stock-Moves"/>
                 <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('assigned','waiting','confirmed'))]" help = "Future Stock-Moves"/>
                 <separator/>
                 <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
                 <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
                 <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
+                <field name="product_id" default_focus="1"/>
+                <field name="partner_id" context="{'contact_display':'partner'}"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="location_id" />
                     <field name="location_dest_id" />
@@ -144,15 +144,15 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
-                <field name="product_id" default_focus="1"/>
-                <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
-                <field name="company_id" groups="base.group_multi_company"/>
                 <filter string="Real" name="real" icon="terp-check" domain="[('state','=','done')]"
                     help="Analysis of current inventory (only moves that have already been processed)"/>
                 <filter string="Future" icon="terp-stock" domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                     help = "Analysis including future moves (similar to virtual stock)"/>
                 <separator/>
                 <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
+                <field name="product_id" default_focus="1"/>
+                <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id" context="{'contact_display':'partner'}"/>
                     <field name="product_categ_id" />
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index bcd5d903251..15dafbfdbc1 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -35,11 +35,11 @@
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
                     <field name="date"/>
-                    <field name="product_id"/>
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable" domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable" domain="[('product_id.type','=', 'consu')]"/>
                     <separator/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv" domain="[('date','=', False)]"/>
+                    <field name="product_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 94c9b0e25b1..ed2aaad244d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -398,8 +398,8 @@
                 <search string="Product Lots Filter">
                     <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
                     <field name="date"/>
-                    <field name="product_id"/>
                     <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots"/>
+                    <field name="product_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
@@ -554,10 +554,10 @@
             <field name="arch" type="xml">
                 <search string="Stock Locations">
                     <field name="name" string="Stock Locations"/>
-                    <field name="location_id" string="Parent Location"/>
                     <filter icon="terp-go-home" name="in_location" string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
                     <filter icon="terp-personal" name="customer" string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
                     <filter icon="terp-personal" name="supplier" string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/>
+                    <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
         </record>
@@ -871,12 +871,12 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="stock_journal_id"/>
                     <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                     <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
                     <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="stock_journal_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
@@ -976,8 +976,6 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
-                    <field name="stock_journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
                     <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                     <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                     <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
@@ -985,6 +983,8 @@
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
+                    <field name="stock_journal_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
@@ -1082,14 +1082,14 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <field name="stock_journal_id"/>
-                    <field name="product_id"/>
                     <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
                     <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
                     <separator/>
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="product_id"/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
@@ -1267,15 +1267,15 @@
                 <search string="Stock Moves">
                     <field name="origin" string="Stock Moves"/>
                     <field name="date" groups="base.group_no_one"/>
-                    <field name="product_id"/>
-                    <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
-                    <field name="prodlot_id"/>
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                     <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                     <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                     <separator/>
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
+                    <field name="product_id"/>
+                    <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
+                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
+                    <field name="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
@@ -1371,13 +1371,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <field name="origin" string="Stock Moves"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
                     <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                     <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                     <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
                     <separator/>
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
+                    <field name="product_id"/>
+                    <field name="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -1396,13 +1396,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <field name="origin" string="Stock Moves"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
                     <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                     <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                     <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
                     <separator/>
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
+                    <field name="product_id"/>
+                    <field name="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -1579,7 +1579,6 @@
             <field name="arch" type="xml">
                 <search string="Stock Journal">
                     <field name="name" string="Stock Journal"/>
-                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index bb6cd7e3515..8c1cb0d2c80 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -196,12 +196,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
+                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
                     <field name="product_id"/>
                     <field name="create_uid"/>
-                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
                     <group expand="0" string="Group By...">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
@@ -302,11 +302,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
+                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
                     <field name="company_id"/>
                     <field name="warehouse_id"/>
                     <field name="period_id"/>
                     <field name="product_id"/>
-                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
                     <group expand="0" string="Group By...">
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 9528f72bfa8..e7244c7ff1d 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -75,11 +75,11 @@
                 <search string="Search Subscription">
                     <field name="name" string="Subscription"/>
                     <field name="date_init"/>
-                    <field name="user_id"/>
-                    <field name="partner_id"/>
                     <filter icon="terp-check"
                             string="Running"
                             domain="[('state','=','running')]"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index ead5380921f..22838058bec 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -279,11 +279,11 @@
                 <search string="Search Survey">
                     <field name="title" string="Survey"/>
                     <field name="type"/>
-                    <field name="responsible_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
                     <separator/>
                     <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
+                    <field name="responsible_id"/>
                    <group expand="0" string="Group By...">
                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
@@ -752,9 +752,9 @@
             <field name="arch" type="xml">
                 <search string="Search Question">
                     <field name="question" string="Question"/>
-                    <field name="page_id"/>
                     <field name="survey"/>
                     <field name="type"/>
+                    <field name="page_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'page_id'}"/>
                     </group>
@@ -1172,13 +1172,13 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                     <field name="email" string="Survey"/>
-                    <field name="survey_id" widget="selection"/>
-                    <field name="user_id"/>
                     <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                     <separator/>
                     <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                     <separator/>
                     <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
+                    <field name="survey_id" widget="selection"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index d39b986e04e..d0d4c35a80d 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -177,9 +177,9 @@
                         filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
                         string="Wiki"/>
                     <field name="write_date" groups="base.group_no_one"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <field name="group_id"/>
                     <field name="write_uid"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>

From d375ee272e55d071920cec9f5092143d67b2ea4d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 31 Jul 2012 14:06:21 +0200
Subject: [PATCH 284/312] [FIX] rec_name assertion and fallback

bzr revid: al@openerp.com-20120731120621-11j7k7965d9sclp2
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index a18c4195dc2..7570cb3d690 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1056,7 +1056,7 @@ class BaseModel(object):
 
         # Validate rec_name
         if self._rec_name:
-            assert self.rec_name in self._columns
+            assert self._rec_name in self._columns
         else:
             self._rec_name = 'name'
 

From 1171a28cc592ddd07745cada8c3f6e933d684d8e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 31 Jul 2012 14:22:02 +0200
Subject: [PATCH 285/312] [FIX] account invalid rec_names

bzr revid: al@openerp.com-20120731122202-a4qccozmbjudgc8p
---
 addons/account/account_cash_statement.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 927ce94db31..ae225cc60de 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -32,7 +32,7 @@ class account_cashbox_line(osv.osv):
 
     _name = 'account.cashbox.line'
     _description = 'CashBox Line'
-    _rec_name = 'number'
+    _rec_name = 'pieces'
 
     def _sub_total(self, cr, uid, ids, name, arg, context=None):
 
@@ -325,7 +325,7 @@ account_journal()
 
 class account_journal_cashbox_line(osv.osv):
     _name = 'account.journal.cashbox.line'
-    _rec_name = 'value'
+    _rec_name = 'pieces'
     _columns = {
         'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
         'journal_id' : fields.many2one('account.journal', 'Journal', required=True, select=1),

From 8540dcf017fd21efca71dbc175127779cdcb78be Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 31 Jul 2012 14:25:57 +0200
Subject: [PATCH 286/312] [FIX] assertion message

bzr revid: al@openerp.com-20120731122557-9ka14pw09x2fhmos
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7570cb3d690..c5490a6a99c 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1056,7 +1056,7 @@ class BaseModel(object):
 
         # Validate rec_name
         if self._rec_name:
-            assert self._rec_name in self._columns
+            assert self._rec_name in self._columns.keys() + ['id'], "Invalid rec_name %s for model %s" % (self.rec_name, self._name)
         else:
             self._rec_name = 'name'
 

From 9a71c26a6cd6fe29e56b51f051fb60783bcf3e99 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 31 Jul 2012 14:41:23 +0200
Subject: [PATCH 287/312] [FIX] move event files from portal to portal_event

bzr revid: abo@openerp.com-20120731124123-1ybul1sszkuo5xh3
---
 addons/portal/__init__.py                      | 1 -
 addons/portal/__openerp__.py                   | 1 -
 addons/portal_event/__init__.py                | 1 +
 addons/portal_event/__openerp__.py             | 3 ++-
 addons/{portal => portal_event}/event.py       | 0
 addons/{portal => portal_event}/event_view.xml | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename addons/{portal => portal_event}/event.py (100%)
 rename addons/{portal => portal_event}/event_view.xml (100%)

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 8d7e0fdef46..65b924183e1 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -22,7 +22,6 @@
 import portal
 import wizard
 import res_user
-import event
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 58896c4bed9..6dd22a46ca2 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -39,7 +39,6 @@ very handy when used in combination with the module 'share'.
     """,
     'website': 'http://www.openerp.com',
     'data': [
-        'event_view.xml',
         'security/portal_security.xml',
         'security/ir.model.access.csv',
         'portal_view.xml',
diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py
index 26c654db9dd..60fb460545a 100644
--- a/addons/portal_event/__init__.py
+++ b/addons/portal_event/__init__.py
@@ -19,3 +19,4 @@
 #
 ##############################################################################
 
+import event
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
index 865f18604d6..2f5220c9f36 100644
--- a/addons/portal_event/__openerp__.py
+++ b/addons/portal_event/__openerp__.py
@@ -26,12 +26,13 @@
     'category': 'Tools',
     'complexity': "easy",
     'description': """
-This module adds event menu and features to your portal if event and portal are 
+This module adds event menu and features to your portal if event and portal are
 installed.
     """,
     'author': 'OpenERP SA',
     'depends': ['event','portal'],
     'data': [
+        'event_view.xml',
         'security/portal_security.xml',
         'portal_event_view.xml',
         'security/ir.model.access.csv',
diff --git a/addons/portal/event.py b/addons/portal_event/event.py
similarity index 100%
rename from addons/portal/event.py
rename to addons/portal_event/event.py
diff --git a/addons/portal/event_view.xml b/addons/portal_event/event_view.xml
similarity index 100%
rename from addons/portal/event_view.xml
rename to addons/portal_event/event_view.xml

From f76a672ba467a6a51727b5a36618a0db07945cf2 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 31 Jul 2012 15:31:33 +0200
Subject: [PATCH 288/312] [FIX] indentation

bzr revid: abo@openerp.com-20120731133133-bqgxee7oqyz8wos1
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 166c216b9a6..6cb43ed8e3a 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -154,11 +154,11 @@
                     <group>
                         <group>
                             <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
-                <label for="amount" string="Amount"/>
-                <div>
+                            <label for="amount" string="Amount"/>
+                            <div>
                                 <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline"/>
                                 <field name="currency_id" class="oe_inline"/>
-                </div>
+                            </div>
                             <field name="journal_id"
                                 domain="[('type','in',['bank', 'cash'])]"
                                 invisible="context.get('line_type', False)"

From 8e43e0f494a51aa6384e804eb63c2be3b5f3af0d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 31 Jul 2012 16:03:09 +0200
Subject: [PATCH 289/312] [ADD] Added support for future display_name

bzr revid: fme@openerp.com-20120731140309-8hawqnal8cw3zxww
---
 addons/web/controllers/main.py        | 10 +++++++++
 addons/web/static/src/js/view_form.js | 32 ++++++++++-----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index da034aa88b6..e4c576fecae 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -997,6 +997,16 @@ class DataSet(openerpweb.Controller):
             elif isinstance(kwargs[k], common.nonliterals.BaseDomain):
                 kwargs[k] = req.session.eval_domain(kwargs[k])
 
+        # Temporary implements future display_name special field for model#read()
+        if method == 'read' and kwargs.get('context') and kwargs['context'].get('future_display_name'):
+            if 'display_name' in args[1]:
+                names = req.session.model(model).name_get(args[0], **kwargs)
+                args[1].remove('display_name')
+                r = getattr(req.session.model(model), method)(*args, **kwargs)
+                for i in range(len(r)):
+                    r[i]['display_name'] = names[i][1] or "%s#%d" % (model, names[i][0])
+                return r
+
         return getattr(req.session.model(model), method)(*args, **kwargs)
 
     @openerpweb.jsonrequest
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 65afd4a36d6..9afe980b89e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -277,8 +277,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                     // null index means we should start a new record
                     return self.on_button_new();
                 }
-                return self.dataset.read_index(_.keys(self.fields_view.fields), {
-                    context: { 'bin_size': true }
+                var fields = _.keys(self.fields_view.fields);
+                fields.push('display_name');
+                return self.dataset.read_index(fields, {
+                    context: { 'bin_size': true, 'future_display_name' : true }
                 }).pipe(self.on_record_loaded);
             });
         }
@@ -302,7 +304,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this._super();
     },
     on_record_loaded: function(record) {
-        var self = this, defs = [];
+        var self = this, set_values = [];
         if (!record) {
             this.set({ 'title' : undefined });
             this.do_warn("Form", "The record could not be found in the database.", true);
@@ -310,19 +312,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         this.datarecord = record;
         this._actualize_mode();
-
-        var titleDef = $.Deferred();
-        if (record.id) {
-            this.dataset.name_get([record.id]).then(function(names) {
-                self.set({ 'title' : names[0][1] });
-            }).always(function() {
-                titleDef.resolve();
-            });
-        } else {
-            this.set({ 'title' : "New record" });
-            titleDef.resolve();
-        }
-        defs.push(titleDef);
+        this.set({ 'title' : record.id ? record.display_name : "New record" });
 
         if (this.qweb) {
             this.kill_current_form();
@@ -334,9 +324,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         _(this.fields).each(function (field, f) {
             field._dirty_flag = false;
             var result = field.set_value(self.datarecord[f] || false);
-            defs.push(result);
+            set_values.push(result);
         });
-        return $.when.apply(null, defs).pipe(function() {
+        return $.when.apply(null, set_values).pipe(function() {
             if (!record.id) {
                 // New record: Second pass in order to trigger the onchanges
                 // respecting the fields order defined in the view
@@ -868,8 +858,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             if (self.dataset.index == null || self.dataset.index < 0) {
                 return $.when(self.on_button_new());
             } else {
-                return self.dataset.read_index(_.keys(self.fields_view.fields), {
-                    context : { 'bin_size' : true }
+                var fields = _.keys(self.fields_view.fields);
+                fields.push('display_name');
+                return self.dataset.read_index(fields, {
+                    context : { 'bin_size' : true, 'future_display_name' : true }
                 }).pipe(self.on_record_loaded);
             }
         });

From 8ab0a77cad4347bb5f16fd4f6d5bde9050b772af Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 31 Jul 2012 16:47:04 +0200
Subject: [PATCH 290/312] [FIX] project_timesheet: Define the task_hrs field in
 the SQL view instead of function field

bzr revid: stw@openerp.com-20120731144704-8rvur011ycpc7w4f
---
 .../project_timesheet/report/task_report.py   | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 3c223ab6b07..b32d852bc5f 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -29,22 +29,8 @@ class report_timesheet_task_user(osv.osv):
     _auto = False
     _order = "name"
 
-    def _get_task_hours(self, cr, uid, ids, name,args,context):
-        result = {}
-        for record in self.browse(cr, uid, ids,context):
-            last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
-            task_obj = self.pool.get('project.task.work')
-            task_ids = task_obj.search(cr, uid, [('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))])
-            tsk_hrs = task_obj.read(cr, uid, task_ids, ['hours','date','user_id'])
-            total = 0.0
-            for hrs in tsk_hrs:
-                total += hrs['hours']
-            result[record.id] = total
-        return result
-
     def get_hrs_timesheet(self, cr, uid, ids, name,args,context):
         result = {}
-        sum = 0.0
         for record in self.browse(cr, uid, ids, context):
             last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
             obj = self.pool.get('hr_timesheet_sheet.sheet.day')
@@ -63,7 +49,7 @@ class report_timesheet_task_user(osv.osv):
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
         'timesheet_hrs': fields.function(get_hrs_timesheet, string="Timesheet Hours"),
-        'task_hrs': fields.function(_get_task_hours, string="Task Hours"),
+        'task_hrs' : fields.float('Task Hours'),
     }
 
     def init(self, cr):
@@ -74,7 +60,9 @@ class report_timesheet_task_user(osv.osv):
                months.name as name,
                r.id as user_id,
                to_char(to_date(months.name, 'YYYY/MM/DD'),'YYYY') as year,
-               to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month
+               to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month,
+               (select sum(hours) from project_task_work where user_id = r.id and date between to_date(months.name, 'YYYY/MM/DD') and (to_date(months.name, 'YYYY/MM/DD') + interval '1 month' -
+            interval '1 day') ) as task_hrs
         from res_users r,
                 (select to_char(p.date,'YYYY-MM-01') as name,
             to_char(p.date,'MM') as m_id

From 4811011c7617101d840bcdcc2c965b45972b0ce1 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 31 Jul 2012 17:17:18 +0200
Subject: [PATCH 291/312] [FIX] typo

bzr revid: al@openerp.com-20120731151718-g0fk33ycoapob13j
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c5490a6a99c..5d2399309e0 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1056,7 +1056,7 @@ class BaseModel(object):
 
         # Validate rec_name
         if self._rec_name:
-            assert self._rec_name in self._columns.keys() + ['id'], "Invalid rec_name %s for model %s" % (self.rec_name, self._name)
+            assert self._rec_name in self._columns.keys() + ['id'], "Invalid rec_name %s for model %s" % (self._rec_name, self._name)
         else:
             self._rec_name = 'name'
 

From 42859212faae2624cfe8eeb592d4836f50aa5ed2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 31 Jul 2012 17:26:49 +0200
Subject: [PATCH 292/312] [FIX] typos and vmt review

bzr revid: al@openerp.com-20120731152649-4mxph7d0cnlaqtef
---
 openerp/osv/orm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 5d2399309e0..2c73e811eeb 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -657,7 +657,7 @@ class BaseModel(object):
     _columns = {}
     _constraints = []
     _defaults = {}
-    _rec_name = False
+    _rec_name = None
     _parent_name = 'parent_id'
     _parent_store = False
     _parent_order = False
@@ -1055,7 +1055,7 @@ class BaseModel(object):
                                      "in order to implement their access rights policy"
 
         # Validate rec_name
-        if self._rec_name:
+        if self._rec_name is None:
             assert self._rec_name in self._columns.keys() + ['id'], "Invalid rec_name %s for model %s" % (self._rec_name, self._name)
         else:
             self._rec_name = 'name'
@@ -1921,7 +1921,7 @@ class BaseModel(object):
             return False
 
         view = etree.Element('calendar', string=self._description)
-        etree.SubElement(view, 'field', self._rec_name_get(cr,uid,context))
+        etree.SubElement(view, 'field', self._rec_name_fallback(cr,uid,context))
 
         if (self._date_name not in self._columns):
             date_found = False

From 049e716ab91b8c39c21097f3f86f158998b3dfa0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 31 Jul 2012 18:44:33 +0200
Subject: [PATCH 293/312] [FIX] lunch rec_name

bzr revid: al@openerp.com-20120731164433-03q57asaqkqr981r
---
 addons/lunch/lunch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 8cca4ced465..c249478ad48 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -210,7 +210,7 @@ class report_lunch_amount(osv.osv):
     _name = 'report.lunch.amount'
     _description = "Amount available by user and box"
     _auto = False
-    _rec_name = "user"
+    _rec_name = "user_id"
 
     _columns = {
         'user_id': fields.many2one('res.users', 'User Name', readonly=True),

From e845e2350c694484793020ab6a9a729f9c205de6 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 1 Aug 2012 04:44:11 +0000
Subject: [PATCH 294/312] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120801044335-2llntxn2tfj8m7yt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120801044411-aoxlecq42a8czbf8
---
 addons/account/i18n/es_EC.po       |   4 +-
 addons/account_asset/i18n/es_EC.po |   4 +-
 addons/hr_payroll/i18n/he.po       |   4 +-
 addons/import_base/i18n/pt_BR.po   | 105 ++++
 addons/mrp_repair/i18n/mn.po       | 819 +++++++++++++++++++++++++++++
 addons/sale/i18n/mn.po             |  10 +-
 addons/sale_crm/i18n/ja.po         |   4 +-
 addons/sale_margin/i18n/ja.po      |   4 +-
 addons/stock_planning/i18n/ja.po   |   4 +-
 openerp/addons/base/i18n/ja.po     |   4 +-
 10 files changed, 943 insertions(+), 19 deletions(-)
 create mode 100644 addons/import_base/i18n/pt_BR.po
 create mode 100644 addons/mrp_repair/i18n/mn.po

diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index fba1c8ed099..14beb1f5d65 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
index ec12e6c4a58..9ce2a26fcec 100644
--- a/addons/account_asset/i18n/es_EC.po
+++ b/addons/account_asset/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/hr_payroll/i18n/he.po b/addons/hr_payroll/i18n/he.po
index 9b54273f823..2957d625576 100644
--- a/addons/hr_payroll/i18n/he.po
+++ b/addons/hr_payroll/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/import_base/i18n/pt_BR.po b/addons/import_base/i18n/pt_BR.po
new file mode 100644
index 00000000000..9587acd607f
--- /dev/null
+++ b/addons/import_base/i18n/pt_BR.po
@@ -0,0 +1,105 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-01 01:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "A importação falhou devido a um erro inesperado"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "Início em %s e término em %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "A Importação de seus dados terminou em %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"mas falhou, por isso nenhum dado foi importado para manter a consistência do "
+"banco de dados \n"
+" erro: \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+"A importação de dados \n"
+" nome da instância: %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr "%s foi importada com sucesso de %s %s, %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr "A importação falhou em %s devido a um erro inesperado"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr "Importação Concluída, o email de notificação foi enviado"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr "%s não é um nome de modelo válido"
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "Importar"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "sem nenhum erro"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "com avisos:  %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " campos importados: "
diff --git a/addons/mrp_repair/i18n/mn.po b/addons/mrp_repair/i18n/mn.po
new file mode 100644
index 00000000000..18991cfec3e
--- /dev/null
+++ b/addons/mrp_repair/i18n/mn.po
@@ -0,0 +1,819 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-31 11:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees Line"
+msgstr "Ажлын хөлсний мөр"
+
+#. module: mrp_repair
+#: help:mrp.repair,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"repair order.             \n"
+"* The 'Confirmed' state is used when a user confirms the repair order.       "
+"      \n"
+"* The 'Ready to Repair' state is used to start to repairing, user can start "
+"repairing only after repair order is confirmed.             \n"
+"* The 'To be Invoiced' state is used to generate the invoice before or after "
+"repairing done.             \n"
+"* The 'Done' state is set when repairing is completed.            \n"
+"* The 'Cancelled' state is used when user cancel repair order."
+msgstr ""
+" * Засварын захиалгыг шинээр оруулж батлаагүй байх үед 'Ноорог' төлөвтэй "
+"байдаг.             \n"
+"* Хэрэглэгч засварын захиалгыг батлахад төлөв 'Батлагдсан' болдог.\n"
+"* Засах ажлыг эхлүүлснээр 'Засахад бэлэн' төлөвтэй болдог. Хэрэглэгч зөвхөн "
+"засварын захиалга батлагдсан дараа эхлүүлэх боломжтой.             \n"
+"* Засварын өмнө эсвэл хойно нэхэмжлэхээс хамааран 'Нэхэмжлэх' гэсэн төлөв "
+"хэрэглэгддэг.             \n"
+"* Засвар дууссан дараа 'Хийгдсэн' төлөвтэй болдог.            \n"
+"* Засварын захиалга цуцлагдсан тохиолдолд 'Цуцлагдсан' төлөвтэй болдог."
+
+#. module: mrp_repair
+#: field:mrp.repair.line,move_id:0
+msgid "Inventory Move"
+msgstr "Барааны хөдөлгөөн"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
+msgid ""
+"Repair orders allow you to organize your product repairs. In a repair order, "
+"you can detail the components you remove, add or replace and record the time "
+"you spent on the different operations. The repair order uses the warranty "
+"date on the production lot in order to know if whether the repair should be "
+"invoiced to the customer or not."
+msgstr ""
+"Засварын захиалга нь барааны засварыг зохион байгуулах боломжийг олгодог. "
+"Засварын захиалгад хасах, нэмэх, солих бүрэлдхүүнийг хөтлөх, мөн ажиллагааг "
+"хийхэд зарцуулсан цагийг хөтлөх боломжтой. Засварын захиалга нь "
+"үйлдвэрлэлийн цувралын баталгааны хугацааг ашиглан захиалагчийг нэхэмжлэх "
+"эсэхиээ шийддэг."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "Дахин нэхэмжлэл үүсгэх"
+
+#. module: mrp_repair
+#: help:mrp.repair,deliver_bool:0
+msgid ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a picking with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
+msgstr ""
+"Бараа засагдсан дараа хүргэлтийг менеж хийхээр бол үүнийг тэмдэглэнэ. Хэрэв "
+"тэмдгэлэгдсэн бол сонгосон барааны бэлтгэлт үүсгэгдэнэ."
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
+#: view:mrp.repair.cancel:0
+msgid "Cancel Repair Order"
+msgstr "Засварын захиалгыг цуцлах"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,to_invoice:0
+#: field:mrp.repair.line,to_invoice:0
+msgid "To Invoice"
+msgstr "Нэхэмжлэх"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Printing Date"
+msgstr "Хэвлэх огноо"
+
+#. module: mrp_repair
+#: field:mrp.repair.make_invoice,group:0
+msgid "Group by partner invoice address"
+msgstr "Захиалагчийн нэхэмжлэх хаягаар бүлэглэх"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:435
+#, python-format
+msgid "No product defined on Fees!"
+msgstr "Ажлын хөлс дээр бараа тодорхойлогдоогүй байна!"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Set to Draft"
+msgstr "Ноороглох"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Invoice Exception"
+msgstr "Нэхэмжлэлийн сондгойрол"
+
+#. module: mrp_repair
+#: field:mrp.repair,address_id:0
+msgid "Delivery Address"
+msgstr "Хургэх Хаяг"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
+#: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
+#: view:mrp.repair:0
+msgid "Make Invoice"
+msgstr "Нэхэмжлэл үүсгэх"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_subtotal:0
+#: field:mrp.repair.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Дэд дүн"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Invoice address :"
+msgstr "Нэхэмжлэх хаяг :"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,guarantee_limit:0
+msgid "Guarantee limit"
+msgstr "Баталгааны хязгаар"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,amount_tax:0
+#: field:mrp.repair.fee,tax_id:0
+#: field:mrp.repair.line,tax_id:0
+msgid "Taxes"
+msgstr "Татвар"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Net Total :"
+msgstr "Цэвэр дүн :"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:435
+#, python-format
+msgid "Warning !"
+msgstr "Анхааруулга !"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Operations"
+msgstr "Ажиллагаанууд"
+
+#. module: mrp_repair
+#: field:mrp.repair,move_id:0
+msgid "Move"
+msgstr "Хөдөлгөөн"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:370
+#, python-format
+msgid "You have to select a Partner Invoice Address in the repair form !"
+msgstr "Засварын маягтад харилцагчийн нэхэмжлэх хаягийг сонгох хэрэгтэй !"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
+msgid "Repair Orders"
+msgstr "Засварын захиалгууд"
+
+#. module: mrp_repair
+#: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
+msgid "Quotation / Order"
+msgstr "Үнийн санал / Захиалга"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:337
+#, python-format
+msgid "Warning"
+msgstr "Анхааруулга"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,repair_id:0
+#: field:mrp.repair.line,repair_id:0
+msgid "Repair Order Reference"
+msgstr "Засварын Захиалгын Код"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:384
+#, python-format
+msgid "No account defined for partner \"%s\"."
+msgstr "\"%s\" харилцагчид данс тодорхойлогдоогүй байна."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Confirmed"
+msgstr "Батлагдсан"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repairs order"
+msgstr "Засварын захиалга"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Repair Order N° :"
+msgstr "Засварын Захиалга № :"
+
+#. module: mrp_repair
+#: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
+#: report:repair.order:0
+msgid "Lot Number"
+msgstr "Цувралын Дугаар"
+
+#. module: mrp_repair
+#: field:mrp.repair,fees_lines:0
+msgid "Fees Lines"
+msgstr "Ажлын хөлсний мөрүүд"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,type:0
+msgid "Type"
+msgstr "Төрөл"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Fees Line(s)"
+msgstr "Ажлын хөлсний мөрүүд"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "To be Invoiced"
+msgstr "Нэхэмжлэх"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Shipping address :"
+msgstr "Хүргэх хаяг :"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:334
+#: code:addons/mrp_repair/mrp_repair.py:384
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
+#, python-format
+msgid "Error !"
+msgstr "Алдаа !"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Тоо хэмжээ (х.н)"
+
+#. module: mrp_repair
+#: help:mrp.repair.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically as draft when repair order in "
+"draft state.                         \n"
+"* The 'Confirmed' state is set automatically as confirm when repair order in "
+"confirm state.                         \n"
+"* The 'Done' state is set automatically when repair order is completed.      "
+"                  \n"
+"* The 'Cancelled' state is set automatically when user cancel repair order."
+msgstr ""
+" * Засварын захиалгын 'Ноорог' төлөв автоматаар олгогддог.                   "
+"      \n"
+"* Засварын захиалга батлагдахад төлөв 'Батлагдсан' болдог.                   "
+"      \n"
+"* Засварын захиалга дуусахад 'Хийгдсэн' төлөвтэй болдог.                     "
+"   \n"
+"* Хэрэглэгч засварын захиалгыг цуцлахад 'Цуцлагдсан' төлөвтэй болдог."
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Total :"
+msgstr "Нийт :"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid ""
+"This operation will cancel the Repair process, but will not cancel it's "
+"Invoice. Do you want to continue?"
+msgstr ""
+"Энэ үйлдэл нь засварын захиалгыг цуцлах боловч үүний нэхэмжлэлийг нь "
+"цуцлахгүй. Та үргэлжлүүлэхийг хүсч байна уу?"
+
+#. module: mrp_repair
+#: field:mrp.repair,pricelist_id:0
+msgid "Pricelist"
+msgstr "Үнийн жагсаалт"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,quotation_notes:0
+msgid "Quotation Notes"
+msgstr "Үнийн саналын тэмдэглэл"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
+#, python-format
+msgid "Warning!"
+msgstr "Анхааруулга!"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Search Reair Orders"
+msgstr "Засварын захиалгыг хайх"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "(Add)"
+msgstr "(Нэмэх)"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_line
+#: view:mrp.repair:0
+msgid "Repair Line"
+msgstr "Засварын мөр"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,partner_id:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_method:0
+msgid "Invoice Method"
+msgstr "Нэхэмжлэх арга"
+
+#. module: mrp_repair
+#: field:mrp.repair,repaired:0
+msgid "Repaired"
+msgstr "Засагдсан"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,invoice_line_id:0
+#: field:mrp.repair.line,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Нэхэмжлэлийн мөр"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Canceled"
+msgstr "Цуцлагдсан"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:337
+#, python-format
+msgid "Production lot is required for opration line with product '%s'"
+msgstr "'%s' бараатай ажиллагааны үйлдвэрлэлийн цуврал шаардлагатай"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "Before Repair"
+msgstr "Засварын өмнө"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_id:0
+msgid "Current Location"
+msgstr "Одоогийн байрлал"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid "Yes"
+msgstr "Тийм"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoiced:0
+#: field:mrp.repair.fee,invoiced:0
+#: field:mrp.repair.line,invoiced:0
+msgid "Invoiced"
+msgstr "Нэхэмжилсэн"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid "No"
+msgstr "Үгүй"
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Create invoices"
+msgstr "Нэхэмжлэлүүд үүсгэх"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "(Remove)"
+msgstr "(Устгах)"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+msgid "Add"
+msgstr "Нэмэх"
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,name:0
+msgid "Repair Reference"
+msgstr "Засварын Код"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair
+msgid "Repair Order"
+msgstr "Засварын Захиалга"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "Засагдаж буй"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Ready To Repair"
+msgstr "Засахад Бэлэн"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Татвар татахгүй дүн"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Guarantee Limit"
+msgstr "Баталгааны Хязгаар"
+
+#. module: mrp_repair
+#: field:mrp.repair,default_address_id:0
+msgid "unknown"
+msgstr "үл мэдэгдэх"
+
+#. module: mrp_repair
+#: field:mrp.repair,product_id:0
+#: report:repair.order:0
+msgid "Product to Repair"
+msgstr "Засах бараа"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "N° :"
+msgstr "№ :"
+
+#. module: mrp_repair
+#: help:mrp.repair,pricelist_id:0
+msgid "The pricelist comes from the selected partner, by default."
+msgstr "Үнийн жасгаалт сонгосон харилцагчаас анхны утгаараа ирнэ."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_fee
+msgid "Repair Fees Line"
+msgstr "Засварын Ажлын Хөлсний Мөр"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:334
+#, python-format
+msgid "You cannot confirm a repair order which has no line."
+msgstr "Мөр байхгүй засварын захиалгыг батлаж чадахгүй."
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Үнийн санал"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Compute"
+msgstr "Тооцоолох"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Засварыг Батлах"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Repair Quotation"
+msgstr "Засварын Үнийн Санал"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "End Repair"
+msgstr "Засварыг Төгсгөх"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
+#, python-format
+msgid "No account defined for product \"%s\"."
+msgstr "\"%s\" бараанд данс тодорхойлогдоогүй байна."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Quotations"
+msgstr "Үнийн санал"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom_qty:0
+#: report:repair.order:0
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Start Repair"
+msgstr "Засварыг эхлүүлэх"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,state:0
+#: field:mrp.repair.line,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Qty"
+msgstr "Тоо хэмжээ"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_unit:0
+#: field:mrp.repair.line,price_unit:0
+#: report:repair.order:0
+msgid "Unit Price"
+msgstr "Нэгж үнэ"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: mrp_repair
+#: help:mrp.repair,guarantee_limit:0
+msgid ""
+"The guarantee limit is computed as: last move date + warranty defined on "
+"selected product. If the current date is below the guarantee limit, each "
+"operation and fee you will add will be set as 'not to invoiced' by default. "
+"Note that you can change manually afterwards."
+msgstr ""
+"Баталгааны хязгаар дараах байдлаар тооцоологддог: сүүлийн хөдөлгөөний огноо "
+"+ сонгосон бараанд тодорхойлогдсон баталгаа. Хэрэв одоогийн огноо нь "
+"баталгааны хязгаараас бага бол бүх ажиллагаа болон ажлын хөлсүүд нь "
+"'нэхэмжлэгдэхгүй' төлөвтэй болно. Гэхдээ эдгээрийг дараа нь гараараа өөрчлөх "
+"боломжтой."
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_id:0
+msgid "Invoice"
+msgstr "Нэхэмжлэл"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees"
+msgstr "Ажлын хөлс"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: view:mrp.repair.make_invoice:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_dest_id:0
+msgid "Dest. Location"
+msgstr "Хүрэх байршил"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Operation Line(s)"
+msgstr "Ажиллагааны Мөрүүд"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "History"
+msgstr "Түүх"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_dest_id:0
+msgid "Delivery Location"
+msgstr "Хүргэх Байрлал"
+
+#. module: mrp_repair
+#: help:mrp.repair,invoice_method:0
+msgid ""
+"This field allow you to change the workflow of the repair order. If value "
+"selected is different from 'No Invoice', it also allow you to select the "
+"pricelist and invoicing address."
+msgstr ""
+"Энэ талбар нь засварын захиалгын ажлын урсгалыг өөрчлөх боломжийг олгодог. "
+"Хэрэв сонгосон утга нь 'Нэхэмжлэл үгүй'-с ялгаатай бол үнийн жагсаалт болон "
+"нэхэмжлэх хаягийг сонгох боломжийг мөн олгоно."
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Create Invoice"
+msgstr "Нэхэмжлэл үүсгэх"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,name:0
+#: field:mrp.repair.line,name:0
+#: report:repair.order:0
+msgid "Description"
+msgstr "Тайлбар"
+
+#. module: mrp_repair
+#: field:mrp.repair,operations:0
+msgid "Operation Lines"
+msgstr "Ажиллагааны мөрүүд"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "invoiced"
+msgstr "нэхэмжилсэн"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair.fee,product_id:0
+#: field:mrp.repair.line,product_id:0
+msgid "Product"
+msgstr "Бараа"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoice Corrected"
+msgstr "Нэхэмжлэлийг Зөв Болгосон"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Price"
+msgstr "Үнэ"
+
+#. module: mrp_repair
+#: field:mrp.repair,deliver_bool:0
+msgid "Deliver"
+msgstr "Хүргэлт"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,internal_notes:0
+msgid "Internal Notes"
+msgstr "Дотоод тэмдэглэл"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Taxes:"
+msgstr "Татвар:"
+
+#. module: mrp_repair
+#: field:mrp.repair,picking_id:0
+msgid "Picking"
+msgstr "Бэлтгэл"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Untaxed amount"
+msgstr "Татваргүй дүн"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:41
+#, python-format
+msgid "Active ID is not Found"
+msgstr "Идэвхтэй ID олдсонгүй"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
+#, python-format
+msgid "Repair order is not invoiced."
+msgstr "Засварын захиалга нэхэмлэгдээгүй."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Total amount"
+msgstr "Нийт дүн"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "UoM"
+msgstr "Х.Н"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+msgid "Remove"
+msgstr "Хасах"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom:0
+#: field:mrp.repair.line,product_uom:0
+msgid "Product UoM"
+msgstr "Барааны х.н"
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_invoice_id:0
+msgid "Invoicing Address"
+msgstr "Нэхэмжлэх Хаяг"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "After Repair"
+msgstr "Засварын Дараа"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoicing"
+msgstr "Нэхэмжлэл"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_id:0
+msgid "Source Location"
+msgstr "Эх байрлал"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
+#: view:mrp.repair:0
+msgid "Cancel Repair"
+msgstr "Засвар Цуцлах"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "No Invoice"
+msgstr "Нэхэмлэл үгүй"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "States"
+msgstr "Төлөв"
+
+#. module: mrp_repair
+#: help:mrp.repair,partner_id:0
+msgid ""
+"This field allow you to choose the parner that will be invoiced and delivered"
+msgstr ""
+"Энэ талбар нь нэхэмжлэгдэх болон хүргэлт хийгдэх харилцагчийг сонгох "
+"боломжийг олгоно"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_total:0
+msgid "Total"
+msgstr "Нийт"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Ready to Repair"
+msgstr "Засахад Бэлэн"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:370
+#, python-format
+msgid "No partner !"
+msgstr "Харилцагч алга !"
+
+#~ msgid "VAT"
+#~ msgstr "НӨАТ"
+
+#~ msgid "Do you really want to create the invoice(s) ?"
+#~ msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 2fc96bd7db5..ced25296fcc 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:34+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-31 11:44+0000\n"
+"Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
-"X-Generator: Launchpad (build 15654)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1491,7 +1491,7 @@ msgstr "Борлуулалт Захиалгын Мөр Нэхэмжлэх Үүс
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr "Нэхэмжлэлийн алдаа"
+msgstr "Нэхэмжлэлийн сондгойрол"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 44e1c1cc23a..aeabdf25de4 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
index e9c76e11755..d0b51f8404f 100644
--- a/addons/sale_margin/i18n/ja.po
+++ b/addons/sale_margin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
index ed3b63ac1bc..2abd09e6d3a 100644
--- a/addons/stock_planning/i18n/ja.po
+++ b/addons/stock_planning/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index b004fb3625a..77438be95df 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
 
 #. module: base
 #: model:res.country,name:base.sh

From 2e4c6523afb206ac34548a1660f2e4a50a5b3290 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 1 Aug 2012 12:44:46 +0530
Subject: [PATCH 295/312] [IMP] hr : wizard traceback of "all children rules"
 removed

bzr revid: rpr@tinyerp.com-20120801071446-13jar5rxtg0xsy5v
---
 addons/hr_payroll/hr_payroll_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index b08ce6983c6..c4f42fde82d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -659,11 +659,10 @@
 
 
         <act_window name="All Children Rules"
-            domain="[('id', 'in', [active_id])]"
+            domain="[('parent_rule_id', '=', active_id)]"
             res_model="hr.salary.rule"
             src_model="hr.salary.rule"
-            view_id="hr_salary_rule_tree"
-            view_type="tree"
+            view_id="hr_salary_rule_list"
             id="act_children_salary_rules"/>
 
         <!-- payslip runs -->

From 171500f171eb78524cb2d4977b6b9f98682f266d Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 1 Aug 2012 09:50:24 +0200
Subject: [PATCH 296/312] [MAOW] lolcat ninja fix in the branch, yaoh!

bzr revid: vmt@openerp.com-20120801075024-mpc4seluumaa33ph
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 2c73e811eeb..4233fc2de2d 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1055,7 +1055,7 @@ class BaseModel(object):
                                      "in order to implement their access rights policy"
 
         # Validate rec_name
-        if self._rec_name is None:
+        if self._rec_name is not None:
             assert self._rec_name in self._columns.keys() + ['id'], "Invalid rec_name %s for model %s" % (self._rec_name, self._name)
         else:
             self._rec_name = 'name'

From 6aef95b5c28647c4b165ba8dcd0e31908a671a0a Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 1 Aug 2012 10:01:55 +0200
Subject: [PATCH 297/312] [MEOW] lolcat crazy ninja fix in the branch, take
 two!

bzr revid: vmt@openerp.com-20120801080155-8qhg3aqkay2rrmbt
---
 openerp/osv/orm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 4233fc2de2d..a1a267bd552 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1881,7 +1881,7 @@ class BaseModel(object):
         :rtype: etree._Element
         """
         view = etree.Element('search', string=self._description)
-        etree.SubElement(view, 'field', name=self._rec_name_fallback(cr,uid,context))
+        etree.SubElement(view, 'field', name=self._rec_name_fallback(cr, user, context))
         return view
 
     def _get_default_tree_view(self, cr, user, context=None):
@@ -1894,7 +1894,7 @@ class BaseModel(object):
         :rtype: etree._Element
         """
         view = etree.Element('tree', string=self._description)
-        etree.SubElement(view, 'field', name=self._rec_name_fallback(cr,uid,context))
+        etree.SubElement(view, 'field', name=self._rec_name_fallback(cr, user, context))
         return view
 
     def _get_default_calendar_view(self, cr, user, context=None):
@@ -1921,7 +1921,7 @@ class BaseModel(object):
             return False
 
         view = etree.Element('calendar', string=self._description)
-        etree.SubElement(view, 'field', self._rec_name_fallback(cr,uid,context))
+        etree.SubElement(view, 'field', self._rec_name_fallback(cr, user, context))
 
         if (self._date_name not in self._columns):
             date_found = False

From 74582aea7e36bbe805fb395bbb0f11fa768ead14 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 1 Aug 2012 10:16:30 +0200
Subject: [PATCH 298/312] [FIX] event: removed invalid _rec_name.

bzr revid: vmt@openerp.com-20120801081630-2wtg0rnwoa97zacg
---
 addons/event/report/report_event_registration.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 17472e0cc95..060b1ef7556 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -27,7 +27,6 @@ class report_event_registration(osv.osv):
     _name = "report.event.registration"
     _description = "Events Analysis"
     _auto = False
-    _rec_name = 'date'
     _columns = {
         'event_date': fields.char('Event Start Date', size=64, readonly=True),
         'year': fields.char('Year', size=4, readonly=True),

From ee1018a24280975e30375361292305b56031af5d Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 1 Aug 2012 10:38:23 +0200
Subject: [PATCH 299/312] [FIX] hr_evaluation: removed invalid _rec_name.

bzr revid: vmt@openerp.com-20120801083823-m1mr5n32vuhiofzj
---
 addons/hr_evaluation/report/hr_evaluation_report.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index ac32133186c..bc2e50629c3 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -26,7 +26,6 @@ class hr_evaluation_report(osv.osv):
     _name = "hr.evaluation.report"
     _description = "Evaluations Statistics"
     _auto = False
-    _rec_name = 'date'
     _columns = {
         'create_date': fields.date('Create Date', readonly=True),
         'delay_date':fields.float('Delay to Start', digits=(16,2),readonly=True),

From 3edc646322df9ae16385029c9036ad14ff828a50 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 1 Aug 2012 12:10:14 +0200
Subject: [PATCH 300/312] [FIX] l10n_ar,l10n_cl,analytic_contract_hr_expense:
 remove empty certificate to allow UNIQUE index to be created

bzr revid: odo@openerp.com-20120801101014-sw2vla5a5u1bjpvv
---
 addons/analytic_contract_hr_expense/__openerp__.py | 1 -
 addons/l10n_ar/__openerp__.py                      | 1 -
 addons/l10n_cl/__openerp__.py                      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py
index b5ab6bea9ab..6d5cca8b574 100644
--- a/addons/analytic_contract_hr_expense/__openerp__.py
+++ b/addons/analytic_contract_hr_expense/__openerp__.py
@@ -40,7 +40,6 @@ This module is for modifying account analytic view to show some data related to
              ],
     'installable': True,
     'auto_install': True,
-    'certificate': '',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ar/__openerp__.py b/addons/l10n_ar/__openerp__.py
index 8971ce94b22..ef04805d1b0 100644
--- a/addons/l10n_ar/__openerp__.py
+++ b/addons/l10n_ar/__openerp__.py
@@ -45,7 +45,6 @@ Plan contable argentino e impuestos de acuerdo a disposiciones vigentes
 			],
     "active": False,
     "installable": True,
-    "certificate" : "",
     'images': ['images/config_chart_l10n_ar.jpeg','images/l10n_ar_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py
index 8c1e1e45b50..d10acdae575 100644
--- a/addons/l10n_cl/__openerp__.py
+++ b/addons/l10n_cl/__openerp__.py
@@ -45,7 +45,6 @@ Plan contable chileno e impuestos de acuerdo a disposiciones vigentes
 			],
     "active": False,
     "installable": True,
-    "certificate" : "",
     'images': ['images/config_chart_l10n_cl.jpeg','images/l10n_cl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ad6f3b157144e17959c62f04df7ceefe3bff6b92 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 1 Aug 2012 13:39:24 +0200
Subject: [PATCH 301/312] [FIX] Sidebar add attachment: click event order in
 firefox difference for html#click and input[type=file] click

bzr revid: fme@openerp.com-20120801113924-8303s20551rhocqe
---
 addons/web/static/src/js/chrome.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 7c4cdf969f1..a74fe190271 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -914,8 +914,10 @@ instance.web.Client = instance.web.Widget.extend({
                 }
             }, 0);
         });
-        instance.web.bus.on('click', this, function() {
-            self.$element.find('.oe_dropdown_menu.oe_opened').removeClass('oe_opened');
+        instance.web.bus.on('click', this, function(ev) {
+            if (!$(ev.target).is('input[type=file]')) {
+                self.$element.find('.oe_dropdown_menu.oe_opened').removeClass('oe_opened');
+            }
         });
     },
     show_common: function() {

From 901d45b4e7c5201df0ca349b2334a8c805e50c95 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 1 Aug 2012 14:33:32 +0200
Subject: [PATCH 302/312] [FIX] do_show() in form view does not display the
 form view any more

bzr revid: nicolas.vanhoren@openerp.com-20120801123332-9brim0p5bqdes4j8
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 27596679a9d..afd8ed46646 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -268,6 +268,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             this.$pager.show();
         }
         this.$element.add(this.$buttons).removeClass('oe_form_dirty');
+        self.$element.css('visibility', 'visible');
 
         var shown = this.has_been_loaded;
         if (options.reload !== false) {

From 8a7428d7311b56c79b2e488fc8ad87dc6b9f49d9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 1 Aug 2012 14:34:49 +0200
Subject: [PATCH 303/312] [FIX] editable listview test: set_editable was
 removed, pass editable as option when creating listview

bzr revid: xmo@openerp.com-20120801123449-e65apxliok8fsrvq
---
 addons/web/static/test/list-editable.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index 2313195f626..76c9049d3ee 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -240,8 +240,7 @@ $(document).ready(function () {
         };
 
         var ds = new instance.web.DataSetStatic(null, 'demo', null, [1]);
-        var l = new instance.web.ListView({}, ds);
-        l.set_editable(true);
+        var l = new instance.web.ListView({}, ds, false, {editable: 'top'});
 
         l.appendTo($fix)
             .pipe(l.proxy('reload_content'))
@@ -305,8 +304,7 @@ $(document).ready(function () {
             counter: 0,
             onEvent: function (e) { this.counter++; }
         };
-        var l = new instance.web.ListView({}, ds);
-        l.set_editable(true);
+        var l = new instance.web.ListView({}, ds, false, {editable: 'top'});
         l.on('edit:before edit:after', o, o.onEvent);
         l.appendTo($fix)
             .pipe(l.proxy('reload_content'))
@@ -326,8 +324,7 @@ $(document).ready(function () {
     asyncTest('edition events: cancelling', 3, function () {
         var edit_after = false;
         var ds = new instance.web.DataSetStatic(null, 'demo', null, [1]);
-        var l = new instance.web.ListView({}, ds);
-        l.set_editable(true);
+        var l = new instance.web.ListView({}, ds, false, {editable: 'top'});
         l.on('edit:before', {}, function (e) {
             e.cancel = true;
         });

From f5bff3996b4fec381bf9b5fa5dddd08c366f5e1a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 1 Aug 2012 14:36:35 +0200
Subject: [PATCH 304/312] [FIX] editor base state: initializing formview (and
 its pager) requires an actual dataset.ids.length

bzr revid: xmo@openerp.com-20120801123635-y21onweovg0uih7d
---
 addons/web/static/test/list-editable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index 76c9049d3ee..62f31a55833 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -72,7 +72,7 @@ $(document).ready(function () {
     });
     asyncTest('base-state', 2, function () {
         var e = new instance.web.list.Editor({
-            dataset: {},
+            dataset: {ids: []},
             edition_view: function () {
                 return makeFormView();
             }

From c72a63472bda74f7b2a31328e5c514ae24808375 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 1 Aug 2012 14:46:52 +0200
Subject: [PATCH 305/312] [FIX] form visibility

bzr revid: xmo@openerp.com-20120801124652-2a6jgvyke1u715kw
---
 addons/web/static/src/js/view_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index afd8ed46646..1f693acbc7f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -268,7 +268,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             this.$pager.show();
         }
         this.$element.add(this.$buttons).removeClass('oe_form_dirty');
-        self.$element.css('visibility', 'visible');
+        this.$element.css('visibility', 'visible');
+        this._super();
 
         var shown = this.has_been_loaded;
         if (options.reload !== false) {

From 9df99e1ca5a5b2f47e3f6812d4a29d582f8bdf5a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 1 Aug 2012 14:52:34 +0200
Subject: [PATCH 306/312] [IMP] point_of_sale: Add a new rule for the pos.order
 object

bzr revid: stw@openerp.com-20120801125234-x85l39sx5ibdmuba
---
 addons/point_of_sale/security/point_of_sale_security.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 7f2e91f1b48..6e38321cbe2 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -13,5 +13,11 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
+    <record id="rule_pos_multi_company" model="ir.rule">
+        <field name="name">Point Of Sale Order</field>
+        <field name="model_id" ref="model_pos_order" />
+        <field name="global" eval="True" />
+        <field name="domain_force">[('company_id', '=', user.company_id.id)]</field>
+    </record>
 </data>
 </openerp>

From acaec8b582eabdc538f5c4019091167f30e3e974 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 1 Aug 2012 14:59:10 +0200
Subject: [PATCH 307/312] [FIX] Widget test: was changed to always have a root
 element for backwards fuckery reasons

bzr revid: xmo@openerp.com-20120801125910-x6obdnlx2oi5e3kw
---
 addons/web/static/test/Widget.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index 55d9e7e7ad1..100b1fa6633 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -86,9 +86,11 @@ $(document).ready(function () {
     test('no template, default', function () {
         var w = new (instance.web.Widget.extend({ }));
 
-        ok(!w.$element, "should not initially have a root element");
+        var $original = w.$element;
+        ok($original, "should initially have a root element");
         w.renderElement();
         ok(w.$element, "should have generated a root element");
+        ok($original !== w.$element, "should have generated a new root element");
         strictEqual(w.$element, w.$element, "should provide $element alias");
         ok(w.$element.is(w.el), "should provide raw DOM alias");
 

From fbce1b1a1d43ae96941e24cffa19f77cc2a932de Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 1 Aug 2012 15:03:16 +0200
Subject: [PATCH 308/312] [FIX] increase test timeout due to mis-ordered async
 test taking way longer than expected

bzr revid: xmo@openerp.com-20120801130316-uzogecm5req2qrpj
---
 addons/web/static/test/test.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html
index 95518dbc8c6..35d57d3c3a6 100644
--- a/addons/web/static/test/test.html
+++ b/addons/web/static/test/test.html
@@ -42,7 +42,7 @@
 
     <script src="/web/static/test/testing.js"></script>
     <script type="text/javascript">
-        QUnit.config.testTimeout = 500;
+        QUnit.config.testTimeout = 2000;
     </script>
 </head>
     <body id="oe" class="openerp">

From fb03a92729a44a7c0b1bebea6cefb81efa538810 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 1 Aug 2012 15:19:52 +0200
Subject: [PATCH 309/312] [CHG] Ungrouped kanban view does not expand under
 firefox, so set ungrouped kanban table's width to 100%

bzr revid: fme@openerp.com-20120801131952-fvka1u152dtyuxz3
---
 addons/web_kanban/static/src/css/kanban.css     | 13 ++++++++-----
 addons/web_kanban/static/src/css/kanban.sass    | 10 ++++++----
 addons/web_kanban/static/src/js/kanban.js       |  2 ++
 addons/web_kanban/static/src/xml/web_kanban.xml |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 5830cb33e0f..745fdd1b883 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -40,6 +40,9 @@
 .openerp .oe_kanban_view .oe_kanban_groups {
   height: inherit;
 }
+.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_groups {
+  width: 100%;
+}
 .openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban {
   display: inline-block;
 }
@@ -65,7 +68,7 @@
 .openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group {
   padding: 0px;
 }
-.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   background: #f0eeee;
   border-left: 1px solid #f0f8f8;
   border-right: 1px solid #b9b9b9;
@@ -185,7 +188,7 @@
   font-weight: bold;
   margin: 2px 4px;
 }
-.openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_record {
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_record {
   margin-bottom: 6px;
 }
 .openerp .oe_kanban_view .oe_kanban_gravatar {
@@ -236,13 +239,13 @@
   clear: both;
   text-align: center;
 }
-.openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_show_more .oe_button {
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_show_more .oe_button {
   width: 100%;
 }
-.openerp .oe_kanban_view .oe_kanban_ungrouped {
+.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column {
   background: white;
 }
-.openerp .oe_kanban_view .oe_kanban_ungrouped .oe_kanban_record {
+.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record {
   float: left;
   padding: 2px;
   box-sizing: border-box;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 44b3251c8fb..3864c5b5f0e 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -63,6 +63,8 @@
     // KanbanGroups {{{
     .oe_kanban_groups
         height: inherit
+    &.oe_kanban_ungrouped .oe_kanban_groups
+        width: 100%
     .oe_kanban_header
         &:hover
             .oe_dropdown_kanban
@@ -86,7 +88,7 @@
     .oe_kanban_group_header.oe_kanban_no_group
         padding: 0px
 
-    .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
+    &.oe_kanban_grouped .oe_kanban_column, .oe_kanban_group_header
         background: #f0eeee
         border-left: 1px solid #f0f8f8
         border-right: 1px solid #b9b9b9
@@ -187,7 +189,7 @@
         .oe_kanban_title
             font-weight: bold
             margin: 2px 4px
-    .oe_kanban_grouped .oe_kanban_record
+    &.oe_kanban_grouped .oe_kanban_record
         margin-bottom: 6px
     .oe_kanban_gravatar
         display: block
@@ -222,9 +224,9 @@
     .oe_kanban_show_more
         clear: both
         text-align: center
-    .oe_kanban_grouped .oe_kanban_show_more .oe_button
+    &.oe_kanban_grouped .oe_kanban_show_more .oe_button
         width: 100%
-    .oe_kanban_ungrouped
+    &.oe_kanban_ungrouped .oe_kanban_column
         background: white
         .oe_kanban_record
             float: left
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 69e97384b03..4b6a4c9b158 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -173,6 +173,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     },
     do_process_groups: function(groups) {
         var self = this;
+        this.$element.remove('oe_kanban_ungrouped').addClass('oe_kanban_grouped');
         this.add_group_mutex.exec(function() {
             self.do_clear_groups();
             self.dataset.ids = [];
@@ -194,6 +195,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     },
     do_process_dataset: function(dataset) {
         var self = this;
+        this.$element.remove('oe_kanban_grouped').addClass('oe_kanban_ungrouped');
         this.add_group_mutex.exec(function() {
             var def = $.Deferred();
             self.do_clear_groups();
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 820189c7b27..a6284300a9b 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -55,7 +55,7 @@
     </td>
 </t>
 <t t-name="KanbanView.group_records_container">
-    <td t-attf-class="oe_kanban_column #{widget.group ? 'oe_kanban_grouped' : 'oe_kanban_ungrouped'}">
+    <td class="oe_kanban_column">
         <div class="oe_kanban_group_list_header"/>
         <div class="oe_kanban_show_more">
             <button class="oe_button">Show more... (<span class="oe_kanban_remaining"></span> remaining)</button>

From 1de59356e20e25e3f11c6fb6181cf4fce7585364 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 1 Aug 2012 15:40:18 +0200
Subject: [PATCH 310/312] [IMP] Use correct jquery api

bzr revid: fme@openerp.com-20120801134018-q0362cob3osvawbg
---
 addons/web/static/src/js/coresetup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 12eeb1d79b4..0011b7c2450 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -415,12 +415,12 @@ instance.web.Bus = instance.web.Class.extend(instance.web.EventDispatcherMixin,
         //           check gtk bindings
         // http://unixpapa.com/js/key.html
         _.each('click,dblclick,keydown,keypress,keyup'.split(','), function(evtype) {
-            $('html').on(evtype, self, function(ev) {
+            $('html').on(evtype, function(ev) {
                 self.trigger(evtype, ev);
             });
         });
         _.each('resize,scroll'.split(','), function(evtype) {
-            $(window).on(evtype, self, function(ev) {
+            $(window).on(evtype, function(ev) {
                 self.trigger(evtype, ev);
             });
         });

From cd65d4aa21f81188fae17a929c4f808ec5ee29d0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 1 Aug 2012 15:54:35 +0200
Subject: [PATCH 311/312] [IMP] make unreadable code less unreadable, fix some
 warning, use Widget#$

bzr revid: xmo@openerp.com-20120801135435-w2erakp9qaqtcotb
---
 addons/web/static/src/js/search.js | 50 ++++++++++++++----------------
 addons/web/static/src/xml/base.xml | 11 ++++---
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index f9cf10e76f4..945fc7323d5 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1683,37 +1683,33 @@ instance.web.search.AddToDashboard = instance.web.Widget.extend({
     _in_drawer: true,
     start: function () {
         var self = this;
-        this.data_loaded = $.Deferred();
-        this.dashboard_data =[];
         this.$element
             .on('click', 'h4', this.proxy('show_option'))
             .on('submit', 'form', function (e) {
                 e.preventDefault();
                 self.add_dashboard();
             });
-        return $.when(this.load_data(),this.data_loaded).pipe(this.proxy("render_data"));
+        return this.load_data().then(this.proxy("render_data"));
     },
     load_data:function(){
         if (!instance.webclient) { return $.Deferred().reject(); }
-        var self = this,dashboard_menu = instance.webclient.menu.data.data.children;
-        var ir_model_data = new instance.web.Model('ir.model.data',{},[['name','=','menu_reporting_dashboard']]).query(['res_id']);
-        var map_data = function(result){
-            _.detect(dashboard_menu, function(dash){
-                var id = _.pluck(dash.children, "id"),indexof = _.indexOf(id, result.res_id);
-                if(indexof !== -1){
-                    self.dashboard_data = dash.children[indexof].children
-                    self.data_loaded.resolve();
-                    return;
-                }
-            });
-        };
-        return ir_model_data._execute().done(function(result){map_data(result[0])}); 
+        var dashboard_menu = instance.webclient.menu.data.data.children;
+        return new instance.web.Model('ir.model.data')
+                .query(['res_id'])
+                .filter([['name','=','menu_reporting_dashboard']])
+                .first().pipe(function (result) {
+            var menu = _(dashboard_menu).chain()
+                .pluck('children')
+                .flatten(true)
+                .find(function (child) { return child.id === result.res_id; })
+                .value();
+            return menu ? menu.children : [];
+        });
     },
-    
-    render_data: function(){
-        var self = this;
-        var selection = instance.web.qweb.render("SearchView.addtodashboard.selection",{selections:this.dashboard_data});
-        this.$element.find("input").before(selection)
+    render_data: function(dashboard_data){
+        var selection = instance.web.qweb.render(
+            "SearchView.addtodashboard.selection", {selections: dashboard_data});
+        this.$("input").before(selection)
     },
     add_dashboard:function(){
         var self = this;
@@ -1721,11 +1717,11 @@ instance.web.search.AddToDashboard = instance.web.Widget.extend({
         var view_parent = this.getParent().getParent();
         if (! view_parent.action || ! this.$element.find("select").val())
             return this.do_warn("Can't find dashboard action");
-        data = getParent.build_search_data(),
-        context = new instance.web.CompoundContext(getParent.dataset.get_context() || []),
-        domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []);
-        _.each(data.contexts, function(x) {context.add(x);});
-        _.each(data.domains, function(x) {domain.add(x);});
+        var data = getParent.build_search_data();
+        var context = new instance.web.CompoundContext(getParent.dataset.get_context() || []);
+        var domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []);
+        _.each(data.contexts, context.add, context);
+        _.each(data.domains, domain.add, domain);
         this.rpc('/web/searchview/add_to_dashboard', {
             menu_id: this.$element.find("select").val(),
             action_id: view_parent.action.id,
@@ -1746,7 +1742,7 @@ instance.web.search.AddToDashboard = instance.web.Widget.extend({
         this.$element.toggleClass('oe_opened');
         if (! this.$element.hasClass('oe_opened'))
             return;
-        this.$element.find("input").val(this.getParent().fields_view.name || "" );
+        this.$("input").val(this.getParent().fields_view.name || "" );
     }
 });
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 29670c8e7de..fdebb157607 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1446,15 +1446,16 @@
 <div t-name="SearchView.addtodashboard" class="oe_searchview_dashboard">
     <h4>Add to Dashboard</h4>
     <form>
-        <p><input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text"/></p>
+        <p><input placeholder="Title of new Dashboard item"
+                  title="Title of new Dashboard item" type="text"/></p>
         <button class="oe_apply" type="submit">Save</button>
     </form>
 </div>
 <t t-name="SearchView.addtodashboard.selection">
-    <select  title = "Select Dashboard to add this filter to">
-        <t t-foreach="selections" t-as="element">
-        <option t-att-value="element.id || element.res_id "><t t-esc="element.name"/></option>
-        </t>
+    <select title="Select Dashboard to add this filter to">
+        <option t-foreach="selections" t-as="element"
+                t-att-value="element.id || element.res_id ">
+            <t t-esc="element.name"/></option>
     </select>
 </t>
 <div t-name="SearchView.advanced" class="oe_searchview_advanced">

From 3b5bd3598cdc86b285b12977aaf294832d937d6a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 1 Aug 2012 15:58:03 +0200
Subject: [PATCH 312/312] [FIX] kinda sorta rename add to dashboard feature to
 add to reporting according to apr's wishes

also change button from 'save' to 'add'

bzr revid: xmo@openerp.com-20120801135803-j4wwbdm2ngdz4koo
---
 addons/web/static/src/js/search.js | 11 ++++++-----
 addons/web/static/src/xml/base.xml | 13 ++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 945fc7323d5..53daa40ae31 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -661,7 +661,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             null, _(this.select_for_drawer()).invoke(
                 'appendTo', this.$element.find('.oe_searchview_drawer')));
         
-        new instance.web.search.AddToDashboard(this).appendTo($('.oe_searchview_drawer', this.$element));
+        new instance.web.search.AddToReporting(this).appendTo($('.oe_searchview_drawer', this.$element));
 
         // load defaults
         var defaults_fetched = $.when.apply(null, _(this.inputs).invoke(
@@ -1678,8 +1678,8 @@ instance.web.search.Filters = instance.web.search.Input.extend({
         }));
     }
 });
-instance.web.search.AddToDashboard = instance.web.Widget.extend({
-    template: 'SearchView.addtodashboard',
+instance.web.search.AddToReporting = instance.web.Widget.extend({
+    template: 'SearchView.addtoreporting',
     _in_drawer: true,
     start: function () {
         var self = this;
@@ -1706,9 +1706,10 @@ instance.web.search.AddToDashboard = instance.web.Widget.extend({
             return menu ? menu.children : [];
         });
     },
-    render_data: function(dashboard_data){
+    render_data: function(dashboard_choices){
         var selection = instance.web.qweb.render(
-            "SearchView.addtodashboard.selection", {selections: dashboard_data});
+            "SearchView.addtoreporting.selection", {
+                selections: dashboard_choices});
         this.$("input").before(selection)
     },
     add_dashboard:function(){
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fdebb157607..3748aeb2d82 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1443,16 +1443,15 @@
     <div>
     </div>
 </div>
-<div t-name="SearchView.addtodashboard" class="oe_searchview_dashboard">
-    <h4>Add to Dashboard</h4>
+<div t-name="SearchView.addtoreporting" class="oe_searchview_dashboard">
+    <h4>Add to Reporting</h4>
     <form>
-        <p><input placeholder="Title of new Dashboard item"
-                  title="Title of new Dashboard item" type="text"/></p>
-        <button class="oe_apply" type="submit">Save</button>
+        <p><input placeholder="Title of new dashboard item"/></p>
+        <button class="oe_apply" type="submit">Add</button>
     </form>
 </div>
-<t t-name="SearchView.addtodashboard.selection">
-    <select title="Select Dashboard to add this filter to">
+<t t-name="SearchView.addtoreporting.selection">
+    <select>
         <option t-foreach="selections" t-as="element"
                 t-att-value="element.id || element.res_id ">
             <t t-esc="element.name"/></option>