Merge lp:~jfb-tempo-consulting/unifield-server/US-1019 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2019-01-31 14:39:54 +0000
+++ bin/addons/account/account_view.xml	2019-07-30 10:05:10 +0000
@@ -135,7 +135,8 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
+                        <filter string="To Close" name="draft" domain="[('state','in',['created', 'draft'])]" icon="terp-camera_test"/>
+                        <filter string="Close" name="close" domain="[('state','not in',['created', 'draft'])]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="code"/>
@@ -205,21 +206,33 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <group col="10" colspan="4">
-                        <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="code"/>
-                        <field name="name"/>
+                    <group col="12" colspan="4">
+                        <filter name="active" string="Active" domain="[('filter_active', '=', True)]" icon="terp-check" />
+                        <filter name="inactive" string="Inactive" domain="[('filter_active', '=', False)]" icon="gtk-dialog-error"/>
+                        <separator orientation="vertical"/>
+                        <filter name="receivable" string="Receivable" domain="[('type','=','receivable')]" icon="terp-sale"/>
+                        <filter name="payable" string="Payable" domain="[('type','=','payable')]" icon="terp-purchase"/>
+                        <filter name="accrual_account" string="Accrual" domain="[('accrual_account','=',True)]" />
+                        <filter name="expense_account" string="Expense" domain="[('user_type.code','=', 'expense')]" icon="terp-stock_symbol-selection"/>
+                        <filter name="income_account" string="Income" domain="[('user_type.code','=', 'income')]" icon="gtk-go-forward"/>
+                        <separator orientation="vertical"/>
+                        <newline/>
+
+                        <group col="6" colspan="4">
+                            <field name="code"/>
+                            <field name="name"/>
+                            <field name="is_not_hq_correctible"/>
+                        </group>
+                        <newline/>
+
                         <field name="user_type"/>
                         <field name="type"/>
+                        <field name="type_for_register"/>
+
                     </group>
                     <newline/>
                     <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'}"/>
+                        <filter string="Internal Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     </group>
                 </search>
             </field>
@@ -1231,14 +1244,14 @@
                         <filter
                             icon="terp-dolar_ok!"
                             string="Unreconciled"
-                            domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
+                            domain="['&amp;', ('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
                             name="unreconciled"/>
                         <separator orientation="vertical"/>
                         <field name="move_id" select="1" string="Number (Move)"/>
                         <field name="date" select='1'/>
                         <field name="account_id" select='1'/>
                         <field name="partner_id" select='1'>
-                            <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                            <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="['&amp;', ('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                     </group>
                     <newline/>
@@ -1888,8 +1901,9 @@
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
                     <group col="8" colspan="4">
-                        <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"/>
+                        <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
+                        <filter icon="terp-camera_test" string="Running" name="running" domain="[('state','=','running')]" help="Running Subscription"/>
+                        <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" />
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="model_id"/>
@@ -1950,6 +1964,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_subscription_search"/>
+            <field name="context">{'search_default_draft': 1, 'search_default_running': 1}</field>
             <field name="help">A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create such entries to automate the postings in the system.</field>
         </record>
         <menuitem
@@ -1963,7 +1978,8 @@
             <field name="res_model">account.subscription</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','running')]</field>
+            <field name="domain">[('state', '=', 'running')]</field>
+            <field name="context">{}</field>
             <field name="filter" eval="True"/>
         </record>
 

=== modified file 'bin/addons/account/report/account_entries_report_view.xml'
--- bin/addons/account/report/account_entries_report_view.xml	2017-05-10 12:47:14 +0000
+++ bin/addons/account/report/account_entries_report_view.xml	2019-07-30 10:05:10 +0000
@@ -82,7 +82,7 @@
                     <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="Unreconciled" icon="terp-dolar_ok!" domain="['&amp;', ('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"/>

=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2018-08-16 12:38:52 +0000
+++ bin/addons/account_mcdb/account_view.xml	2019-07-30 10:05:10 +0000
@@ -143,8 +143,9 @@
                             <filter
                                 icon="terp-dolar_ok!"
                                 string="Unreconciled"
-                                domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
+                                domain="['&amp;', ('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
                                 name="unreconciled"/>
+                            <separator orientation="vertical"/>
                             <filter icon="terp-personal" string="Employee" domain="[('employee_id', '!=', False)]" context="{'identification': 1}" />
                             <field name="document_date"/>
                             <field name="date" select='1'/>

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2019-05-24 15:09:28 +0000
+++ bin/addons/account_override/account.py	2019-07-30 10:05:10 +0000
@@ -67,6 +67,7 @@
             cmp_date = context.get('date')
         for x in args:
             if x[0] == 'filter_active' and x[2] == True:
+                arg.append('&')
                 arg.append(('activation_date', '<=', cmp_date))
                 arg.append('|')
                 arg.append(('inactivation_date', '>', cmp_date))

=== modified file 'bin/addons/account_override/account_view.xml'
--- bin/addons/account_override/account_view.xml	2019-05-06 12:42:32 +0000
+++ bin/addons/account_override/account_view.xml	2019-07-30 10:05:10 +0000
@@ -121,23 +121,6 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_account_activable_search">
-            <field name="name">account.account_activable.search</field>
-            <field name="model">account.account</field>
-            <field name="type">search</field>
-            <field name="field_parent">child_id</field>
-            <field name="inherit_id" ref="account.view_account_search"/>
-            <field name="arch" type="xml">
-                <data>
-                    <group string="Group By..." position="replace">
-                        <group expand="0" string="Group By...">
-                            <filter string="Internal Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
-                        </group>
-                    </group>
-                </data>
-            </field>
-        </record>
-
     <!-- Tree view for default tree view of accounts -->
         <record id="account.view_account_list" model="ir.ui.view">
             <field name="name">account.account_activable.list</field>

=== modified file 'bin/addons/account_period_closing_level/account_period_closing_level_view.xml'
--- bin/addons/account_period_closing_level/account_period_closing_level_view.xml	2017-10-04 05:23:42 +0000
+++ bin/addons/account_period_closing_level/account_period_closing_level_view.xml	2019-07-30 10:05:10 +0000
@@ -182,18 +182,6 @@
             </field>
         </record>
 
-        <record id="view_account_period_closing_level_search" model="ir.ui.view">
-            <field name="name">account.period_closing_level.search</field>
-            <field name="model">account.period</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="account.view_account_period_search"/>
-            <field name="arch" type="xml">
-                <filter name="draft" position="replace">
-                    <filter string="To Close" name="draft" domain="[('state','!=','done')]" icon="terp-dialog-close"/>
-                </filter>
-            </field>
-        </record>
-
         <record id="view_account_period_closing_level_tree" model="ir.ui.view">
             <field name="name">account.period_closing_level.tree</field>
             <field name="model">account.period</field>

=== modified file 'bin/addons/analytic_override/analytic_account.py'
--- bin/addons/analytic_override/analytic_account.py	2019-05-14 15:12:35 +0000
+++ bin/addons/analytic_override/analytic_account.py	2019-07-30 10:05:10 +0000
@@ -59,6 +59,7 @@
             cmp_date = context.get('date')
         for x in args:
             if x[0] == 'filter_active' and x[2] == True:
+                arg.append('&')
                 arg.append(('date_start', '<=', cmp_date))
                 arg.append('|')
                 arg.append(('date', '>', cmp_date))

=== modified file 'bin/addons/base/ir/ir.xml'
--- bin/addons/base/ir/ir.xml	2019-04-04 14:25:27 +0000
+++ bin/addons/base/ir/ir.xml	2019-07-30 10:05:10 +0000
@@ -726,6 +726,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_users_tree"/>
             <field name="search_view_id" ref="view_users_search"/>
+            <field name="context">{'default_search_active': 1, 'active_test': 0}</field>
             <field name="help">Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system.</field>
         </record>
         <record id="action_res_users_view1" model="ir.actions.act_window.view">
@@ -1690,7 +1691,7 @@
                 <group>
                         <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
                         <separator orientation="vertical"/>
-                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                        <filter string="Full Access" icon="terp-gtk-select-all" domain="['&amp;', '&amp;', '&amp;',('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"/>
@@ -1783,7 +1784,7 @@
                     <group>
                         <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
                         <separator orientation="vertical"/>
-                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                        <filter string="Full Access" icon="terp-gtk-select-all" domain="['&amp;', '&amp;', '&amp;', ('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"/>

=== modified file 'bin/addons/base/res/partner/partner_view.xml'
--- bin/addons/base/res/partner/partner_view.xml	2019-02-05 15:23:11 +0000
+++ bin/addons/base/res/partner/partner_view.xml	2019-07-30 10:05:10 +0000
@@ -358,7 +358,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_customer":1}</field>
+            <field name="context">{'search_default_customer':1, 'show_button_show_inactive': 1, 'search_default_active': 1, 'active_test': 0}</field>
             <field name="search_view_id" ref="view_res_partner_filter"/>
             <field name="help">A customer is an entity you do business with, like a company or an organization. A customer can have several contacts or addresses which are the people working for this company. You can use the history tab, to follow all transactions related to a customer: sales order, emails, opportunities, claims, etc. If you use the email gateway, the Outlook or the Thunderbird plugin, don't forget to register emails to each contact so that the gateway will automatically attach incoming emails to the right partner.</field>
         </record>
@@ -386,7 +386,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="domain">[('customer','=',1)]</field>
-            <field name="context">{'default_customer':1, 'search_default_customer':1}</field>
+            <field name="context">{'default_customer':1, 'search_default_customer':1, 'search_default_active': 1, 'active_test': 0, 'show_button_show_inactive': 1}</field>
             <field name="filter" eval="True"/>
         </record>
 
@@ -396,7 +396,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
-            <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1}</field>
+            <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1, 'search_default_active': 1, 'active_test': 0, 'show_button_show_inactive':1}</field>
             <field name="filter" eval="True"/>
             <field name="help">You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects.</field>
         </record>

=== modified file 'bin/addons/base/res/res_currency_view.xml'
--- bin/addons/base/res/res_currency_view.xml	2015-01-19 13:13:38 +0000
+++ bin/addons/base/res/res_currency_view.xml	2019-07-30 10:05:10 +0000
@@ -2,61 +2,34 @@
 <openerp>
     <data>
 
-        <record id="view_currency_tree" model="ir.ui.view">
-            <field name="name">res.currency.tree</field>
-            <field name="model">res.currency</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Currencies">
-                    <field name="name"/>
-                    <field name="company_id" select="2" />
-                     <field name="rate_ids" invisible="1"/>
-                    <field name="date"/>
-                    <field name="rate"/>
-                    <field name="rounding"/>
-                    <field name="accuracy"/>
-                    <field name="active"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_currency_form" model="ir.ui.view">
-            <field name="name">res.currency.form</field>
+        <record id="view_currency_functional_form" model="ir.ui.view">
+            <field name="name">res.currency_functional.form</field>
             <field name="model">res.currency</field>
             <field name="type">form</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
-                <form string="Currency" hide_duplicate_button="1">
-                    <group col="6" colspan="6">
-                        <field name="name" select="1"/>
-                        <field name="rate"/>
-                        <field name="company_id" select="2" groups="base.group_multi_company" />
-                        <field name="symbol"/>
-                    </group>
-
-                    <group col="2" colspan="2">
-                        <separator string="Price Accuracy" colspan="2"/>
-                        <field name="rounding"/>
-                        <field name="accuracy"/>
-                    </group>
-
-                    <group col="2" colspan="2">
-                        <separator string="Miscelleanous" colspan="2"/>
-                        <field name="base"/>
-                        <field name="active" select="1"/>
-                    </group>
-
-                    <field colspan="4" mode="tree,form" name="rate_ids" nolabel="1" attrs="{'readonly':[('base','=',True)]}">
+                <data>
+                    <field name="company_id" position="replace">
+                        <field name="currency_name"/>
+                    </field>
+                    <field name="base" position="replace">
+                    </field>
+                    <form string="Rates" position="replace">
                         <form string="Rates">
                             <field name="name"/>
                             <field name="rate"/>
                         </form>
+                    </form>
+                    <tree string="Rates"  position="replace">
                         <tree string="Rates">
                             <field name="name"/>
                             <field name="rate"/>
                         </tree>
-                    </field>
-                </form>
+                    </tree>
+                </data>
             </field>
         </record>
+
         <record id="action_currency_form" model="ir.actions.act_window">
             <field name="name">Currencies</field>
             <field name="res_model">res.currency</field>

=== modified file 'bin/addons/base/res/res_request_view.xml'
--- bin/addons/base/res/res_request_view.xml	2018-12-03 10:43:35 +0000
+++ bin/addons/base/res/res_request_view.xml	2019-07-30 10:05:10 +0000
@@ -79,10 +79,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Requests">
-                    <filter string="Current" icon="terp-camera_test" domain="['|',('state','=','draft'),('state','=','active')]"
-                    help="Draft and Active"/>
-                    <separator orientation="vertical"/>
+                    <filter string="Draft" icon="terp-document-new" name="draft" domain="[('state', '=', 'draft')]" />
+                    <filter string="Current" icon="terp-camera_test" domain="[('state','=','active')]" />
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state','=','waiting')]"/>
+                    <filter string="Closed" icon="gtk-close" domain="[('state','=','closed')]"/>
                     <separator orientation="vertical"/>
                     <field name="act_from"/>
                     <field name="act_to" select="1"/>

=== modified file 'bin/addons/consumption_calculation/consumption_view.xml'
--- bin/addons/consumption_calculation/consumption_view.xml	2019-04-04 14:25:27 +0000
+++ bin/addons/consumption_calculation/consumption_view.xml	2019-07-30 10:05:10 +0000
@@ -134,7 +134,9 @@
             <field name="arch" type="xml">
                 <search string="Real consumption reports">
                     <group col="10" colspan="4">
+                        <filter icon="terp-document-new" name="draft" string="Draft"  domain="[('state', '=', 'draft')]" />
                         <filter icon="terp-check" string="Closed" domain="[('created_ok','=',True)]"/>
+                        <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="cons_location_id"/>

=== modified file 'bin/addons/finance/account_view.xml'
--- bin/addons/finance/account_view.xml	2017-10-31 08:06:46 +0000
+++ bin/addons/finance/account_view.xml	2019-07-30 10:05:10 +0000
@@ -21,41 +21,6 @@
             </field>
         </record>
 
-        <record id="inherit_view_account_search_pma" model="ir.ui.view">
-            <field name="name">inherit.view.account.search.pma</field>
-            <field name="model">account.account</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="account.view_account_search"/>
-            <field name="priority">25</field>
-            <field name="arch" type="xml">
-                <xpath expr="/search/group[1]" position="replace">
-                    <group col="12" colspan="4">
-
-                        <filter name="active" icon="terp-check" string="Active" domain="[('filter_active', '=', True)]" />
-                        <filter name="inactive" icon="gtk-dialog-error" string="Inactive" domain="[('filter_active', '=', False)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
-                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                        <filter name="accrual_account" string="Accrual Account" domain="[('accrual_account','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <newline/>
-
-                        <group col="6" colspan="4">
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="is_not_hq_correctible"/>
-                        </group>
-                        <newline/>
-
-                        <field name="user_type"/>
-                        <field name="type"/>
-                        <field name="type_for_register"/>
-
-                    </group>
-                </xpath>
-            </field>
-        </record>
-
     <!--
         Journal Entries
     -->

=== modified file 'bin/addons/hr/hr_view.xml'
--- bin/addons/hr/hr_view.xml	2018-08-21 19:39:57 +0000
+++ bin/addons/hr/hr_view.xml	2019-07-30 10:05:10 +0000
@@ -101,21 +101,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal+" domain="[('active','=',True)]" name="active" string="Active" groups="base.group_extended"/>
+                    <filter icon="terp-personal+" domain="[('active','=',True)]" name="active" string="Active" />
+                    <filter icon="terp-personal-" domain="[('active','=',False)]" name="inactive" string="Inactive" />
+                    <separator orientation="vertical" />
+                    <filter icon="gtk-leave-fullscreen" domain="[('employee_type','=','local')]" name="employee_type_local" string="Local" />
+                    <filter icon="gtk-quit" domain="[('employee_type','=','ex')]" name="employee_type_expatriate" string="Expat'" />
+
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="identification_id"/>
-                    <field name="department_id" widget="selection">
-                    <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
-                    </field>
                     <field name="job_id"/>
+                    <newline/>
+                    <group>
+                        <field name="destination_id" domain="[('category','=','DEST'), ('type', '!=', 'view'), ('state', '=', 'open')]"/>
+                        <field name="cost_center_id" domain="[('category','=','OC'), ('type', '!=', 'view'), ('state', '=', 'open')]"/>
+                        <field name="funding_pool_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open')]"/>
+                    </group>
                     <newline />
                     <group expand="0" string="Group By...">
-                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
                     <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"/>
                     </group>
                 </search>
              </field>

=== modified file 'bin/addons/kit/kit_view.xml'
--- bin/addons/kit/kit_view.xml	2017-10-04 06:36:54 +0000
+++ bin/addons/kit/kit_view.xml	2019-07-30 10:05:10 +0000
@@ -140,10 +140,10 @@
             <field name="arch" type="xml">
                 <search string="Search Theoretical Kit Composition">
                     <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state','=','draft')]" separator="1" />
-                    <filter icon="terp-camera_test" name="completed" string="Completed" domain="[('state','=', 'completed')]" separator="1" />
                     <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" />
                     <filter icon="gtk-cancel" name="cancel" string="Canceled" domain="[('state','=', 'cancel')]" separator="1" />
                     <separator orientation="vertical" />
+                    <filter icon="gtk-ok" name="active" string="Active" domain="[('active', '=', True)]" separator="1" />
                     <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="[('active', '=', False)]" separator="1" />
                     <separator orientation="vertical" />
                     <field name="composition_product_id" domain="[('type', '=', 'product'), ('subtype', '=', 'kit')]" select="1" />
@@ -188,7 +188,6 @@
                 <search string="Search Real Kit Composition">
                     <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state','=','draft')]" separator="1" />
                     <filter icon="gtk-execute" name="in_production" string="In Production" domain="[('state','=', 'in_production')]" separator="1" />
-                    <filter icon="terp-camera_test" name="completed" string="Completed" domain="[('state','=', 'completed')]" separator="1" />
                     <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" />
                     <filter icon="gtk-cancel" name="cancel" string="Canceled" domain="[('state','=', 'cancel')]" separator="1" />
                     <separator orientation="vertical" />
@@ -334,8 +333,8 @@
 			<field name="res_model">composition.kit</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
-			<field name="domain">[('composition_type', '=', 'theoretical')]</field>
-			<field name="context">{'search_default_completed': True, 'composition_type':'theoretical'}</field>
+			<field name="domain">['&amp;', ('composition_type', '=', 'theoretical'), ('active', 'in', ['t', 'f'])]</field>
+			<field name="context">{'composition_type':'theoretical', 'search_default_active': 1}</field>
 			<field name="search_view_id" ref="view_composition_kit_theoretical_filter" />
 		</record>
 		
@@ -355,7 +354,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="domain">[('composition_type', '=', 'real')]</field>
-			<field name="context">{'search_default_completed': True, 'composition_type':'real'}</field>
+			<field name="context">{'composition_type':'real'}</field>
 			<field name="search_view_id" ref="view_composition_kit_real_filter" />
         </record>
 

=== modified file 'bin/addons/msf_budget/msf_budget_view.xml'
--- bin/addons/msf_budget/msf_budget_view.xml	2017-06-13 15:20:13 +0000
+++ bin/addons/msf_budget/msf_budget_view.xml	2019-07-30 10:05:10 +0000
@@ -31,6 +31,7 @@
                    <group col="20" colspan="4">
                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
                        <filter name="validated" string="Validated" icon="terp-camera_test" domain="[('state','=','valid')]" help="Validated Budgets" />
+                       <filter name="Done" string="Done" icon="terp-dialog-close" domain="[('state','=','done')]" />
                        <separator orientation="vertical"/>
                        <filter name='hq' string="HQ" domain="[('instance_type', '=', 'section')]" help="Budgets that use a cost center which is the 'top cost center for budget' from a HQ instance." icon="terp-go-home"/>
                        <filter name='coordo' string="Coordo" domain="[('instance_type', '=', 'coordo')]" help="Budgets that use a cost center which is the 'top cost center for budget' from a Coordo instance." icon="terp-go-home"/>

=== modified file 'bin/addons/msf_currency_revaluation/res_currency_view.xml'
--- bin/addons/msf_currency_revaluation/res_currency_view.xml	2013-12-16 08:18:07 +0000
+++ bin/addons/msf_currency_revaluation/res_currency_view.xml	2019-07-30 10:05:10 +0000
@@ -6,7 +6,7 @@
             <field name="name">res.currency.form</field>
             <field name="model">res.currency</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_currency_form"/>
+            <field name="inherit_id" ref="base.view_currency_functional_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//form[@string='Rates']/field[@name='rate']" position="after">
                     <field name="currency_rate_type_id"/>

=== modified file 'bin/addons/msf_doc_import/data/msf_doc_import_data.xml'
--- bin/addons/msf_doc_import/data/msf_doc_import_data.xml	2014-10-28 13:29:46 +0000
+++ bin/addons/msf_doc_import/data/msf_doc_import_data.xml	2019-07-30 10:05:10 +0000
@@ -76,33 +76,5 @@
         <field name="international_status" ref="product_attributes.int_5"/>
     </record>
     
-    <!-- Partner to be defined -->
-    <record id="supplier_tbd" model="res.partner">
-        <field name="name">To be defined</field>
-        <field name="active" eval="False" />
-    </record>
-    
-    <!-- Partner address to be defined -->
-    <record id="address_tbd" model="res.partner.address">
-        <field name="type">default</field>
-        <field name="street">To be defined</field>
-        <field name="zip">To be defined</field>
-        <field name="city">To be defined</field>
-        <field name="partner_id" ref="supplier_tbd"/>
-        <field name="active" eval="False" />
-    </record>
-    
-    <!-- SupplierInfo to be defined -->
-    <record id="supplierinfo_tbd" model="product.supplierinfo">
-        <field name="name" ref="supplier_tbd"/>
-        <field name="product_id" ref="product_tbd"/>
-        <field name="active" eval="False" />
-        <!-- 
-        <field name="uom_id" ref="uom_tbd"/>
-        <field name="uom_po_id" ref="uom_tbd"/>
-        <field name="categ_id" ref="cat_tbd"/>
-         -->
-    </record>
-    
     </data>
 </openerp>

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2019-07-26 15:17:15 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2019-07-30 10:05:10 +0000
@@ -657,13 +657,8 @@
             ids = [ids]
         message = ''
         plural = ''
-        obj_data = self.pool.get('ir.model.data')
 
         for var in self.browse(cr, uid, ids, context=context):
-            # we check the supplier and the address
-            if var.partner_id.id == obj_data.get_object_reference(cr, uid, 'msf_doc_import', 'supplier_tbd')[1] \
-                    or var.partner_address_id.id == obj_data.get_object_reference(cr, uid, 'msf_doc_import', 'address_tbd')[1]:
-                raise osv.except_osv(_('Warning !'), _("\n You can't have a supplier or an address 'To Be Defined', please select a consistent supplier."))
             # we check the lines that need to be fixed
             if var.order_line:
                 for var in var.order_line:

=== modified file 'bin/addons/msf_homere_interface/hr_view.xml'
--- bin/addons/msf_homere_interface/hr_view.xml	2019-04-05 14:45:58 +0000
+++ bin/addons/msf_homere_interface/hr_view.xml	2019-07-30 10:05:10 +0000
@@ -154,40 +154,6 @@
         </field>
     </record>
 
-    <!--
-        Employee Search
-    -->
-    <record id="inherit_view_employee_filter" model="ir.ui.view">
-        <field name="name">inherit.view.employee.filter</field>
-        <field name="model">hr.employee</field>
-        <field name="type">search</field>
-        <field name="inherit_id" ref="hr.view_employee_filter"/>
-        <field name="arch" type="xml">
-            <data>
-                <xpath expr="/search/filter[@name='active']" position="after">
-                    <separator orientation="vertical" />
-                    <filter icon="gtk-leave-fullscreen" domain="[('employee_type','=','local')]" name="employee_type_local" string="Local" />
-                    <filter icon="gtk-quit" domain="[('employee_type','=','ex')]" name="employee_type_expatriate" string="Expat'" />
-                </xpath>
-                <xpath expr="/search/field[@name='department_id']" position="replace">
-                </xpath>
-                <xpath expr="//filter[@string='Coach']" position="replace">
-                </xpath>
-                <xpath expr="//filter[@string='Department']" position="replace">
-                </xpath>
-                <xpath expr="//filter[@string='Company']" position="replace">
-                </xpath>
-                <xpath expr="//field[@name='job_id']" position="after">
-                    <newline/>
-                    <group>
-                        <field name="destination_id" domain="[('category','=','DEST'), ('type', '!=', 'view'), ('state', '=', 'open')]"/>
-                        <field name="cost_center_id" domain="[('category','=','OC'), ('type', '!=', 'view'), ('state', '=', 'open')]"/>
-                        <field name="funding_pool_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open')]"/>
-                    </group>
-                </xpath>
-            </data>
-        </field>
-    </record>
 
     <record id="view_employee_filter_2" model="ir.ui.view">
         <field name="name">view.employee.filter.2</field>

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2019-06-17 09:06:48 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2019-07-30 10:05:10 +0000
@@ -395,6 +395,7 @@
 						<filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" />
 						<filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" />
 						<filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" />
+                        <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
 						<separator orientation="vertical"/>
 						<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" />
 						<separator orientation="vertical"/>
@@ -451,6 +452,7 @@
 						<filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" />
 						<filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" />
 						<filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" />
+                        <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
 						<separator orientation="vertical"/>
 						<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" />
 						<separator orientation="vertical"/>
@@ -768,8 +770,11 @@
 			<field name="arch" type="xml">
 				<search string="Pre-Packing List">
 					<group col="8" colspan="4">
+                         <filter icon="terp-document-new" name="draft" string="Draft"  domain="[('state', '=', 'draft')]" />
+                         <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" />
 						<filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
 						<filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Delivery orders already processed"/>
+                        <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
 						<separator orientation="vertical"/>
 						<field name="name"/>
 						<field name="partner_id2" />
@@ -1429,9 +1434,11 @@
 				<search string="Shipment">
 					<group col="8" colspan="4">
 						<filter icon="terp-document-new" name="draft" string="Draft" domain="[('state','=','draft')]" />
+						<filter icon="terp-accessories-archiver" name="packed" string="Packed" domain="[('state','=','packed')]" />
 						<filter icon="terp-check" name="shipped" string="Ready to ship" domain="[('state','=','shipped')]" />
 						<filter icon="terp-dialog-close" name="closed" string="Dispatched" domain="[('state','=','done')]" />
 						<filter icon="gtk-yes" name="delivered" string="Received" domain="[('state','=','delivered')]" />
+                        <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
 						<separator orientation="vertical"/>
 						<filter icon="terp-folder-orange" name="empty" string="Empty" domain="[('num_of_packs','=', 0)]" />
 						<filter icon="terp-folder-green" name="not_empty" string="Not Empty" domain="[('num_of_packs','!=', 0)]" />

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2019-02-08 16:27:30 +0000
+++ bin/addons/msf_partner/partner.py	2019-07-30 10:05:10 +0000
@@ -351,26 +351,8 @@
         """
         Check if the deleted partner is not a system one
         """
-        data_obj = self.pool.get('ir.model.data')
         property_obj = self.pool.get('ir.property')
 
-        partner_data_id = [
-            'supplier_tbd',
-        ]
-
-        for data_id in partner_data_id:
-            try:
-                part_id = data_obj.get_object_reference(
-                    cr, uid, 'msf_doc_import', data_id)[1]
-                if part_id in ids:
-                    part_name = self.read(cr, uid, part_id, ['name'])['name']
-                    raise osv.except_osv(
-                        _('Error'),
-                        _('''The partner '%s' is an Unifield internal partner, so you can't remove it''') % part_name,
-                    )
-            except ValueError:
-                pass
-
 
         #US-1344: treat deletion of partner
         address_obj = self.pool.get('res.partner.address')
@@ -967,7 +949,7 @@
         if view_type == 'search':
             if not context or not context.get('show_button_show_inactive', False):
                 tree = etree.fromstring(view['arch'])
-                fields = tree.xpath('//filter[@name="inactive"]')
+                fields = tree.xpath('//filter[@name="inactive"]|//filter[@name="active"]')
                 for field in fields:
                     field.set('invisible', "1")
                 view['arch'] = etree.tostring(tree)
@@ -990,24 +972,7 @@
         """
         Check if the deleted address is not a system one
         """
-        data_obj = self.pool.get('ir.model.data')
-
-        addr_data_id = [
-            'address_tbd',
-        ]
-
-        for data_id in addr_data_id:
-            try:
-                addr_id = data_obj.get_object_reference(
-                    cr, uid, 'msf_doc_import', data_id)[1]
-                if addr_id in ids:
-                    addr_name = self.read(cr, uid, addr_id, ['name'])['name']
-                    raise osv.except_osv(
-                        _('Error'),
-                        _('''The Address '%s' is an Unifield internal address, so you can't remove it''') % addr_name,
-                    )
-            except ValueError:
-                pass
+
         res = super(res_partner_address, self).unlink(cr, uid, ids, context=context)
 
         #US-1344: treat deletion of partner

=== modified file 'bin/addons/msf_partner/partner_view.xml'
--- bin/addons/msf_partner/partner_view.xml	2019-03-29 16:33:48 +0000
+++ bin/addons/msf_partner/partner_view.xml	2019-07-30 10:05:10 +0000
@@ -82,7 +82,8 @@
                             <filter string="ESC" name="esc" icon="gtk-ok" domain="[('partner_type','=','esc')]" help="ESC Partners"/>
                             <filter string="Intermission" name="intermission" icon="gtk-ok" domain="[('partner_type','=','intermission')]" help="Intermission Partners"/>
                             <separator orientation="vertical" />
-                            <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="[('name', '!=', 'To be defined'), ('active', '=', False)]" separator="1" />
+                            <filter icon="terp-personal+" name="active" string="Show Active" domain="[('active', '=', True)]" default="1" />
+                            <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="['&amp;', ('name', '!=', 'To be defined'), ('active', '=', False)]" separator="1" />
                             <newline />
                             <field name="name" select="1"/>
                             <field name="address" select="1"/>
@@ -259,6 +260,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
+            <field name="context">{'show_button_show_inactive': True, 'default_search_active': 1, 'active_test': 0}</field>
             <field name="view_id" ref="msf_view_partner_tree"/>
             <field name="search_view_id" ref="msf_view_res_partner_filter"/>
         </record>

=== modified file 'bin/addons/msf_profile/data.xml'
--- bin/addons/msf_profile/data.xml	2017-10-27 08:30:22 +0000
+++ bin/addons/msf_profile/data.xml	2019-07-30 10:05:10 +0000
@@ -83,9 +83,6 @@
     <record id="order_types.res_partner_local_market" model="res.partner">
         <field name="lang">en_MF</field>
     </record>
-    <record id="msf_doc_import.supplier_tbd" model="res.partner">
-        <field name="lang">en_MF</field>
-    </record>
 
     <record id="smtp_config" model="email.configuration">
         <field name="smtp_server">127.0.0.1</field>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-07-26 15:23:04 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-07-30 10:05:10 +0000
@@ -8768,6 +8768,7 @@
 #: selection:wizard.import.product.line,state:0
 #: selection:product.mass.update,state:0
 #: selection:stock.expired.damaged.report,state:0
+#: view:res.request:0
 #, python-format
 msgid "Draft"
 msgstr "Brouillon"
@@ -11621,7 +11622,7 @@
 msgid "Creation Month"
 msgstr "Creation Month"
 
-#. modules: resource, finance, supplier_catalogue, msf_field_access_rights, msf_instance, msf_button_access_rights, msf_tools, analytic_distribution, financing_contract, sync_client
+#. modules: resource, finance, supplier_catalogue, msf_field_access_rights, msf_instance, msf_button_access_rights, msf_tools, analytic_distribution, financing_contract, sync_client, hr,res_currency_functional,msf_profile
 #: view:financing.contract.donor:0
 #: view:msf.instance:0
 #: selection:msf.instance.cloud,state:0
@@ -11637,6 +11638,9 @@
 #: report:addons/msf_tools/report/report_inconsistencies_xls.mako:106
 #: view:resource.resource:0
 #: view:supplier.catalogue:0
+#: view:hr.employee:0
+#: view:res.users:0
+#: view:res.currency:0
 msgid "Inactive"
 msgstr "Inactif"
 
@@ -17762,6 +17766,7 @@
 
 #. module: base
 #: field:ir.model.access,perm_create:0
+#: field:ir.model.access.empty,perm_create:0
 msgid "Create Access"
 msgstr "Créer l'Accès "
 
@@ -21170,8 +21175,9 @@
 msgid "Etc/GMT-11"
 msgstr "Etc/GMT-11"
 
-#. module: sales_followup
+#. module: sales_followup, account
 #: selection:ir.followup.location.wizard,state:0
+#: view:account.subscription:0
 msgid "Done"
 msgstr "Cloturé"
 
@@ -23409,9 +23415,10 @@
 msgid "Dest. Address"
 msgstr "Dest. Address"
 
-#. modules: delivery_mechanism, stock_override
+#. modules: delivery_mechanism, stock_override, account
 #: view:stock.picking.processing.info:0
 #: view:change.dest.location:0
+#: view:account.period:0
 msgid "Close"
 msgstr "Fermé"
 
@@ -30251,15 +30258,23 @@
 msgid "Certificate attached ?"
 msgstr "Certificat attaché ?"
 
+<<<<<<< TREE
 #. modules: msf_supply_doc_export, sourcing, consumption_calculation, sale, sales_followup, msf_supply_doc_export, purchase
+=======
+#. modules: msf_supply_doc_export, sourcing, consumption_calculation, sale, sales_followup, msf_supply_doc_export, base
+>>>>>>> MERGE-SOURCE
 #: field:po.follow.up,closed_ok:0
 #: selection:real.average.consumption,state:0
 #: selection:po.follow.up,state:0
 #: selection:sale.order.leave.close,order_state:0
 #: field:ir.followup.location.wizard,closed_ok:0
 #: selection:sale.order.line,sale_order_state:0
+<<<<<<< TREE
 #: selection:sale.order.line,state_to_display:0
 #: selection:purchase.order.line,state_to_display:0
+=======
+#: view:res.request:0
+>>>>>>> MERGE-SOURCE
 msgid "Closed"
 msgstr "Fermé"
 
@@ -31871,6 +31886,7 @@
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 #: selection:account.partner.balance.tree,account_type:0
+#: view:account.account:0
 msgid "Payable"
 msgstr "Fournisseur"
 
@@ -37240,14 +37256,12 @@
 msgstr "L'Identité de l'enregistrement est attachée à ce(t)"
 
 #. modules: account, finance
-#: view:account.account:0
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
 #: code:addons/account/report/account_partner_ledger.py:294
 #: model:ir.actions.act_window,name:account.action_aged_receivable
-#: view:account.account:0
 #: selection:wizard.account.partner.balance.tree,result_selection:0
 #: code:addons/finance/report/account_partner_balance_tree.py:90
 #, python-format
@@ -39341,6 +39355,7 @@
 #: field:purchase.order.merged.line,create_date:0
 #: field:internal.request.import,in_creation_date:0
 #: field:purchase.order.line,create_date:0
+#: field:internal.request.import,in_creation_date:0
 #, python-format
 msgid "Creation date"
 msgstr "Date de création"
@@ -48509,6 +48524,7 @@
 #: view:account.bank.statement:0
 #: view:account.bank.statement.line:0
 #: view:sale.order.line:0
+#: view:free.allocation.wizard:0
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -51986,10 +52002,11 @@
 "        Creates automatically Purchase Orders after choosing.\n"
 "    "
 
-#. modules: financing_contract, msf_homere_interface, analytic_distribution
+#. modules: financing_contract, msf_homere_interface, analytic_distribution, msf_partner
 #: view:account.destination.link:0
 #: view:financing.contract.account.quadruplet:0
 #: view:hr.employee:0
+#: view:res.partner:0
 msgid "Show Active"
 msgstr "Montrer Actif"
 
@@ -53510,6 +53527,7 @@
 #: selection:cash.request.liquidity.cheque,type:0
 #: selection:account.journal.fake,type:0
 #: selection:wizard.register.opening.confirmation,register_type:0
+#: view:account.account:0
 msgid "Accrual"
 msgstr "Accrual"
 
@@ -57810,10 +57828,12 @@
 msgid "Parent shipment"
 msgstr "Expédition Parent "
 
-#. modules: sourcing, analytic_distribution, account_mcdb
+#. modules: sourcing, analytic_distribution, account_mcdb, account
 #: view:analytic.distribution.wizard:0
 #: view:multiple.sourcing.wizard:0
 #: view:account.mcdb:0
+#: view:account.common.report:0
+#: view:free.allocation.wizard:0
 msgid "Save"
 msgstr "Sauver"
 
@@ -66705,6 +66725,7 @@
 
 #. module: account
 #: selection:report.account.receivable,type:0
+#: view:account.account:0
 msgid "Income"
 msgstr "Income"
 
@@ -72810,7 +72831,7 @@
 msgid "Navajo"
 msgstr "Navajo"
 
-#. modules: product_nomenclature, process, financing_contract, mission_stock, procurement_cycle, sync_client, supplier_catalogue, analytic_distribution, product, finance, hr, msf_instance, kit, base, msf_tools, res_currency_functional, procurement_report, threshold_value, purchase, account, resource, msf_partner, procurement_auto, msf_field_access_rights, sale, procurement, msf_button_access_rights, stock, product_attributes, account_period_closing_level
+#. modules: product_nomenclature, process, financing_contract, mission_stock, procurement_cycle, sync_client, supplier_catalogue, analytic_distribution, product, finance, hr, msf_instance, kit, base, msf_tools, res_currency_functional, procurement_report, threshold_value, purchase, account, resource, msf_partner, procurement_auto, msf_field_access_rights, sale, procurement, msf_button_access_rights, stock, product_attributes, account_period_closing_level, msf_profile
 #: field:account.account,active:0
 #: field:account.analytic.journal,active:0
 #: field:account.journal.period,active:0
@@ -72880,6 +72901,8 @@
 #: field:sync.client.message_rule,active:0
 #: selection:sync.version.instance.monitor,instance_state:0
 #: field:product.mass.update,active_product:0
+#: view:composition.kit:0
+#: view:res.users:0
 #, python-format
 msgid "Active"
 msgstr "Actif"
@@ -76618,6 +76641,7 @@
 
 #. module: account
 #: selection:report.account.receivable,type:0
+#: view:account.account:0
 msgid "Expense"
 msgstr "Expense"
 
@@ -78241,7 +78265,7 @@
 msgid "Indicative Total Value"
 msgstr "Valeur totale"
 
-#. modules: tender_flow, account_voucher, account_override, purchase_allocation_report, register_accounting, msf_accrual, stock_forecast, analytic, msf_supply_doc_export, stock, msf_order_date, account_payment, sales_followup, consumption_calculation, purchase_override, specific_rules, kit, out_step, base, purchase, account, msf_outgoing, sale, procurement, sourcing
+#. modules: tender_flow, account_voucher, account_override, purchase_allocation_report, register_accounting, msf_accrual, stock_forecast, analytic, msf_supply_doc_export, stock, msf_order_date, account_payment, sales_followup, consumption_calculation, purchase_override, specific_rules, kit, out_step, base, purchase, account, msf_outgoing, sale, procurement, sourcing, procurement_request
 #: selection:account.invoice,state:0
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
@@ -78308,6 +78332,10 @@
 #: selection:sale.order.line,state_to_display:0
 #: selection:purchase.order.line,state_to_display:0
 #: field:po.follow.up,cancel_ok:0
+#: view:real.average.consumption:0
+#: view:shipment:0
+#: view:stock.picking:0
+#: view:sale.order:0
 #, python-format
 msgid "Cancelled"
 msgstr "Annulé"
@@ -79736,6 +79764,7 @@
 
 #. module: base
 #: field:ir.model.access,perm_unlink:0
+#: field:ir.model.access.empty,perm_unlink:0
 msgid "Delete Access"
 msgstr "Supprimer Accès"
 
@@ -85642,14 +85671,12 @@
 msgstr "Ajouter un en-tête RML"
 
 #. modules: account, finance
-#: view:account.account:0
 #: view:account.account.template:0
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
 #: code:addons/account/report/account_partner_ledger.py:296
-#: view:account.account:0
 #: code:addons/finance/report/account_partner_balance_tree.py:92
 #: selection:wizard.account.partner.balance.tree,result_selection:0
 #, python-format
@@ -89323,6 +89350,7 @@
 #. modules: sales_followup, msf_outgoing
 #: selection:shipment,state:0
 #: code:addons/sales_followup/sale_followup.py:525
+#: view:shipment:0
 #, python-format
 msgid "Packed"
 msgstr "Emballé"
@@ -89764,6 +89792,7 @@
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 #: selection:account.partner.balance.tree,account_type:0
+#: view:account.account:0
 msgid "Receivable"
 msgstr "Créditeurs"
 
@@ -93947,6 +93976,7 @@
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:229
 #: field:internal.request.import,imp_creation_date:0
 #: report:addons/stock/report/products_situation_report_xls.mako:221
+#: field:internal.request.import,imp_creation_date:0
 msgid "Creation Date"
 msgstr "Date de Création"
 
@@ -102451,10 +102481,18 @@
 msgid "A.D"
 msgstr "D.A"
 
+<<<<<<< TREE
 #. modules: purchase, sale
+=======
+#. module: purchase, sale
+>>>>>>> MERGE-SOURCE
 #: view:purchase.order.line:0
+<<<<<<< TREE
 #: view:sale.order.line:0
 #: view:sale.order:0
+=======
+#: view:sale.order:0
+>>>>>>> MERGE-SOURCE
 msgid "Changes"
 msgstr "Modifications"
 
@@ -107371,6 +107409,7 @@
 msgid "Stop report"
 msgstr "Arrêter le rapport"
 
+<<<<<<< TREE
 #. module: stock
 #: code:addons/stock/stock.py:1780
 #, python-format
@@ -107481,3 +107520,10 @@
 #: report:addons/sale/report/sale_loan_stock_moves_report_xls.mako:175
 msgid "Line State"
 msgstr "État de la Ligne"
+=======
+#. modules: sale, procurement_request
+#: view:sale.order:0
+#: view:sale.order:0
+msgid "Add Line"
+msgstr "Ajouter La ligne"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2019-07-24 09:13:25 +0000
+++ bin/addons/msf_profile/msf_profile.py	2019-07-30 10:05:10 +0000
@@ -1781,7 +1781,7 @@
                     select res_id from ir_model_data d
                     where d.module='sd'
                         and d.model='res.partner'
-                        and name not in ('msf_doc_import_supplier_tbd', 'order_types_res_partner_local_market')
+                        and name != 'order_types_res_partner_local_market'
                         and name not like '%s%%'
                     ) """ % (identifier, ))  # not_a_user_entry
                 self._logger.warn('%s non local partners updated' % (cr.rowcount,))

=== modified file 'bin/addons/msf_profile/user_access_configurator_view.xml'
--- bin/addons/msf_profile/user_access_configurator_view.xml	2019-04-02 13:37:23 +0000
+++ bin/addons/msf_profile/user_access_configurator_view.xml	2019-07-30 10:05:10 +0000
@@ -360,7 +360,7 @@
             <field name="priority" eval="99" />
             <field name="arch" type="xml">
                 <search string="Groups">
-                    <filter name="show_active" string="Only inactive" icon="gtk-cancel" domain="[('visible_res_groups', '=', False)]" context="{'show_invisible': True}" />
+                    <filter name="only_inactive" string="Only inactive" icon="gtk-cancel" domain="[('visible_res_groups', '=', False)]" context="{'show_invisible': True}" />
                     <filter name="show_good_level" string="All Levels" icon="gtk-cancel" context="{'show_all_level': True}" />
                     <field name="name" />
                     <field name="is_an_admin_profile" />
@@ -387,7 +387,9 @@
             <field name="priority" eval="99" />
             <field name="arch" type="xml">
                 <search string="Users">
-                    <filter name="show_inactive" string="Show inactive" icon="gtk-ok" domain="[('active', '=', False)]" />
+                    <filter name="active" string="Active" icon="terp-personal+" domain="[('active', '=', True)]" />
+                    <filter name="inactive" string="Inactive" icon="terp-personal-" domain="[('active', '=', False)]" />
+                    <separator orientation="vertical"/>
                     <filter name="show_synchronized" string="Show synchronized" icon="gtk-ok" domain="[('synchronize', '=', True)]"/>
                     <field name="name" />
                     <field name="login" />

=== modified file 'bin/addons/out_step/out_step_view.xml'
--- bin/addons/out_step/out_step_view.xml	2019-06-18 07:28:19 +0000
+++ bin/addons/out_step/out_step_view.xml	2019-07-30 10:05:10 +0000
@@ -36,12 +36,17 @@
             <field name="inherit_id" ref="stock.view_picking_out_search" />
             <field name="arch" type="xml">
             	<data>
-
                     <filter name="done" position="replace">
+<<<<<<< TREE
                         <!-- <separator orientation="vertical"/> -->
                         <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Delivery orders already processed"/>
                         <filter icon="gtk-yes" name="delivered" string="Delivered" domain="[('state', '=', 'delivered')]" help="Delivered Delivery Orders" />
                         <!-- <filter icon="gtk-no" name="not_delivered" string="Not Delivered" domain="[('state', '=', 'done'), ('delivered', '=', False)]" help="Not Delivered Delivery Orders" /> -->
+=======
+                        <filter icon="terp-dialog-close" name="done" string="Closed" domain="['&amp;', ('state','=','done'), ('delivered', '=', False)]" help="Delivery orders already processed"/>
+                        <filter icon="gtk-yes" name="delivered" string="Delivered" domain="['&amp;', ('state', '=', 'done'), ('delivered', '=', True)]" help="Delivered Delivery Orders" />
+                        <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
+>>>>>>> MERGE-SOURCE
                         <separator orientation="vertical"/>
 					</filter>
 					
@@ -50,4 +55,4 @@
         </record>
     
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'bin/addons/procurement/procurement_view.xml'
--- bin/addons/procurement/procurement_view.xml	2017-10-04 05:23:42 +0000
+++ bin/addons/procurement/procurement_view.xml	2019-07-30 10:05:10 +0000
@@ -107,8 +107,8 @@
                            help="Procurement started late" />
                        <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-emblem-important" string="To Fix" name="perm_exceptions" domain="['&amp;', ('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
+                       <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="['&amp;', ('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
                        <separator orientation="vertical"/>
                        <field name="origin"/>
                        <field name="product_id" />

=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2019-03-18 16:21:17 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2019-07-30 10:05:10 +0000
@@ -168,9 +168,11 @@
                 <search string="Internal Requests">
                     <group string="Filters" expand="1">
                         <filter name="state_proc" string="Draft" icon="terp-document-new" domain="[('state', 'in', ['draft','draft_p'])]" />
-                        <filter name="state_valid" string="Validated" icon="terp-camera_test" domain="[('state', 'in', ['validated','validated_p'])]" />
-                        <filter name="state_proc_progress" string="Confirmed" icon="terp-stage" domain="[('state', 'in', ('confirmed', 'confirmed_p'))]" />
+                        <filter name="state_valid" string="Validated" icon="terp-check" domain="[('state', 'in', ['validated','validated_p'])]" />
+                        <filter name="sourced" string="Sourced" icon="gtk-paste-v" domain="[('state','in',['sourced','sourced_p'])]" />
+                        <filter name="state_proc_progress" string="Confirmed" icon="terp-camera_test" domain="[('state', 'in', ('confirmed', 'confirmed_p'))]" />
                         <filter name="state_done" string="Closed" icon="terp-dialog-close" domain="[('state', '=', 'done')]" />
+                        <filter name="cancelled" string="Cancelled" icon="gtk-cancel" domain="[('state', '=', 'cancel')]" />
                         <separator orientation="vertical" />
                         <field name="name" />
                         <field name="origin" />

=== modified file 'bin/addons/product/product_view.xml'
--- bin/addons/product/product_view.xml	2019-01-30 08:28:30 +0000
+++ bin/addons/product/product_view.xml	2019-07-30 10:05:10 +0000
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <filter string="Stock>0"  icon="terp-accessories-archiver" domain="[('postive_qty','=',True)]"/>
+                   <separator orientation="vertical"/>
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>

=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2019-05-03 13:44:52 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2019-07-30 10:05:10 +0000
@@ -464,6 +464,7 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <filter string="Stock>0"  icon="terp-accessories-archiver" domain="[('postive_qty','=',True)]"/>
+                   <separator orientation="vertical"/>
                    <filter string="Stockable" icon="terp-accessories-archiver" domain="[('type','=','product')]"/>
                    <filter string="Non-Stockable" icon="terp-accessories-archiver" domain="[('type','=','consu')]"/>
                    <filter string="Service with Reception" icon="terp-accessories-archiver" domain="[('type','=','service_recep')]" />

=== modified file 'bin/addons/product_list/product_list_view.xml'
--- bin/addons/product_list/product_list_view.xml	2017-01-11 14:07:57 +0000
+++ bin/addons/product_list/product_list_view.xml	2019-07-30 10:05:10 +0000
@@ -32,6 +32,7 @@
                     <filter string="Sublist" name="only_sublist" domain="[('type', '=', 'sublist')]" icon="gtk-copy" />
                     <separator orientation="vertical" />
                     <filter string="Standard" name="standard" domain="[('standard_list_ok', '=', True)]" icon="terp-rating-rated" />
+                    <separator orientation="vertical" />
                     <filter string="Order list print" name="print_list" domain="[('order_list_print_ok', '=', True)]" icon="gtk-print" />
                     <field name="ref" />
                     <field name="name" />

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2019-07-25 13:52:35 +0000
+++ bin/addons/purchase/purchase_view.xml	2019-07-30 10:05:10 +0000
@@ -435,14 +435,12 @@
                 <search string="Search Purchase Orders">
                     <group col="8" colspan="4">
                         <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state', 'in', ['draft', 'draft_p'])]" separator="1" help="Purchase orders which are in draft state"/>
-                        <filter icon="terp-check" name="approved" string="Validated" domain="[('state', 'in', ['validated', 'validated_p'])]" separator="1" help="Purchase orders which are in approved state."/>
+                        <filter icon="terp-check" name="validated" string="Validated" domain="[('state', 'in', ['validated', 'validated_p'])]" separator="1" help="Purchase orders which are in approved state."/>
                         <filter icon="gtk-paste-v" name="sourced" string="Sourced" domain="[('state','in',['sourced','sourced_p'])]" separator="1"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','in',['confirmed','confirmed_p'])]" separator="1" help="Purchase orders which are in validated state."/>
                         <filter icon="gtk-close" name="done" string="Closed" domain="[('state', 'in', ['done'])]" separator="1" help="Purchase orders which are in done state."/>
-                        <separator orientation="vertical"/>
                         <filter icon="gtk-cancel" name="cancelled" string="Cancelled" domain="[('state', 'in', ['cancel'])]" separator="1" help="Purchase orders which are in cancelled state."/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state', 'in', ['except_invoice', 'except_picking'])]" separator="1" help="Purchase orders which are in the exception state."/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1" string="Reference"/>
                         <field name="partner_id" select="1" string="Supplier"/>
@@ -547,7 +545,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'purchase_order': True}</field>
+            <field name="context">{'purchase_order': True, 'search_default_draft': 1, 'search_default_validated': 1, 'search_default_sourced': 1}</field>
             <field name="domain">[('tender_id', '=', False), ('rfq_ok', '=', False)]</field>
             <field name="search_view_id" ref="purchase.view_purchase_order_filter"/>
             <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>

=== modified file 'bin/addons/purchase/report/purchase_report_view.xml'
--- bin/addons/purchase/report/purchase_report_view.xml	2018-12-07 08:43:21 +0000
+++ bin/addons/purchase/report/purchase_report_view.xml	2019-07-30 10:05:10 +0000
@@ -56,16 +56,16 @@
             <search string="Purchase Orders">
             <group colspan="10" col="12">
                 <filter icon="terp-go-year" string="  Year  "
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                domain="['&amp;', ('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Order in current year"/>
                 <filter icon="terp-go-month" string="   Month   "
                         name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        domain="['&amp;', ('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Order in  current month"/>
                 <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                         domain="['&amp;', ('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Order in last month"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-document-new"
@@ -75,7 +75,7 @@
                 <filter icon="terp-gtk-jump-to-rtl"
                         string="Orders"
                         name="orders"
-                        domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                        domain="['&amp;', ('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
                 <field name="partner_id"/>
                 <field name="product_id"/>

=== modified file 'bin/addons/reason_types_moves/stock_view.xml'
--- bin/addons/reason_types_moves/stock_view.xml	2018-03-12 16:27:29 +0000
+++ bin/addons/reason_types_moves/stock_view.xml	2019-07-30 10:05:10 +0000
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
-	<data>
-        
-    	<!-- Override Stock Moves -->
-    	<record id="stock_move_tree2_type_id" model="ir.ui.view">
+    <data>
+
+        <!-- Override Stock Moves -->
+        <record id="stock_move_tree2_type_id" model="ir.ui.view">
             <field name="name">stock.move.tree2.type.id</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="inherit_id" ref="stock.stock_move_tree2" />
             <field name="arch" type="xml">
-				<data>
-		    		<xpath expr="/tree/field[@name='location_dest_id']" position="replace">
-						<field name="location_dest_id" on_change="location_dest_change(location_dest_id, location_id)" domain="[('id', '!=', location_id)]"/>
-		    		</xpath>
+                <data>
+                    <xpath expr="/tree/field[@name='location_dest_id']" position="replace">
+                        <field name="location_dest_id" on_change="location_dest_change(location_dest_id, location_id)" domain="[('id', '!=', location_id)]"/>
+                    </xpath>
 
                     <xpath expr="/tree/field[@name='product_uom']" position="after">
-	    	        	<field name="reason_type_id" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}" />
+                        <field name="reason_type_id" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}" />
                         <field name="comment" />
                     </xpath>
-				</data>
+                </data>
             </field>
         </record>
 
@@ -30,16 +30,16 @@
             <field name="priority">30</field>
             <field name="inherit_id" ref="stock.view_move_tree" />
             <field name="arch" type="xml">
-				<data>
-		    		<xpath expr="/tree/field[@name='location_dest_id']" position="replace">
-						<field name="location_dest_id" on_change="location_dest_change(location_dest_id, location_id)" domain="[('id', '!=', location_id)]" />
-		    		</xpath>
+                <data>
+                    <xpath expr="/tree/field[@name='location_dest_id']" position="replace">
+                        <field name="location_dest_id" on_change="location_dest_change(location_dest_id, location_id)" domain="[('id', '!=', location_id)]" />
+                    </xpath>
 
-	                <xpath expr="/tree/field[@name='create_date']" position="after">
-			    		<field name="reason_type_id" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}" />
-       	                <field name="comment" />
-	                </xpath>
-	        	</data>
+                    <xpath expr="/tree/field[@name='create_date']" position="after">
+                        <field name="reason_type_id" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}" />
+                        <field name="comment" />
+                    </xpath>
+                </data>
             </field>
         </record>
 
@@ -51,9 +51,9 @@
             <field name="inherit_id" ref="stock.view_move_form" />
             <field name="arch" type="xml">
                 <xpath expr="/form//field[@name='tracking_id']" position="before">
-        	    	<field name="reason_type_id" widget="selection"
-        	    	       domain="[('internal_ok', '=', True)]" 
-        	    	       attrs="{'readonly': [('state', 'not in', ('draft', 'waiting', 'confirmed', 'assigned'))]}" />
+                    <field name="reason_type_id" widget="selection"
+                           domain="[('internal_ok', '=', True)]" 
+                           attrs="{'readonly': [('state', 'not in', ('draft', 'waiting', 'confirmed', 'assigned'))]}" />
                     <field name="comment" attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}" />
                 </xpath>
             </field>
@@ -66,8 +66,8 @@
             <field name="priority">35</field>
             <field name="inherit_id" ref="stock.view_move_form_reception_picking" />
             <field name="arch" type="xml">
-            	<data>
-                	<xpath expr="/form//field[@name='tracking_id']" position="before">
+                <data>
+                    <xpath expr="/form//field[@name='tracking_id']" position="before">
                         <field name="reason_type_id" widget="selection" 
                                domain="[('incoming_ok', '=', True)]"
                                attrs="{'readonly': [('state', 'not in', ('draft', 'waiting', 'confirmed', 'assigned'))]}" />
@@ -83,18 +83,18 @@
             <field name="priority">25</field>
             <field name="inherit_id" ref="stock.view_move_search" />
             <field name="arch" type="xml">
-				<data>
+                <data>
                     <xpath expr="/search//filter[@string='Done']" position="attributes">
                         <attribute name="string">Closed</attribute>
                     </xpath>
-	            <xpath expr="/search/group[@string='Group By...']/filter[@string='Destination']" position="after">
+                <xpath expr="/search/group[@string='Group By...']/filter[@string='Destination']" position="after">
                         <separator />
                         <filter string="Reason Type" name="groupby_reason_type_id" icon="terp-purchase" domain="[]" context="{'group_by':'reason_type_id'}"/>
                     </xpath>
-				</data>
+                </data>
             </field>
         </record>
-       
+
         <record id="inherit_view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">inherit.view.move.tree.reception.picking</field>
             <field name="model">stock.move</field>
@@ -102,12 +102,12 @@
             <field name="priority">30</field>
             <field name="inherit_id" ref="stock.view_move_tree_reception_picking" />
             <field name="arch" type="xml">
-            	<data>
-                	<xpath expr="/tree/field[@name='picking_id']" position="after">
+                <data>
+                    <xpath expr="/tree/field[@name='picking_id']" position="after">
                         <field name="reason_type_id" domain="[('incoming_ok', '=', True)]" />
                     </xpath>
 
-                	<xpath expr="/tree" position="attributes">
+                    <xpath expr="/tree" position="attributes">
                         <attribute name="hide_new_button">True</attribute>
                         <attribute name="hide_delete_button">True</attribute>
                         <attribute name="editable">top</attribute>
@@ -125,24 +125,24 @@
             <field name="priority">20</field>
             <field name="inherit_id" ref="stock.view_move_search_reception_incoming_picking" />
             <field name="arch" type="xml">
-            	<data>
+                <data>
                     <xpath expr="/search//filter[@string='Done']" position="attributes">
                         <attribute name="string">Closed</attribute>
                     </xpath>
-                    
-			 		<xpath expr="/search/group/field[@name='origin']" position="before">
-						<field name="picking_id" />
-						<field name="reason_type_id" widget="selection" domain="[('incoming_ok', '=', True)]" />
-					</xpath>
-					<xpath expr="/search//field[@name='product_id']" position="after">
-						<field name="order_category" />
-						<field name="state" />
-					</xpath>
- 					<xpath expr="/search//filter[@string='Supplier']" position="after">
- 						<filter string="Reason Type" icon="terp-purchase" domain="[]" context="{'group_by':'reason_type_id'}"/>
- 						<separator orientation="vertical" />
- 					</xpath>
- 					
+
+                    <xpath expr="/search/group/field[@name='origin']" position="before">
+                        <field name="picking_id" />
+                        <field name="reason_type_id" widget="selection" domain="[('incoming_ok', '=', True)]" />
+                    </xpath>
+                    <xpath expr="/search//field[@name='product_id']" position="after">
+                        <field name="order_category" />
+                        <field name="state" />
+                    </xpath>
+                    <xpath expr="/search//filter[@string='Supplier']" position="after">
+                        <filter string="Reason Type" icon="terp-purchase" domain="[]" context="{'group_by':'reason_type_id'}"/>
+                        <separator orientation="vertical" />
+                    </xpath>
+
                 </data>
             </field>
         </record>
@@ -154,69 +154,72 @@
             <field name="priority">20</field>
             <field name="inherit_id" ref="stock.view_move_search_reception_outcoming_picking" />
             <field name="arch" type="xml">
-            	<data>
-            		<xpath expr="/search//filter[@string='To Do']" position="attributes">
-            			<attribute name="string">In Progress</attribute>
-            		</xpath>
+                <data>
+                    <xpath expr="/search//filter[@string='To Do']" position="attributes">
+                        <attribute name="string">In Progress</attribute>
+                    </xpath>
                     <xpath expr="/search//filter[@string='Done']" position="attributes">
                         <attribute name="string">Closed</attribute>
                     </xpath>
-                    
+
                     <xpath expr="/search//field[@name='origin']" position="before">
-                    	<field name="picking_id" />
-                    	<field name="reason_type_id" widget="selection" domain="[('outgoing_ok', '=', True)]" />
-                    </xpath>
-                    
-					<xpath expr="/search/group/field[@name='product_id']" position="after">
-					    <newline />
-					    <field name="order_category" />
-						<field name="state" />
-					</xpath>
-                            
+                        <field name="picking_id" />
+                        <field name="reason_type_id" widget="selection" domain="[('outgoing_ok', '=', True)]" />
+                    </xpath>
+
+                    <xpath expr="/search/group/field[@name='product_id']" position="after">
+                        <newline />
+                        <field name="order_category" />
+                        <field name="state" />
+                    </xpath>
+
                     <xpath expr="/search//filter[@string='Customer']" position="after">
                         <separator orientation="vertical" />
                         <filter string="Reason Type" icon="terp-purchase" domain="[]" context="{'group_by':'reason_type_id'}"/>
-        	        </xpath>
-        	        
-        	        <xpath expr="/search/group[@string='Extended Filters...']/field[@name='tracking_id']" position="replace" />
-        		</data>
+                    </xpath>
+
+                    <xpath expr="/search/group[@string='Extended Filters...']/field[@name='tracking_id']" position="replace" />
+                </data>
             </field>
         </record>
 
 
-	<record id="inherit_view_move_tree_reception_picking_board" model="ir.ui.view">
-		<field name="name">inherit.view.move.tree.reception.picking.board</field>
-		<field name="model">stock.move</field>
-		<field name="type">tree</field>
+    <record id="inherit_view_move_tree_reception_picking_board" model="ir.ui.view">
+        <field name="name">inherit.view.move.tree.reception.picking.board</field>
+        <field name="model">stock.move</field>
+        <field name="type">tree</field>
             <field name="priority">20</field>
-		<field name="inherit_id" ref="stock.view_move_tree_reception_picking_board" />
-		<field name="arch" type="xml">
-			<data>
-				<xpath expr="/tree/field[@name='product_uom']" position="after">
-					<field name="reason_type_id" />
-				</xpath>
-				
-				<button name="action_done" position="attributes">
-           			<attribute name="invisible">1</attribute>
-           		</button>
-			</data>
-		</field>
-	</record>
+        <field name="inherit_id" ref="stock.view_move_tree_reception_picking_board" />
+        <field name="arch" type="xml">
+            <data>
+                <xpath expr="/tree/field[@name='product_uom']" position="after">
+                    <field name="reason_type_id" />
+                </xpath>
+
+                <button name="action_done" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </button>
+            </data>
+        </field>
+    </record>
 
         <!-- id: inherit_view_picking_in_form, name: inherit.view.picking.in.form, inherit_id: stock.view_picking_in_form was here -->
         <!-- id: inherit_view_picking_form, name: inherit.view.picking.form, inherit_id: stock.view_picking_form was here -->
         <!-- id: inherit_view_picking_out_form, name: inherit.view.picking.out.form, inherit_id: stock.view_picking_out_form was here -->
 
         <record id="stock.view_picking_in_search" model="ir.ui.view">
-			<field name="name">unifield.stock.picking.in.search</field>
-			<field name="model">stock.picking</field>
-			<field name="type">search</field>
+            <field name="name">unifield.stock.picking.in.search</field>
+            <field name="model">stock.picking</field>
+            <field name="type">search</field>
             <field name="priority">24</field>
-			<field name="arch" type="xml">
-				<search string="Incoming Shipments">
+            <field name="arch" type="xml">
+                <search string="Incoming Shipments">
                     <group col="8" colspan="4">
+                        <filter icon="terp-document-new" name="draft" string="Draft"  domain="[('state', '=', 'draft')]" />
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed"  domain="[('state', '=', 'confirmed')]" />
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned','shipped','updated'))]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
+                        <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
                         <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" />
                         <separator orientation="vertical"/>
@@ -243,10 +246,10 @@
                         <filter string="Reason type" icon="terp-purchase" domain="[]" context="{'group_by': 'reason_type_id'}" />
                     </group>
                 </search>
-			</field>
-		</record>
-		
-		<record id="stock.view_picking_in_tree" model="ir.ui.view">
+            </field>
+        </record>
+
+        <record id="stock.view_picking_in_tree" model="ir.ui.view">
             <field name="name">unifield.stock.picking.in.tree</field>
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
@@ -269,13 +272,13 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="stock.action_picking_tree4" model="ir.actions.act_window">
             <field name="context">{'contact_display': 'partner_address',
                                    'subtype': 'in',
                                    'picking_type': 'incoming_shipment',
                                    'search_default_available':1}</field>
         </record>
-	</data>
+    </data>
 </openerp>
 

=== modified file 'bin/addons/res_currency_functional/res_currency_functional_view.xml'
--- bin/addons/res_currency_functional/res_currency_functional_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/res_currency_functional/res_currency_functional_view.xml	2019-07-30 10:05:10 +0000
@@ -6,50 +6,21 @@
             <field name="name">res.currency_functional.tree</field>
             <field name="model">res.currency</field>
             <field name="type">tree</field>
-            <field name="inherit_id" ref="base.view_currency_tree"/>
-            <field name="arch" type="xml">
-                <tree string="Currencies" position="replace">
-                    <tree string="Currencies">
-	                    <field name="name"/>
-                        <field name="currency_name"/>
-                        <field name="rate"/>
-                        <field name="date"/>
-	                    <field name="rounding"/>
-                        <field name="active"/>
-	                </tree>
-	            </tree>
-            </field>
-        </record>
-        
-        <record id="view_currency_functional_form" model="ir.ui.view">
-            <field name="name">res.currency_functional.form</field>
-            <field name="model">res.currency</field>
-            <field name="type">form</field>
-            <field name="priority">20</field>
-            <field name="inherit_id" ref="base.view_currency_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <field name="company_id" position="replace">
-                        <field name="currency_name"/>
-                    </field>
-                    <field name="base" position="replace">
-                    </field>
-                    <form string="Rates" position="replace">
-                        <form string="Rates">
-                            <field name="name"/>
-                            <field name="rate"/>
-                        </form>
-                    </form>
-                    <tree string="Rates"  position="replace">
-                        <tree string="Rates">
-                            <field name="name"/>
-                            <field name="rate"/>
-                        </tree>
-                    </tree>
-                </data>
-            </field>
-        </record>
-        
+            <field name="inherit_id" eval="False" />
+            <field name="priority" eval="15" />
+            <field name="arch" type="xml">
+                <tree string="Currencies">
+                    <field name="name"/>
+                    <field name="currency_name"/>
+                    <field name="rate"/>
+                    <field name="date"/>
+                    <field name="rounding"/>
+                    <field name="active"/>
+                </tree>
+            </field>
+        </record>
+
+
          <record id="view_currency_functional_search" model="ir.ui.view">
             <field name="name">res.currency_functional.search</field>
             <field name="model">res.currency</field>
@@ -58,8 +29,9 @@
                 <search string="Currencies">
                     <group>
                         <filter name="active" icon="terp-check" string="Active" domain="[('active','=', True)]" />
-	                    <separator orientation="vertical"/>
-	                    <field name="name"/>
+                        <filter name="inactive" icon="gtk-dialog-error" string="Inactive" domain="[('active','=', False)]" />
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
                     </group>
                 </search>
             </field>

=== modified file 'bin/addons/return_claim/return_claim_view.xml'
--- bin/addons/return_claim/return_claim_view.xml	2017-12-01 15:24:26 +0000
+++ bin/addons/return_claim/return_claim_view.xml	2019-07-30 10:05:10 +0000
@@ -205,8 +205,6 @@
                         <filter icon="terp-personal" name="customer" string="Customer" domain="[('type_return_claim','=', 'customer')]" separator="1" />
                         <filter icon="terp-personal" name="transport" string="Transport" domain="[('type_return_claim','=','transport')]" />
                         <separator orientation="vertical" />
-                        <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="[]" context="{'active_test': False}" separator="1" />
-                        <separator orientation="vertical" />
                         <field name="name" />
                         <field name="type_return_claim" />
                         <newline />

=== modified file 'bin/addons/sale/report/sale_report_view.xml'
--- bin/addons/sale/report/sale_report_view.xml	2017-06-14 13:55:43 +0000
+++ bin/addons/sale/report/sale_report_view.xml	2019-07-30 10:05:10 +0000
@@ -59,16 +59,16 @@
                         domain="[('invoiced','=', False)]" />
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-year" string="  Year  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                        domain="['&amp;', ('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Field order created in current year"/>
                     <filter icon="terp-go-month" string="   Month   "
                         name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        domain="['&amp;', ('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Field order created in current month"/>
                     <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                         domain="['&amp;', ('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Field order created in last month"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"

=== modified file 'bin/addons/sale/sale_view.xml'
--- bin/addons/sale/sale_view.xml	2019-07-22 12:08:20 +0000
+++ bin/addons/sale/sale_view.xml	2019-07-30 10:05:10 +0000
@@ -447,10 +447,11 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <filter icon="terp-document-new" string="Draft" domain="[('state','in',['draft','draft_p'])]" help="Field Order that haven't yet been confirmed" />
-                    <filter icon="terp-camera_test" string="Validated" domain="[('state','in',['validated','validated_p'])]" help="Field Order validated"/>
+                    <filter icon="terp-check" string="Validated" domain="[('state','in',['validated','validated_p'])]" help="Field Order validated"/>
                     <filter icon="gtk-paste-v" name="sourced" string="Sourced" domain="[('state','in',['sourced','sourced_p'])]" separator="1" />
-                    <filter icon="terp-check" string="Confirmed" domain="[('state','in',('confirmed','confirmed_p'))]"/>
+                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('confirmed','confirmed_p'))]"/>
                     <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]"/>
+                    <filter icon="gtk-cancel" name="cancelled" string="Cancelled" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
 
@@ -657,7 +658,7 @@
             <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')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="['&amp;', ('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
@@ -1073,7 +1074,7 @@
             <field name="arch" type="xml">
                 <search string="Sourcing progress">
                     <filter string="Done" name="done" domain="[('end_date', '!=', False)]" icon="terp-check" />
-                    <filter string="In Progress" name="progress" domain="[('end_date', '=', False), ('start_date', '!=', False)]" icon="gtk-execute" />
+                    <filter string="In Progress" name="progress" domain="['&amp;', ('end_date', '=', False), ('start_date', '!=', False)]" icon="gtk-execute" />
                     <field name="order_id" context="{'procurement_order': True, 'active_test': False}"
                            domain="[('state', '!=', 'draft'), '|', ('procurement_request', '=', True), ('split_type_sale_order', '=', 'original_sale_order')]"/>
                     <field name="start_date" />

=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2019-06-17 14:48:35 +0000
+++ bin/addons/stock/stock_view.xml	2019-07-30 10:05:10 +0000
@@ -1362,9 +1362,11 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group col="8" colspan="4">
+                        <filter icon="terp-document-new" name="draft" string="Draft"  domain="[('state', '=', 'draft')]" />
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
-                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Internal Moves already processed"/>
+                        <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
                         <separator orientation="vertical"/>
                         <filter icon="gtk-execute" name="sysint" string="System INT" domain="[('subtype', '!=', 'sysint')]" help="System internal moves"/>
                         <separator orientation="vertical"/>
@@ -1543,7 +1545,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="14" colspan="4">
-                        <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"/>
+                        <filter icon="terp-go-today" string="Today" domain="['&amp;', ('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"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
@@ -1738,7 +1740,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <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"/>
+                        <filter icon="terp-go-today" string="Today" domain="['&amp;', ('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"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
@@ -1774,7 +1776,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <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"/>
+                        <filter icon="terp-go-today" string="Today" domain="['&amp;', ('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"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" 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"/>

=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2019-07-25 13:39:42 +0000
+++ bin/addons/stock_override/stock_view.xml	2019-07-30 10:05:10 +0000
@@ -785,7 +785,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="14" colspan="4">
-                        <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"/>
+                        <filter icon="terp-go-today" string="Today" domain="['&amp;', ('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"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>

=== modified file 'bin/addons/supplier_catalogue/product_view.xml'
--- bin/addons/supplier_catalogue/product_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/supplier_catalogue/product_view.xml	2019-07-30 10:05:10 +0000
@@ -146,7 +146,7 @@
         	<field name="model">res.currency</field>
         	<field name="type">form</field>
             <field name="priority">25</field>
-        	<field name="inherit_id" ref="base.view_currency_form" />
+        	<field name="inherit_id" ref="base.view_currency_functional_form" />
         	<field name="arch" type="xml">
         		<data>
         			<xpath expr="/form//group[3]" position="attributes">

=== modified file 'bin/addons/supplier_catalogue/supplier_catalogue_view.xml'
--- bin/addons/supplier_catalogue/supplier_catalogue_view.xml	2018-09-13 08:44:17 +0000
+++ bin/addons/supplier_catalogue/supplier_catalogue_view.xml	2019-07-30 10:05:10 +0000
@@ -13,7 +13,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Supplier catalogues">
-                    <filter name="active" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
+                    <filter name="inactive" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
                     <field name="partner_id" />
                     <field name="name" />
                     <field name="period_from" />

=== modified file 'bin/addons/tender_flow/report/purchase_report_view.xml'
--- bin/addons/tender_flow/report/purchase_report_view.xml	2017-05-10 12:47:14 +0000
+++ bin/addons/tender_flow/report/purchase_report_view.xml	2019-07-30 10:05:10 +0000
@@ -52,16 +52,16 @@
                         domain="[('invoiced','=', False)]" />
                 <separator orientation="vertical"/>
                 <filter icon="terp-go-year" string="  Year  "
-                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                    domain="['&amp;', ('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                     help="Order in current year"/>
                 <filter icon="terp-go-month" string="   Month   "
                         name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        domain="['&amp;', ('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Order in  current month"/>
                 <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                         domain="['&amp;', ('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Order in last month"/>
                 <separator orientation="vertical"/>
                 <field name="order_name" />

=== modified file 'bin/addons/useability_dashboard_and_menu/menu/partner_menu.xml'
--- bin/addons/useability_dashboard_and_menu/menu/partner_menu.xml	2013-02-07 15:27:53 +0000
+++ bin/addons/useability_dashboard_and_menu/menu/partner_menu.xml	2019-07-30 10:05:10 +0000
@@ -53,7 +53,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="base.view_res_partner_filter"/>
-            <field name="context">{"search_default_manufacturer":1, 'show_button_show_inactive':1}</field>
+            <field name="context">{"search_default_manufacturer":1, 'show_button_show_inactive':1, 'search_default_active': 1, 'active_test': 0}</field>
             <field name="help">You see here Other/Manufacturer who can be both Customer and Supplier.</field>
         </record>
         
@@ -65,18 +65,6 @@
         sequence="13"
         />
 
-        <!-- The 3 records below enable the user to see the button "Show inactive" -->
-        <record id="base.action_partner_supplier_form" model="ir.actions.act_window">
-            <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1, 'show_button_show_inactive':1}</field>
-        </record>
-
-        <record id="base.action_partner_customer_form" model="ir.actions.act_window">
-            <field name="context">{'default_customer':1, 'search_default_customer':1, 'show_button_show_inactive':1}</field>
-        </record>
-
-        <record id="base.action_partner_form" model="ir.actions.act_window">
-            <field name="context">{"search_default_customer":1, 'show_button_show_inactive':1}</field>
-        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>