Unifield Server

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

  1. US-1019-us15
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5552
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-1019-us15
Merge into: lp:unifield-server
Diff against target: 1898 lines (+326/-400) (has conflicts)
48 files modified
bin/addons/account/account_view.xml (+32/-16)
bin/addons/account/report/account_entries_report_view.xml (+1/-1)
bin/addons/account_mcdb/account_view.xml (+2/-1)
bin/addons/account_override/account.py (+1/-0)
bin/addons/account_override/account_view.xml (+0/-17)
bin/addons/account_period_closing_level/account_period_closing_level_view.xml (+18/-12)
bin/addons/analytic_override/analytic_account.py (+1/-0)
bin/addons/base/ir/ir.xml (+3/-2)
bin/addons/base/res/partner/partner_view.xml (+3/-3)
bin/addons/base/res/res_currency_view.xml (+13/-23)
bin/addons/base/res/res_request_view.xml (+9/-6)
bin/addons/consumption_calculation/consumption_view.xml (+2/-0)
bin/addons/finance/account_view.xml (+0/-35)
bin/addons/hr/hr_view.xml (+12/-7)
bin/addons/kit/kit_view.xml (+4/-5)
bin/addons/msf_budget/msf_budget_view.xml (+1/-0)
bin/addons/msf_currency_revaluation/res_currency_view.xml (+1/-1)
bin/addons/msf_doc_import/data/msf_doc_import_data.xml (+0/-28)
bin/addons/msf_doc_import/purchase_order.py (+0/-5)
bin/addons/msf_homere_interface/hr_payroll_view.xml (+3/-3)
bin/addons/msf_homere_interface/hr_view.xml (+0/-34)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+7/-0)
bin/addons/msf_partner/partner.py (+2/-37)
bin/addons/msf_partner/partner_view.xml (+3/-1)
bin/addons/msf_profile/data.xml (+0/-3)
bin/addons/msf_profile/i18n/fr_MF.po (+53/-14)
bin/addons/msf_profile/msf_profile.py (+1/-1)
bin/addons/msf_profile/user_access_configurator_view.xml (+4/-2)
bin/addons/out_step/out_step_view.xml (+2/-3)
bin/addons/procurement/procurement_view.xml (+2/-2)
bin/addons/procurement_request/procurement_request_view.xml (+4/-2)
bin/addons/product/product_view.xml (+3/-0)
bin/addons/product_attributes/product_attributes.py (+15/-5)
bin/addons/product_attributes/product_attributes_view.xml (+15/-1)
bin/addons/product_list/product_list_view.xml (+1/-0)
bin/addons/product_nomenclature/product_nomenclature_view.xml (+0/-13)
bin/addons/purchase/purchase_view.xml (+2/-4)
bin/addons/purchase/report/purchase_report_view.xml (+4/-4)
bin/addons/reason_types_moves/stock_view.xml (+78/-76)
bin/addons/res_currency_functional/res_currency_functional_view.xml (+2/-1)
bin/addons/return_claim/return_claim_view.xml (+0/-2)
bin/addons/sale/report/sale_report_view.xml (+3/-3)
bin/addons/sale/sale_view.xml (+5/-4)
bin/addons/stock/stock_view.xml (+6/-4)
bin/addons/stock_override/stock_view.xml (+1/-1)
bin/addons/supplier_catalogue/supplier_catalogue_view.xml (+2/-1)
bin/addons/tender_flow/report/purchase_report_view.xml (+3/-3)
bin/addons/useability_dashboard_and_menu/menu/partner_menu.xml (+2/-14)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
Text conflict in bin/addons/product_attributes/product_attributes.py
Text conflict in bin/addons/product_attributes/product_attributes_view.xml
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-1019-us15
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+374915@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account/account_view.xml'
2--- bin/addons/account/account_view.xml 2019-01-31 14:39:54 +0000
3+++ bin/addons/account/account_view.xml 2019-10-30 13:23:31 +0000
4@@ -135,7 +135,8 @@
5 <field name="arch" type="xml">
6 <search string="Search Period">
7 <group>
8- <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
9+ <filter string="To Close" name="draft" domain="[('state','in',['created', 'draft'])]" icon="terp-camera_test"/>
10+ <filter string="Closed" name="close" domain="[('state','not in',['created', 'draft'])]" icon="terp-dialog-close"/>
11 <separator orientation="vertical"/>
12 <field name="name"/>
13 <field name="code"/>
14@@ -205,21 +206,33 @@
15 <field name="type">search</field>
16 <field name="arch" type="xml">
17 <search string="Accounts">
18- <group col="10" colspan="4">
19- <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
20- <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
21- <separator orientation="vertical"/>
22- <field name="code"/>
23- <field name="name"/>
24+ <group col="12" colspan="4">
25+ <filter name="active" string="Active" domain="[('filter_active', '=', True)]" icon="terp-check" />
26+ <filter name="inactive" string="Inactive" domain="[('filter_active', '=', False)]" icon="gtk-dialog-error"/>
27+ <separator orientation="vertical"/>
28+ <filter name="receivable" string="Receivable" domain="[('type','=','receivable')]" icon="terp-sale"/>
29+ <filter name="payable" string="Payable" domain="[('type','=','payable')]" icon="terp-purchase"/>
30+ <filter name="accrual_account" string="Accrual" domain="[('accrual_account','=',True)]" />
31+ <filter name="expense_account" string="Expense" domain="[('user_type.code','=', 'expense')]" icon="terp-stock_symbol-selection"/>
32+ <filter name="income_account" string="Income" domain="[('user_type.code','=', 'income')]" icon="gtk-go-forward"/>
33+ <separator orientation="vertical"/>
34+ <newline/>
35+
36+ <group col="6" colspan="4">
37+ <field name="code"/>
38+ <field name="name"/>
39+ <field name="is_not_hq_correctible"/>
40+ </group>
41+ <newline/>
42+
43 <field name="user_type"/>
44 <field name="type"/>
45+ <field name="type_for_register"/>
46+
47 </group>
48 <newline/>
49 <group expand="0" string="Group By...">
50- <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
51- <separator orientation="vertical"/>
52- <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
53- <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
54+ <filter string="Internal Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
55 </group>
56 </search>
57 </field>
58@@ -1231,14 +1244,14 @@
59 <filter
60 icon="terp-dolar_ok!"
61 string="Unreconciled"
62- domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
63+ domain="['&amp;', ('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
64 name="unreconciled"/>
65 <separator orientation="vertical"/>
66 <field name="move_id" select="1" string="Number (Move)"/>
67 <field name="date" select='1'/>
68 <field name="account_id" select='1'/>
69 <field name="partner_id" select='1'>
70- <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)]"/>
71+ <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)]"/>
72 </field>
73 </group>
74 <newline/>
75@@ -1888,8 +1901,9 @@
76 <field name="arch" type="xml">
77 <search string="Entry Subscription">
78 <group col="8" colspan="4">
79- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
80- <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
81+ <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
82+ <filter icon="terp-camera_test" string="Running" name="running" domain="[('state','=','running')]" help="Running Subscription"/>
83+ <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" />
84 <separator orientation="vertical"/>
85 <field name="name"/>
86 <field name="model_id"/>
87@@ -1950,6 +1964,7 @@
88 <field name="view_type">form</field>
89 <field name="view_mode">tree,form</field>
90 <field name="search_view_id" ref="view_subscription_search"/>
91+ <field name="context">{'search_default_draft': 1, 'search_default_running': 1}</field>
92 <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>
93 </record>
94 <menuitem
95@@ -1963,7 +1978,8 @@
96 <field name="res_model">account.subscription</field>
97 <field name="view_type">form</field>
98 <field name="view_mode">tree,form</field>
99- <field name="domain">[('state','=','running')]</field>
100+ <field name="domain">[('state', '=', 'running')]</field>
101+ <field name="context">{}</field>
102 <field name="filter" eval="True"/>
103 </record>
104
105
106=== modified file 'bin/addons/account/report/account_entries_report_view.xml'
107--- bin/addons/account/report/account_entries_report_view.xml 2017-05-10 12:47:14 +0000
108+++ bin/addons/account/report/account_entries_report_view.xml 2019-10-30 13:23:31 +0000
109@@ -82,7 +82,7 @@
110 <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
111 <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
112 <separator orientation="vertical"/>
113- <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
114+ <filter string="Unreconciled" icon="terp-dolar_ok!" domain="['&amp;', ('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
115 <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
116 <separator orientation="vertical"/>
117 <field name="account_id"/>
118
119=== modified file 'bin/addons/account_mcdb/account_view.xml'
120--- bin/addons/account_mcdb/account_view.xml 2019-08-02 08:50:58 +0000
121+++ bin/addons/account_mcdb/account_view.xml 2019-10-30 13:23:31 +0000
122@@ -166,8 +166,9 @@
123 <filter
124 icon="terp-dolar_ok!"
125 string="Unreconciled"
126- domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
127+ domain="['&amp;', ('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
128 name="unreconciled"/>
129+ <separator orientation="vertical"/>
130 <filter icon="terp-personal" string="Employee" domain="[('employee_id', '!=', False)]" context="{'identification': 1}" />
131 <field name="document_date"/>
132 <field name="date" select='1'/>
133
134=== modified file 'bin/addons/account_override/account.py'
135--- bin/addons/account_override/account.py 2019-09-27 08:59:21 +0000
136+++ bin/addons/account_override/account.py 2019-10-30 13:23:31 +0000
137@@ -66,6 +66,7 @@
138 cmp_date = context.get('date')
139 for x in args:
140 if x[0] == 'filter_active' and x[2] == True:
141+ arg.append('&')
142 arg.append(('activation_date', '<=', cmp_date))
143 arg.append('|')
144 arg.append(('inactivation_date', '>', cmp_date))
145
146=== modified file 'bin/addons/account_override/account_view.xml'
147--- bin/addons/account_override/account_view.xml 2019-05-06 12:42:32 +0000
148+++ bin/addons/account_override/account_view.xml 2019-10-30 13:23:31 +0000
149@@ -121,23 +121,6 @@
150 </field>
151 </record>
152
153- <record model="ir.ui.view" id="view_account_activable_search">
154- <field name="name">account.account_activable.search</field>
155- <field name="model">account.account</field>
156- <field name="type">search</field>
157- <field name="field_parent">child_id</field>
158- <field name="inherit_id" ref="account.view_account_search"/>
159- <field name="arch" type="xml">
160- <data>
161- <group string="Group By..." position="replace">
162- <group expand="0" string="Group By...">
163- <filter string="Internal Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
164- </group>
165- </group>
166- </data>
167- </field>
168- </record>
169-
170 <!-- Tree view for default tree view of accounts -->
171 <record id="account.view_account_list" model="ir.ui.view">
172 <field name="name">account.account_activable.list</field>
173
174=== modified file 'bin/addons/account_period_closing_level/account_period_closing_level_view.xml'
175--- bin/addons/account_period_closing_level/account_period_closing_level_view.xml 2017-10-04 05:23:42 +0000
176+++ bin/addons/account_period_closing_level/account_period_closing_level_view.xml 2019-10-30 13:23:31 +0000
177@@ -182,18 +182,6 @@
178 </field>
179 </record>
180
181- <record id="view_account_period_closing_level_search" model="ir.ui.view">
182- <field name="name">account.period_closing_level.search</field>
183- <field name="model">account.period</field>
184- <field name="type">search</field>
185- <field name="inherit_id" ref="account.view_account_period_search"/>
186- <field name="arch" type="xml">
187- <filter name="draft" position="replace">
188- <filter string="To Close" name="draft" domain="[('state','!=','done')]" icon="terp-dialog-close"/>
189- </filter>
190- </field>
191- </record>
192-
193 <record id="view_account_period_closing_level_tree" model="ir.ui.view">
194 <field name="name">account.period_closing_level.tree</field>
195 <field name="model">account.period</field>
196@@ -216,10 +204,28 @@
197 </field>
198 </record>
199
200+ <record id="account_period_closing_level_search" model="ir.ui.view">
201+ <field name="name">account.period.search</field>
202+ <field name="model">account.period</field>
203+ <field name="type">search</field>
204+ <field name="priority" eval="50" />
205+ <field name="arch" type="xml">
206+ <search string="Search Period">
207+ <group>
208+ <filter string="To Close" name="draft" domain="[('state','not in',['created','done'])]" icon="terp-camera_test"/>
209+ <separator orientation="vertical"/>
210+ <field name="name"/>
211+ <field name="code"/>
212+ </group>
213+ </search>
214+ </field>
215+ </record>
216+
217 <record id="action_account_period_closing_level_tree" model="ir.actions.act_window">
218 <field name="name">Close a Period</field>
219 <field name="res_model">account.period</field>
220 <field name="inherit_id" ref="account.action_account_period_tree"/>
221+ <field name="search_view_id" ref="account_period_closing_level_search" />
222 <field name="domain">[('state','!=','created'), ('is_system', '=', False)]</field>
223 <field name="context">{'search_default_draft': 1}</field>
224 <field name="help">A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation.</field>
225
226=== modified file 'bin/addons/analytic_override/analytic_account.py'
227--- bin/addons/analytic_override/analytic_account.py 2019-08-21 08:26:20 +0000
228+++ bin/addons/analytic_override/analytic_account.py 2019-10-30 13:23:31 +0000
229@@ -59,6 +59,7 @@
230 cmp_date = context.get('date')
231 for x in args:
232 if x[0] == 'filter_active' and x[2] == True:
233+ arg.append('&')
234 arg.append(('date_start', '<=', cmp_date))
235 arg.append('|')
236 arg.append(('date', '>', cmp_date))
237
238=== modified file 'bin/addons/base/ir/ir.xml'
239--- bin/addons/base/ir/ir.xml 2019-04-04 14:25:27 +0000
240+++ bin/addons/base/ir/ir.xml 2019-10-30 13:23:31 +0000
241@@ -726,6 +726,7 @@
242 <field name="view_type">form</field>
243 <field name="view_id" ref="view_users_tree"/>
244 <field name="search_view_id" ref="view_users_search"/>
245+ <field name="context">{'default_search_active': 1, 'active_test': 0}</field>
246 <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>
247 </record>
248 <record id="action_res_users_view1" model="ir.actions.act_window.view">
249@@ -1690,7 +1691,7 @@
250 <group>
251 <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
252 <separator orientation="vertical"/>
253- <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
254+ <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)]"/>
255 <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
256 <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
257 <separator orientation="vertical"/>
258@@ -1783,7 +1784,7 @@
259 <group>
260 <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
261 <separator orientation="vertical"/>
262- <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
263+ <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)]"/>
264 <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
265 <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
266 <separator orientation="vertical"/>
267
268=== modified file 'bin/addons/base/res/partner/partner_view.xml'
269--- bin/addons/base/res/partner/partner_view.xml 2019-02-05 15:23:11 +0000
270+++ bin/addons/base/res/partner/partner_view.xml 2019-10-30 13:23:31 +0000
271@@ -358,7 +358,7 @@
272 <field name="type">ir.actions.act_window</field>
273 <field name="res_model">res.partner</field>
274 <field name="view_type">form</field>
275- <field name="context">{"search_default_customer":1}</field>
276+ <field name="context">{'search_default_customer':1, 'show_button_show_inactive': 1, 'search_default_active': 1, 'active_test': 0}</field>
277 <field name="search_view_id" ref="view_res_partner_filter"/>
278 <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>
279 </record>
280@@ -386,7 +386,7 @@
281 <field name="res_model">res.partner</field>
282 <field name="view_type">form</field>
283 <field name="domain">[('customer','=',1)]</field>
284- <field name="context">{'default_customer':1, 'search_default_customer':1}</field>
285+ <field name="context">{'default_customer':1, 'search_default_customer':1, 'search_default_active': 1, 'active_test': 0, 'show_button_show_inactive': 1}</field>
286 <field name="filter" eval="True"/>
287 </record>
288
289@@ -396,7 +396,7 @@
290 <field name="res_model">res.partner</field>
291 <field name="view_type">form</field>
292 <field name="domain">[]</field>
293- <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1}</field>
294+ <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>
295 <field name="filter" eval="True"/>
296 <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>
297 </record>
298
299=== modified file 'bin/addons/base/res/res_currency_view.xml'
300--- bin/addons/base/res/res_currency_view.xml 2019-07-31 12:02:50 +0000
301+++ bin/addons/base/res/res_currency_view.xml 2019-10-30 13:23:31 +0000
302@@ -24,40 +24,30 @@
303 <field name="name">res.currency.form</field>
304 <field name="model">res.currency</field>
305 <field name="type">form</field>
306+ <field name="priority">20</field>
307 <field name="arch" type="xml">
308- <form string="Currency" hide_duplicate_button="1">
309- <group col="6" colspan="6">
310- <field name="name" select="1"/>
311- <field name="rate"/>
312- <field name="company_id" select="2" groups="base.group_multi_company" />
313- <field name="symbol"/>
314- </group>
315-
316- <group col="2" colspan="2">
317- <separator string="Price Accuracy" colspan="2"/>
318- <field name="rounding"/>
319- <field name="accuracy"/>
320- </group>
321-
322- <group col="2" colspan="2">
323- <separator string="Miscelleanous" colspan="2"/>
324- <field name="base"/>
325- <field name="active" select="1"/>
326- </group>
327-
328- <field colspan="4" mode="tree,form" name="rate_ids" nolabel="1" attrs="{'readonly':[('base','=',True)]}">
329+ <data>
330+ <field name="company_id" position="replace">
331+ <field name="currency_name"/>
332+ </field>
333+ <field name="base" position="replace">
334+ </field>
335+ <form string="Rates" position="replace">
336 <form string="Rates">
337 <field name="name"/>
338 <field name="rate"/>
339 </form>
340+ </form>
341+ <tree string="Rates" position="replace">
342 <tree string="Rates">
343 <field name="name"/>
344 <field name="rate"/>
345 </tree>
346- </field>
347- </form>
348+ </tree>
349+ </data>
350 </field>
351 </record>
352+
353 <record id="action_currency_form" model="ir.actions.act_window">
354 <field name="name">Currencies</field>
355 <field name="res_model">res.currency</field>
356
357=== modified file 'bin/addons/base/res/res_request_view.xml'
358--- bin/addons/base/res/res_request_view.xml 2018-12-03 10:43:35 +0000
359+++ bin/addons/base/res/res_request_view.xml 2019-10-30 13:23:31 +0000
360@@ -79,19 +79,22 @@
361 <field name="type">search</field>
362 <field name="arch" type="xml">
363 <search string="Requests">
364- <filter string="Current" icon="terp-camera_test" domain="['|',('state','=','draft'),('state','=','active')]"
365- help="Draft and Active"/>
366- <separator orientation="vertical"/>
367+ <filter string="Draft" icon="terp-document-new" name="draft" domain="[('state', '=', 'draft')]" />
368+ <filter string="Current" icon="terp-camera_test" domain="[('state','=','active')]" />
369 <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state','=','waiting')]"/>
370+ <filter string="Closed" icon="gtk-close" domain="[('state','=','closed')]"/>
371+ <separator orientation="vertical"/>
372+ <filter name="active" string="Active" domain="[('active', '=', True)]" icon="terp-check" />
373+ <filter name="inactive" string="Inactive" domain="[('active', '=', False)]" icon="gtk-dialog-error"/>
374 <separator orientation="vertical"/>
375 <field name="act_from"/>
376 <field name="act_to" select="1"/>
377 <field name="name"/>
378 <field name="state"/>
379- <newline/>
380- <group expand="0" string="Group By" colspan="4">
381+ <newline/>
382+ <group expand="0" string="Group By" colspan="4">
383 <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
384- </group>
385+ </group>
386 </search>
387 </field>
388 </record>
389
390=== modified file 'bin/addons/consumption_calculation/consumption_view.xml'
391--- bin/addons/consumption_calculation/consumption_view.xml 2019-04-04 14:25:27 +0000
392+++ bin/addons/consumption_calculation/consumption_view.xml 2019-10-30 13:23:31 +0000
393@@ -134,7 +134,9 @@
394 <field name="arch" type="xml">
395 <search string="Real consumption reports">
396 <group col="10" colspan="4">
397+ <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state', '=', 'draft')]" />
398 <filter icon="terp-check" string="Closed" domain="[('created_ok','=',True)]"/>
399+ <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
400 <separator orientation="vertical"/>
401 <field name="name"/>
402 <field name="cons_location_id"/>
403
404=== modified file 'bin/addons/finance/account_view.xml'
405--- bin/addons/finance/account_view.xml 2017-10-31 08:06:46 +0000
406+++ bin/addons/finance/account_view.xml 2019-10-30 13:23:31 +0000
407@@ -21,41 +21,6 @@
408 </field>
409 </record>
410
411- <record id="inherit_view_account_search_pma" model="ir.ui.view">
412- <field name="name">inherit.view.account.search.pma</field>
413- <field name="model">account.account</field>
414- <field name="type">search</field>
415- <field name="inherit_id" ref="account.view_account_search"/>
416- <field name="priority">25</field>
417- <field name="arch" type="xml">
418- <xpath expr="/search/group[1]" position="replace">
419- <group col="12" colspan="4">
420-
421- <filter name="active" icon="terp-check" string="Active" domain="[('filter_active', '=', True)]" />
422- <filter name="inactive" icon="gtk-dialog-error" string="Inactive" domain="[('filter_active', '=', False)]"/>
423- <separator orientation="vertical"/>
424- <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
425- <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
426- <filter name="accrual_account" string="Accrual Account" domain="[('accrual_account','=',True)]"/>
427- <separator orientation="vertical"/>
428- <newline/>
429-
430- <group col="6" colspan="4">
431- <field name="code"/>
432- <field name="name"/>
433- <field name="is_not_hq_correctible"/>
434- </group>
435- <newline/>
436-
437- <field name="user_type"/>
438- <field name="type"/>
439- <field name="type_for_register"/>
440-
441- </group>
442- </xpath>
443- </field>
444- </record>
445-
446 <!--
447 Journal Entries
448 -->
449
450=== modified file 'bin/addons/hr/hr_view.xml'
451--- bin/addons/hr/hr_view.xml 2018-08-21 19:39:57 +0000
452+++ bin/addons/hr/hr_view.xml 2019-10-30 13:23:31 +0000
453@@ -101,21 +101,26 @@
454 <field name="type">search</field>
455 <field name="arch" type="xml">
456 <search string="Employees">
457- <filter icon="terp-personal+" domain="[('active','=',True)]" name="active" string="Active" groups="base.group_extended"/>
458+ <filter icon="terp-personal+" domain="[('active','=',True)]" name="active" string="Active" />
459+ <filter icon="terp-personal-" domain="[('active','=',False)]" name="inactive" string="Inactive" />
460+ <separator orientation="vertical" />
461+ <filter icon="gtk-leave-fullscreen" domain="[('employee_type','=','local')]" name="employee_type_local" string="Local" />
462+ <filter icon="gtk-quit" domain="[('employee_type','=','ex')]" name="employee_type_expatriate" string="Expat'" />
463+
464 <separator orientation="vertical" />
465 <field name="name"/>
466 <field name="identification_id"/>
467- <field name="department_id" widget="selection">
468- <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
469- </field>
470 <field name="job_id"/>
471+ <newline/>
472+ <group>
473+ <field name="destination_id" domain="[('category','=','DEST'), ('type', '!=', 'view'), ('state', '=', 'open')]"/>
474+ <field name="cost_center_id" domain="[('category','=','OC'), ('type', '!=', 'view'), ('state', '=', 'open')]"/>
475+ <field name="funding_pool_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open')]"/>
476+ </group>
477 <newline />
478 <group expand="0" string="Group By...">
479- <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
480 <separator orientation="vertical" />
481- <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
482 <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
483- <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
484 </group>
485 </search>
486 </field>
487
488=== modified file 'bin/addons/kit/kit_view.xml'
489--- bin/addons/kit/kit_view.xml 2017-10-04 06:36:54 +0000
490+++ bin/addons/kit/kit_view.xml 2019-10-30 13:23:31 +0000
491@@ -140,10 +140,10 @@
492 <field name="arch" type="xml">
493 <search string="Search Theoretical Kit Composition">
494 <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state','=','draft')]" separator="1" />
495- <filter icon="terp-camera_test" name="completed" string="Completed" domain="[('state','=', 'completed')]" separator="1" />
496 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" />
497 <filter icon="gtk-cancel" name="cancel" string="Canceled" domain="[('state','=', 'cancel')]" separator="1" />
498 <separator orientation="vertical" />
499+ <filter icon="gtk-ok" name="active" string="Show Active" domain="[('active', '=', True)]" separator="1" />
500 <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="[('active', '=', False)]" separator="1" />
501 <separator orientation="vertical" />
502 <field name="composition_product_id" domain="[('type', '=', 'product'), ('subtype', '=', 'kit')]" select="1" />
503@@ -188,7 +188,6 @@
504 <search string="Search Real Kit Composition">
505 <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state','=','draft')]" separator="1" />
506 <filter icon="gtk-execute" name="in_production" string="In Production" domain="[('state','=', 'in_production')]" separator="1" />
507- <filter icon="terp-camera_test" name="completed" string="Completed" domain="[('state','=', 'completed')]" separator="1" />
508 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" />
509 <filter icon="gtk-cancel" name="cancel" string="Canceled" domain="[('state','=', 'cancel')]" separator="1" />
510 <separator orientation="vertical" />
511@@ -334,8 +333,8 @@
512 <field name="res_model">composition.kit</field>
513 <field name="view_type">form</field>
514 <field name="view_mode">tree,form</field>
515- <field name="domain">[('composition_type', '=', 'theoretical')]</field>
516- <field name="context">{'search_default_completed': True, 'composition_type':'theoretical'}</field>
517+ <field name="domain">['&amp;', ('composition_type', '=', 'theoretical'), ('active', 'in', ['t', 'f'])]</field>
518+ <field name="context">{'composition_type':'theoretical', 'search_default_active': 1}</field>
519 <field name="search_view_id" ref="view_composition_kit_theoretical_filter" />
520 </record>
521
522@@ -355,7 +354,7 @@
523 <field name="view_type">form</field>
524 <field name="view_mode">tree,form</field>
525 <field name="domain">[('composition_type', '=', 'real')]</field>
526- <field name="context">{'search_default_completed': True, 'composition_type':'real'}</field>
527+ <field name="context">{'composition_type':'real'}</field>
528 <field name="search_view_id" ref="view_composition_kit_real_filter" />
529 </record>
530
531
532=== modified file 'bin/addons/msf_budget/msf_budget_view.xml'
533--- bin/addons/msf_budget/msf_budget_view.xml 2017-06-13 15:20:13 +0000
534+++ bin/addons/msf_budget/msf_budget_view.xml 2019-10-30 13:23:31 +0000
535@@ -31,6 +31,7 @@
536 <group col="20" colspan="4">
537 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
538 <filter name="validated" string="Validated" icon="terp-camera_test" domain="[('state','=','valid')]" help="Validated Budgets" />
539+ <filter name="Done" string="Done" icon="terp-dialog-close" domain="[('state','=','done')]" />
540 <separator orientation="vertical"/>
541 <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"/>
542 <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"/>
543
544=== modified file 'bin/addons/msf_currency_revaluation/res_currency_view.xml'
545--- bin/addons/msf_currency_revaluation/res_currency_view.xml 2013-12-16 08:18:07 +0000
546+++ bin/addons/msf_currency_revaluation/res_currency_view.xml 2019-10-30 13:23:31 +0000
547@@ -6,7 +6,7 @@
548 <field name="name">res.currency.form</field>
549 <field name="model">res.currency</field>
550 <field name="type">form</field>
551- <field name="inherit_id" ref="base.view_currency_form"/>
552+ <field name="inherit_id" ref="base.view_currency_functional_form"/>
553 <field name="arch" type="xml">
554 <xpath expr="//form[@string='Rates']/field[@name='rate']" position="after">
555 <field name="currency_rate_type_id"/>
556
557=== modified file 'bin/addons/msf_doc_import/data/msf_doc_import_data.xml'
558--- bin/addons/msf_doc_import/data/msf_doc_import_data.xml 2014-10-28 13:29:46 +0000
559+++ bin/addons/msf_doc_import/data/msf_doc_import_data.xml 2019-10-30 13:23:31 +0000
560@@ -76,33 +76,5 @@
561 <field name="international_status" ref="product_attributes.int_5"/>
562 </record>
563
564- <!-- Partner to be defined -->
565- <record id="supplier_tbd" model="res.partner">
566- <field name="name">To be defined</field>
567- <field name="active" eval="False" />
568- </record>
569-
570- <!-- Partner address to be defined -->
571- <record id="address_tbd" model="res.partner.address">
572- <field name="type">default</field>
573- <field name="street">To be defined</field>
574- <field name="zip">To be defined</field>
575- <field name="city">To be defined</field>
576- <field name="partner_id" ref="supplier_tbd"/>
577- <field name="active" eval="False" />
578- </record>
579-
580- <!-- SupplierInfo to be defined -->
581- <record id="supplierinfo_tbd" model="product.supplierinfo">
582- <field name="name" ref="supplier_tbd"/>
583- <field name="product_id" ref="product_tbd"/>
584- <field name="active" eval="False" />
585- <!--
586- <field name="uom_id" ref="uom_tbd"/>
587- <field name="uom_po_id" ref="uom_tbd"/>
588- <field name="categ_id" ref="cat_tbd"/>
589- -->
590- </record>
591-
592 </data>
593 </openerp>
594
595=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
596--- bin/addons/msf_doc_import/purchase_order.py 2019-10-09 09:46:13 +0000
597+++ bin/addons/msf_doc_import/purchase_order.py 2019-10-30 13:23:31 +0000
598@@ -664,13 +664,8 @@
599 ids = [ids]
600 message = ''
601 plural = ''
602- obj_data = self.pool.get('ir.model.data')
603
604 for var in self.browse(cr, uid, ids, context=context):
605- # we check the supplier and the address
606- if var.partner_id.id == obj_data.get_object_reference(cr, uid, 'msf_doc_import', 'supplier_tbd')[1] \
607- or var.partner_address_id.id == obj_data.get_object_reference(cr, uid, 'msf_doc_import', 'address_tbd')[1]:
608- raise osv.except_osv(_('Warning !'), _("\n You can't have a supplier or an address 'To Be Defined', please select a consistent supplier."))
609 # we check the lines that need to be fixed
610 if var.order_line:
611 for var in var.order_line:
612
613=== modified file 'bin/addons/msf_homere_interface/hr_payroll_view.xml'
614--- bin/addons/msf_homere_interface/hr_payroll_view.xml 2018-10-31 15:29:09 +0000
615+++ bin/addons/msf_homere_interface/hr_payroll_view.xml 2019-10-30 13:23:31 +0000
616@@ -59,8 +59,8 @@
617 <field name="type">search</field>
618 <field name="arch" type="xml">
619 <search string="Search Journal Items">
620- <filter name="active" icon="terp-check" domain="[('analytic_state', '=', 'valid')]" string="Valid"/>
621- <filter name="inactive" icon="gtk-dialog-error" domain="[('analytic_state', '!=', 'valid')]" string="Invalid"/>
622+ <filter name="valid" icon="terp-check" domain="[('analytic_state', '=', 'valid')]" string="Valid"/>
623+ <filter name="invalid" icon="gtk-dialog-error" domain="[('analytic_state', '!=', 'valid')]" string="Invalid"/>
624 <separator orientation="vertical"/>
625 <field name="employee_id" select="1"/>
626 <field name="account_id" select="1"/>
627@@ -180,7 +180,7 @@
628 <field name="view_mode">tree,form</field>
629 <field name="view_id" ref="editable_view_employee_tree"/>
630 <field name="search_view_id" ref="view_employee_filter_2"/>
631- <field name="domain">[('employee_type', '=', 'local')]</field>
632+ <field name="domain">['&amp;', ('employee_type', '=', 'local'), ('active', 'in', ['t', 'f'])]</field>
633 </record>
634
635
636
637=== modified file 'bin/addons/msf_homere_interface/hr_view.xml'
638--- bin/addons/msf_homere_interface/hr_view.xml 2019-04-05 14:45:58 +0000
639+++ bin/addons/msf_homere_interface/hr_view.xml 2019-10-30 13:23:31 +0000
640@@ -154,40 +154,6 @@
641 </field>
642 </record>
643
644- <!--
645- Employee Search
646- -->
647- <record id="inherit_view_employee_filter" model="ir.ui.view">
648- <field name="name">inherit.view.employee.filter</field>
649- <field name="model">hr.employee</field>
650- <field name="type">search</field>
651- <field name="inherit_id" ref="hr.view_employee_filter"/>
652- <field name="arch" type="xml">
653- <data>
654- <xpath expr="/search/filter[@name='active']" position="after">
655- <separator orientation="vertical" />
656- <filter icon="gtk-leave-fullscreen" domain="[('employee_type','=','local')]" name="employee_type_local" string="Local" />
657- <filter icon="gtk-quit" domain="[('employee_type','=','ex')]" name="employee_type_expatriate" string="Expat'" />
658- </xpath>
659- <xpath expr="/search/field[@name='department_id']" position="replace">
660- </xpath>
661- <xpath expr="//filter[@string='Coach']" position="replace">
662- </xpath>
663- <xpath expr="//filter[@string='Department']" position="replace">
664- </xpath>
665- <xpath expr="//filter[@string='Company']" position="replace">
666- </xpath>
667- <xpath expr="//field[@name='job_id']" position="after">
668- <newline/>
669- <group>
670- <field name="destination_id" domain="[('category','=','DEST'), ('type', '!=', 'view'), ('state', '=', 'open')]"/>
671- <field name="cost_center_id" domain="[('category','=','OC'), ('type', '!=', 'view'), ('state', '=', 'open')]"/>
672- <field name="funding_pool_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open')]"/>
673- </group>
674- </xpath>
675- </data>
676- </field>
677- </record>
678
679 <record id="view_employee_filter_2" model="ir.ui.view">
680 <field name="name">view.employee.filter.2</field>
681
682=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
683--- bin/addons/msf_outgoing/msf_outgoing_view.xml 2019-10-04 12:57:28 +0000
684+++ bin/addons/msf_outgoing/msf_outgoing_view.xml 2019-10-30 13:23:31 +0000
685@@ -449,6 +449,7 @@
686 <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" />
687 <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" />
688 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" />
689+ <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
690 <separator orientation="vertical"/>
691 <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" />
692 <separator orientation="vertical"/>
693@@ -505,6 +506,7 @@
694 <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" />
695 <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" />
696 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" />
697+ <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
698 <separator orientation="vertical"/>
699 <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" />
700 <separator orientation="vertical"/>
701@@ -787,8 +789,11 @@
702 <field name="arch" type="xml">
703 <search string="Pre-Packing List">
704 <group col="8" colspan="4">
705+ <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state', '=', 'draft')]" />
706+ <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" />
707 <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
708 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Delivery orders already processed"/>
709+ <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
710 <separator orientation="vertical"/>
711 <field name="name"/>
712 <field name="partner_id2" />
713@@ -1465,9 +1470,11 @@
714 <search string="Shipment">
715 <group col="8" colspan="4">
716 <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state','=','draft')]" />
717+ <filter icon="terp-accessories-archiver" name="packed" string="Packed" domain="[('state','=','packed')]" />
718 <filter icon="terp-check" name="shipped" string="Ready to ship" domain="[('state','=','shipped')]" />
719 <filter icon="terp-dialog-close" name="closed" string="Dispatched" domain="[('state','=','done')]" />
720 <filter icon="gtk-yes" name="delivered" string="Received" domain="[('state','=','delivered')]" />
721+ <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
722 <separator orientation="vertical"/>
723 <filter icon="terp-folder-orange" name="empty" string="Empty" domain="[('num_of_packs','=', 0)]" />
724 <filter icon="terp-folder-green" name="not_empty" string="Not Empty" domain="[('num_of_packs','!=', 0)]" />
725
726=== modified file 'bin/addons/msf_partner/partner.py'
727--- bin/addons/msf_partner/partner.py 2019-10-24 12:07:52 +0000
728+++ bin/addons/msf_partner/partner.py 2019-10-30 13:23:31 +0000
729@@ -351,26 +351,8 @@
730 """
731 Check if the deleted partner is not a system one
732 """
733- data_obj = self.pool.get('ir.model.data')
734 property_obj = self.pool.get('ir.property')
735
736- partner_data_id = [
737- 'supplier_tbd',
738- ]
739-
740- for data_id in partner_data_id:
741- try:
742- part_id = data_obj.get_object_reference(
743- cr, uid, 'msf_doc_import', data_id)[1]
744- if part_id in ids:
745- part_name = self.read(cr, uid, part_id, ['name'])['name']
746- raise osv.except_osv(
747- _('Error'),
748- _('''The partner '%s' is an Unifield internal partner, so you can't remove it''') % part_name,
749- )
750- except ValueError:
751- pass
752-
753
754 #US-1344: treat deletion of partner
755 address_obj = self.pool.get('res.partner.address')
756@@ -967,7 +949,7 @@
757 if view_type == 'search':
758 if not context or not context.get('show_button_show_inactive', False):
759 tree = etree.fromstring(view['arch'])
760- fields = tree.xpath('//filter[@name="inactive"]')
761+ fields = tree.xpath('//filter[@name="inactive"]|//filter[@name="active"]')
762 for field in fields:
763 field.set('invisible', "1")
764 view['arch'] = etree.tostring(tree)
765@@ -990,24 +972,7 @@
766 """
767 Check if the deleted address is not a system one
768 """
769- data_obj = self.pool.get('ir.model.data')
770-
771- addr_data_id = [
772- 'address_tbd',
773- ]
774-
775- for data_id in addr_data_id:
776- try:
777- addr_id = data_obj.get_object_reference(
778- cr, uid, 'msf_doc_import', data_id)[1]
779- if addr_id in ids:
780- addr_name = self.read(cr, uid, addr_id, ['name'])['name']
781- raise osv.except_osv(
782- _('Error'),
783- _('''The Address '%s' is an Unifield internal address, so you can't remove it''') % addr_name,
784- )
785- except ValueError:
786- pass
787+
788 res = super(res_partner_address, self).unlink(cr, uid, ids, context=context)
789
790 #US-1344: treat deletion of partner
791
792=== modified file 'bin/addons/msf_partner/partner_view.xml'
793--- bin/addons/msf_partner/partner_view.xml 2019-03-29 16:33:48 +0000
794+++ bin/addons/msf_partner/partner_view.xml 2019-10-30 13:23:31 +0000
795@@ -82,7 +82,8 @@
796 <filter string="ESC" name="esc" icon="gtk-ok" domain="[('partner_type','=','esc')]" help="ESC Partners"/>
797 <filter string="Intermission" name="intermission" icon="gtk-ok" domain="[('partner_type','=','intermission')]" help="Intermission Partners"/>
798 <separator orientation="vertical" />
799- <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="[('name', '!=', 'To be defined'), ('active', '=', False)]" separator="1" />
800+ <filter icon="terp-personal+" name="active" string="Show Active" domain="[('active', '=', True)]" default="1" />
801+ <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="['&amp;', ('name', '!=', 'To be defined'), ('active', '=', False)]" separator="1" />
802 <newline />
803 <field name="name" select="1"/>
804 <field name="address" select="1"/>
805@@ -259,6 +260,7 @@
806 <field name="type">ir.actions.act_window</field>
807 <field name="res_model">res.partner</field>
808 <field name="view_type">form</field>
809+ <field name="context">{'show_button_show_inactive': True, 'default_search_active': 1, 'active_test': 0}</field>
810 <field name="view_id" ref="msf_view_partner_tree"/>
811 <field name="search_view_id" ref="msf_view_res_partner_filter"/>
812 </record>
813
814=== modified file 'bin/addons/msf_profile/data.xml'
815--- bin/addons/msf_profile/data.xml 2019-10-02 15:58:02 +0000
816+++ bin/addons/msf_profile/data.xml 2019-10-30 13:23:31 +0000
817@@ -80,9 +80,6 @@
818 <record id="order_types.res_partner_local_market" model="res.partner">
819 <field name="lang">en_MF</field>
820 </record>
821- <record id="msf_doc_import.supplier_tbd" model="res.partner">
822- <field name="lang">en_MF</field>
823- </record>
824
825 <record id="smtp_config" model="email.configuration">
826 <field name="smtp_server">127.0.0.1</field>
827
828=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
829--- bin/addons/msf_profile/i18n/fr_MF.po 2019-10-29 09:27:27 +0000
830+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-10-30 13:23:31 +0000
831@@ -4079,11 +4079,12 @@
832 msgid "From Order"
833 msgstr "De la Commande"
834
835-#. modules: return_claim, msf_partner, kit, msf_homere_interface
836+#. modules: return_claim, msf_partner, kit, msf_homere_interface, supplier_catalogue
837 #: view:composition.kit:0
838 #: view:res.partner:0
839 #: view:return.claim:0
840 #: view:hr.employee:0
841+#: view:supplier.catalogue:0
842 msgid "Show Inactive"
843 msgstr "Montrer les Inactifs"
844
845@@ -8656,6 +8657,7 @@
846 #: selection:account.invoice,counterpart_inv_status:0
847 #: selection:wizard.account.invoice,counterpart_inv_status:0
848 #: code:addons/stock_override/report/delivery_order.py:59
849+#: view:res.request:0
850 #, python-format
851 msgid "Draft"
852 msgstr "Brouillon"
853@@ -11496,7 +11498,7 @@
854 msgid "Creation Month"
855 msgstr "Creation Month"
856
857-#. modules: resource, finance, supplier_catalogue, msf_field_access_rights, msf_instance, msf_button_access_rights, msf_tools, analytic_distribution, financing_contract, sync_client
858+#. 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
859 #: view:financing.contract.donor:0
860 #: view:msf.instance:0
861 #: selection:msf.instance.cloud,state:0
862@@ -11512,6 +11514,11 @@
863 #: report:addons/msf_tools/report/report_inconsistencies_xls.mako:106
864 #: view:resource.resource:0
865 #: view:supplier.catalogue:0
866+#: view:hr.employee:0
867+#: view:res.users:0
868+#: view:res.currency:0
869+#: view:product.product:0
870+#: view:res.request:0
871 msgid "Inactive"
872 msgstr "Inactif"
873
874@@ -17584,6 +17591,7 @@
875
876 #. module: base
877 #: field:ir.model.access,perm_create:0
878+#: field:ir.model.access.empty,perm_create:0
879 msgid "Create Access"
880 msgstr "Créer l'Accès "
881
882@@ -20966,9 +20974,10 @@
883 msgid "Etc/GMT-11"
884 msgstr "Etc/GMT-11"
885
886-#. module: sales_followup, msf_tools
887+#. modules: sales_followup, msf_tools, account
888 #: selection:ir.followup.location.wizard,state:0
889 #: selection:job.in_progress,state:0
890+#: view:account.subscription:0
891 msgid "Done"
892 msgstr "Cloturé"
893
894@@ -23186,9 +23195,10 @@
895 msgid "Dest. Address"
896 msgstr "Dest. Address"
897
898-#. modules: delivery_mechanism, stock_override
899+#. modules: delivery_mechanism, stock_override, account
900 #: view:stock.picking.processing.info:0
901 #: view:change.dest.location:0
902+#: view:account.period:0
903 msgid "Close"
904 msgstr "Fermé"
905
906@@ -29972,7 +29982,7 @@
907 msgid "Certificate attached ?"
908 msgstr "Certificat attaché ?"
909
910-#. modules: msf_supply_doc_export, sourcing, consumption_calculation, sale, sales_followup, msf_supply_doc_export, purchase, account_override, account, register_accounting, stock_override, purchase_override, tender_flow
911+#. modules: msf_supply_doc_export, sourcing, consumption_calculation, sale, sales_followup, msf_supply_doc_export, purchase, account_override, account, register_accounting, stock_override, purchase_override, tender_flow, base
912 #: field:po.follow.up,closed_ok:0
913 #: selection:real.average.consumption,state:0
914 #: selection:po.follow.up,state:0
915@@ -29988,6 +29998,7 @@
916 #: selection:wizard.account.invoice,state:0
917 #: selection:account.invoice,counterpart_inv_status:0
918 #: code:addons/stock_override/report/delivery_order.py:64
919+#: view:res.request:0
920 msgid "Closed"
921 msgstr "Fermé"
922
923@@ -31584,6 +31595,7 @@
924 #: selection:account.account.template,type:0
925 #: selection:account.entries.report,type:0
926 #: selection:account.partner.balance.tree,account_type:0
927+#: view:account.account:0
928 msgid "Payable"
929 msgstr "Fournisseur"
930
931@@ -36901,14 +36913,12 @@
932 msgstr "L'Identité de l'enregistrement est attachée à ce(t)"
933
934 #. modules: account, finance
935-#: view:account.account:0
936 #: selection:account.aged.trial.balance,result_selection:0
937 #: selection:account.common.partner.report,result_selection:0
938 #: selection:account.partner.balance,result_selection:0
939 #: selection:account.partner.ledger,result_selection:0
940 #: code:addons/account/report/account_partner_ledger.py:294
941 #: model:ir.actions.act_window,name:account.action_aged_receivable
942-#: view:account.account:0
943 #: selection:wizard.account.partner.balance.tree,result_selection:0
944 #: code:addons/finance/report/account_partner_balance_tree.py:90
945 #, python-format
946@@ -38991,6 +39001,7 @@
947 #: field:purchase.order.merged.line,create_date:0
948 #: field:internal.request.import,in_creation_date:0
949 #: field:purchase.order.line,create_date:0
950+#: field:internal.request.import,in_creation_date:0
951 #, python-format
952 msgid "Creation date"
953 msgstr "Date de création"
954@@ -48117,6 +48128,7 @@
955 #: view:account.bank.statement:0
956 #: view:account.bank.statement.line:0
957 #: view:sale.order.line:0
958+#: view:free.allocation.wizard:0
959 msgid "Delete"
960 msgstr "Supprimer"
961
962@@ -51584,12 +51596,15 @@
963 " Creates automatically Purchase Orders after choosing.\n"
964 " "
965
966-#. modules: financing_contract, msf_homere_interface, analytic_distribution
967+#. modules: financing_contract, msf_homere_interface, analytic_distribution, msf_partner, supplier_catalogue, kit
968 #: view:account.destination.link:0
969 #: view:financing.contract.account.quadruplet:0
970 #: view:hr.employee:0
971+#: view:res.partner:0
972+#: view:composition.kit:0
973+#: view:supplier.catalogue:0
974 msgid "Show Active"
975-msgstr "Montrer Actif"
976+msgstr "Montrer les Actifs"
977
978 #. module: account
979 #: field:account.installer.modules,account_payment:0
980@@ -53103,6 +53118,7 @@
981 #: selection:cash.request.liquidity.cheque,type:0
982 #: selection:account.journal.fake,type:0
983 #: selection:wizard.register.opening.confirmation,register_type:0
984+#: view:account.account:0
985 msgid "Accrual"
986 msgstr "Accrual"
987
988@@ -57377,10 +57393,12 @@
989 msgid "Parent shipment"
990 msgstr "Expédition Parent "
991
992-#. modules: sourcing, analytic_distribution, account_mcdb
993+#. modules: sourcing, analytic_distribution, account_mcdb, account
994 #: view:analytic.distribution.wizard:0
995 #: view:multiple.sourcing.wizard:0
996 #: view:account.mcdb:0
997+#: view:account.common.report:0
998+#: view:free.allocation.wizard:0
999 msgid "Save"
1000 msgstr "Sauver"
1001
1002@@ -66225,6 +66243,7 @@
1003
1004 #. module: account
1005 #: selection:report.account.receivable,type:0
1006+#: view:account.account:0
1007 msgid "Income"
1008 msgstr "Income"
1009
1010@@ -72256,7 +72275,7 @@
1011 msgid "Navajo"
1012 msgstr "Navajo"
1013
1014-#. 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, account_mcdb
1015+#. 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, account_mcdb, msf_profile
1016 #: field:account.account,active:0
1017 #: field:account.analytic.journal,active:0
1018 #: field:account.journal.period,active:0
1019@@ -72327,6 +72346,10 @@
1020 #: field:sync.client.message_rule,active:0
1021 #: selection:sync.version.instance.monitor,instance_state:0
1022 #: field:product.mass.update,active_product:0
1023+#: view:composition.kit:0
1024+#: view:res.users:0
1025+#: view:product.product:0
1026+#: view:res.request:0
1027 #, python-format
1028 msgid "Active"
1029 msgstr "Actif"
1030@@ -76083,6 +76106,7 @@
1031
1032 #. module: account
1033 #: selection:report.account.receivable,type:0
1034+#: view:account.account:0
1035 msgid "Expense"
1036 msgstr "Expense"
1037
1038@@ -77705,7 +77729,7 @@
1039 msgid "Indicative Total Value"
1040 msgstr "Valeur totale"
1041
1042-#. 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, stock_override
1043+#. 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, stock_override, procurement_request
1044 #: selection:account.invoice,state:0
1045 #: selection:account.invoice.report,state:0
1046 #: selection:report.invoice.created,state:0
1047@@ -77775,6 +77799,10 @@
1048 #: selection:wizard.account.invoice,counterpart_inv_status:0
1049 #: field:po.follow.up,cancel_ok:0
1050 #: code:addons/stock_override/report/delivery_order.py:65
1051+#: view:real.average.consumption:0
1052+#: view:shipment:0
1053+#: view:stock.picking:0
1054+#: view:sale.order:0
1055 #, python-format
1056 msgid "Cancelled"
1057 msgstr "Annulé"
1058@@ -79191,6 +79219,7 @@
1059
1060 #. module: base
1061 #: field:ir.model.access,perm_unlink:0
1062+#: field:ir.model.access.empty,perm_unlink:0
1063 msgid "Delete Access"
1064 msgstr "Supprimer Accès"
1065
1066@@ -85039,14 +85068,12 @@
1067 msgstr "Ajouter un en-tête RML"
1068
1069 #. modules: account, finance
1070-#: view:account.account:0
1071 #: view:account.account.template:0
1072 #: selection:account.aged.trial.balance,result_selection:0
1073 #: selection:account.common.partner.report,result_selection:0
1074 #: selection:account.partner.balance,result_selection:0
1075 #: selection:account.partner.ledger,result_selection:0
1076 #: code:addons/account/report/account_partner_ledger.py:296
1077-#: view:account.account:0
1078 #: code:addons/finance/report/account_partner_balance_tree.py:92
1079 #: selection:wizard.account.partner.balance.tree,result_selection:0
1080 #, python-format
1081@@ -88676,6 +88703,7 @@
1082
1083 #. modules: sales_followup, msf_outgoing
1084 #: code:addons/sales_followup/sale_followup.py:525
1085+#: view:shipment:0
1086 #, python-format
1087 msgid "Packed"
1088 msgstr "Emballé"
1089@@ -89112,6 +89140,7 @@
1090 #: selection:account.account.template,type:0
1091 #: selection:account.entries.report,type:0
1092 #: selection:account.partner.balance.tree,account_type:0
1093+#: view:account.account:0
1094 msgid "Receivable"
1095 msgstr "Créditeurs"
1096
1097@@ -93252,6 +93281,7 @@
1098 #: field:internal.request.import,imp_creation_date:0
1099 #: report:addons/stock/report/products_situation_report_xls.mako:221
1100 #: report:addons/stock/report/stock_delivery_report_xls.mako:225
1101+#: field:internal.request.import,imp_creation_date:0
1102 msgid "Creation Date"
1103 msgstr "Date de Création"
1104
1105@@ -107625,6 +107655,7 @@
1106 #: view:sync.version.instance.monitor:0
1107 msgid "Late jobs"
1108 msgstr "Tâches en retard"
1109+<<<<<<< TREE
1110
1111 #. module: product
1112 #: model:ir.actions.report.xml,name:product.product_ed_bn_mass_update_export_xls
1113@@ -107657,3 +107688,11 @@
1114 #: field:product.ed_bn.mass.update.history,old_ed:0
1115 msgid "Old ED"
1116 msgstr "Ancien EXP"
1117+=======
1118+
1119+#. module: product_attributes
1120+#: code:addons/product_attributes/product_attributes.py:1026
1121+#, python-format
1122+msgid "Only not forbidden"
1123+msgstr "Produits autorisés"
1124+>>>>>>> MERGE-SOURCE
1125
1126=== modified file 'bin/addons/msf_profile/msf_profile.py'
1127--- bin/addons/msf_profile/msf_profile.py 2019-10-02 08:24:26 +0000
1128+++ bin/addons/msf_profile/msf_profile.py 2019-10-30 13:23:31 +0000
1129@@ -1922,7 +1922,7 @@
1130 select res_id from ir_model_data d
1131 where d.module='sd'
1132 and d.model='res.partner'
1133- and name not in ('msf_doc_import_supplier_tbd', 'order_types_res_partner_local_market')
1134+ and name != 'order_types_res_partner_local_market'
1135 and name not like '%s%%'
1136 ) """ % (identifier, )) # not_a_user_entry
1137 self._logger.warn('%s non local partners updated' % (cr.rowcount,))
1138
1139=== modified file 'bin/addons/msf_profile/user_access_configurator_view.xml'
1140--- bin/addons/msf_profile/user_access_configurator_view.xml 2019-04-02 13:37:23 +0000
1141+++ bin/addons/msf_profile/user_access_configurator_view.xml 2019-10-30 13:23:31 +0000
1142@@ -360,7 +360,7 @@
1143 <field name="priority" eval="99" />
1144 <field name="arch" type="xml">
1145 <search string="Groups">
1146- <filter name="show_active" string="Only inactive" icon="gtk-cancel" domain="[('visible_res_groups', '=', False)]" context="{'show_invisible': True}" />
1147+ <filter name="only_inactive" string="Only inactive" icon="gtk-cancel" domain="[('visible_res_groups', '=', False)]" context="{'show_invisible': True}" />
1148 <filter name="show_good_level" string="All Levels" icon="gtk-cancel" context="{'show_all_level': True}" />
1149 <field name="name" />
1150 <field name="is_an_admin_profile" />
1151@@ -387,7 +387,9 @@
1152 <field name="priority" eval="99" />
1153 <field name="arch" type="xml">
1154 <search string="Users">
1155- <filter name="show_inactive" string="Show inactive" icon="gtk-ok" domain="[('active', '=', False)]" />
1156+ <filter name="active" string="Active" icon="terp-personal+" domain="[('active', '=', True)]" />
1157+ <filter name="inactive" string="Inactive" icon="terp-personal-" domain="[('active', '=', False)]" />
1158+ <separator orientation="vertical"/>
1159 <filter name="show_synchronized" string="Show synchronized" icon="gtk-ok" domain="[('synchronize', '=', True)]"/>
1160 <field name="name" />
1161 <field name="login" />
1162
1163=== modified file 'bin/addons/out_step/out_step_view.xml'
1164--- bin/addons/out_step/out_step_view.xml 2019-06-18 07:28:19 +0000
1165+++ bin/addons/out_step/out_step_view.xml 2019-10-30 13:23:31 +0000
1166@@ -36,12 +36,11 @@
1167 <field name="inherit_id" ref="stock.view_picking_out_search" />
1168 <field name="arch" type="xml">
1169 <data>
1170-
1171 <filter name="done" position="replace">
1172 <!-- <separator orientation="vertical"/> -->
1173 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Delivery orders already processed"/>
1174 <filter icon="gtk-yes" name="delivered" string="Delivered" domain="[('state', '=', 'delivered')]" help="Delivered Delivery Orders" />
1175- <!-- <filter icon="gtk-no" name="not_delivered" string="Not Delivered" domain="[('state', '=', 'done'), ('delivered', '=', False)]" help="Not Delivered Delivery Orders" /> -->
1176+ <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
1177 <separator orientation="vertical"/>
1178 </filter>
1179
1180@@ -50,4 +49,4 @@
1181 </record>
1182
1183 </data>
1184-</openerp>
1185\ No newline at end of file
1186+</openerp>
1187
1188=== modified file 'bin/addons/procurement/procurement_view.xml'
1189--- bin/addons/procurement/procurement_view.xml 2017-10-04 05:23:42 +0000
1190+++ bin/addons/procurement/procurement_view.xml 2019-10-30 13:23:31 +0000
1191@@ -107,8 +107,8 @@
1192 help="Procurement started late" />
1193 <separator orientation="vertical"/>
1194 <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
1195- <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
1196- <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
1197+ <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="['&amp;', ('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
1198+ <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="['&amp;', ('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
1199 <separator orientation="vertical"/>
1200 <field name="origin"/>
1201 <field name="product_id" />
1202
1203=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
1204--- bin/addons/procurement_request/procurement_request_view.xml 2019-07-30 09:18:07 +0000
1205+++ bin/addons/procurement_request/procurement_request_view.xml 2019-10-30 13:23:31 +0000
1206@@ -175,9 +175,11 @@
1207 <search string="Internal Requests">
1208 <group string="Filters" expand="1">
1209 <filter name="state_proc" string="Draft" icon="terp-document-new" domain="[('state', 'in', ['draft','draft_p'])]" />
1210- <filter name="state_valid" string="Validated" icon="terp-camera_test" domain="[('state', 'in', ['validated','validated_p'])]" />
1211- <filter name="state_proc_progress" string="Confirmed" icon="terp-stage" domain="[('state', 'in', ('confirmed', 'confirmed_p'))]" />
1212+ <filter name="state_valid" string="Validated" icon="terp-check" domain="[('state', 'in', ['validated','validated_p'])]" />
1213+ <filter name="sourced" string="Sourced" icon="gtk-paste-v" domain="[('state','in',['sourced','sourced_p'])]" />
1214+ <filter name="state_proc_progress" string="Confirmed" icon="terp-camera_test" domain="[('state', 'in', ('confirmed', 'confirmed_p'))]" />
1215 <filter name="state_done" string="Closed" icon="terp-dialog-close" domain="[('state', '=', 'done')]" />
1216+ <filter name="cancelled" string="Cancelled" icon="gtk-cancel" domain="[('state', '=', 'cancel')]" />
1217 <separator orientation="vertical" />
1218 <field name="name" />
1219 <field name="origin" />
1220
1221=== modified file 'bin/addons/product/product_view.xml'
1222--- bin/addons/product/product_view.xml 2019-01-30 08:28:30 +0000
1223+++ bin/addons/product/product_view.xml 2019-10-30 13:23:31 +0000
1224@@ -10,6 +10,7 @@
1225 <field name="arch" type="xml">
1226 <search string="Product">
1227 <filter string="Stock>0" icon="terp-accessories-archiver" domain="[('postive_qty','=',True)]"/>
1228+ <separator orientation="vertical"/>
1229 <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
1230 <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
1231 <separator orientation="vertical"/>
1232@@ -194,6 +195,8 @@
1233 <field name="view_type">form</field>
1234 <field name="view_id" ref="product_product_tree_view"/>
1235 <field name="search_view_id" ref="product_search_form_view"/>
1236+ <field name="context">{'display_active_filter':1}</field>
1237+ <field name="domain">[('default_code', '!=', 'TBD')]</field>
1238 <field name="help">You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on.</field>
1239 </record>
1240
1241
1242=== modified file 'bin/addons/product_attributes/product_attributes.py'
1243--- bin/addons/product_attributes/product_attributes.py 2019-10-28 16:42:13 +0000
1244+++ bin/addons/product_attributes/product_attributes.py 2019-10-30 13:23:31 +0000
1245@@ -1000,22 +1000,31 @@
1246
1247 res = super(product_attributes, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
1248
1249+<<<<<<< TREE
1250 if view_type == 'search' and context.get('display_batch_attr'):
1251 root = etree.fromstring(res['arch'])
1252 for field in root.xpath('//group[@name="batch_attr"]'):
1253 field.set('invisible', '0')
1254 res['arch'] = etree.tostring(root)
1255+=======
1256+ if view_type == 'search' and context.get('display_active_filter'):
1257+ root = etree.fromstring(res['arch'])
1258+ for field in root.xpath('//group[@name="display_active_filter"]'):
1259+ field.set('invisible', '0')
1260+ res['arch'] = etree.tostring(root)
1261+
1262+>>>>>>> MERGE-SOURCE
1263 if view_type == 'search' and context.get('available_for_restriction'):
1264 context.update({'search_default_not_restricted': 1})
1265 root = etree.fromstring(res['arch'])
1266 # xpath of fields to be modified
1267- xpath = '//filter[@string="Service with Reception"]'
1268+ xpath = '//filter[@name="service_with_reception"]'
1269 fields = root.xpath(xpath)
1270
1271 if not fields:
1272 return res
1273
1274- state_index = root.index(fields[0])
1275+ parent_node = fields[0].getparent()
1276 new_separator = """<separator orientation="vertical" />"""
1277 sep_form = etree.fromstring(new_separator)
1278 arg = context.get('available_for_restriction')
1279@@ -1030,12 +1039,13 @@
1280 context=context)
1281 else:
1282 filter_domain = "[('available_for_restriction','=',%s)]" % arg
1283- new_filter = """<filter string="Only not forbidden" name="not_restricted" icon="terp-accessories-archiver-minus" domain="%s" />""" % filter_domain
1284+ new_filter = """<filter string="%s" name="not_restricted" icon="terp-accessories-archiver-minus" domain="%s" />""" % (_('Only not forbidden'), filter_domain)
1285 #generate new xml form$
1286 new_form = etree.fromstring(new_filter)
1287 # instert new form just after state index position
1288- root.insert(state_index+1, new_form)
1289- root.insert(state_index+1, sep_form)
1290+ state_index = parent_node.index(fields[0])
1291+ parent_node.insert(state_index+1, new_form)
1292+ parent_node.insert(state_index+1, sep_form)
1293 # generate xml back to string
1294 res['arch'] = etree.tostring(root)
1295
1296
1297=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
1298--- bin/addons/product_attributes/product_attributes_view.xml 2019-10-28 16:42:13 +0000
1299+++ bin/addons/product_attributes/product_attributes_view.xml 2019-10-30 13:23:31 +0000
1300@@ -463,9 +463,10 @@
1301 <field name="arch" type="xml">
1302 <search string="Product">
1303 <filter string="Stock>0" icon="terp-accessories-archiver" domain="[('postive_qty','=',True)]"/>
1304+ <separator orientation="vertical"/>
1305 <filter string="Stockable" icon="terp-accessories-archiver" domain="[('type','=','product')]"/>
1306 <filter string="Non-Stockable" icon="terp-accessories-archiver" domain="[('type','=','consu')]"/>
1307- <filter string="Service with Reception" icon="terp-accessories-archiver" domain="[('type','=','service_recep')]" />
1308+ <filter string="Service with Reception" name="service_with_reception" icon="terp-accessories-archiver" domain="[('type','=','service_recep')]" />
1309 <separator orientation="vertical"/>
1310 <field name="default_code" string="Code"/>
1311 <field name="name" string="Description"/>
1312@@ -473,12 +474,25 @@
1313 <field name="uf_create_date" string="Creation" widget="date" />
1314 <field name="uf_write_date" string="Modification" widget="date" />
1315 <newline/>
1316+<<<<<<< TREE
1317 <filter string="Single Item" icon="terp-accessories-archiver" domain="[('subtype','=','single')]"/>
1318 <filter string="Kit/Module" icon="terp-accessories-archiver" domain="[('subtype','=','kit')]"/>
1319 <filter string="Asset" icon="terp-accessories-archiver" domain="[('subtype','=','asset')]"/>
1320 <group name="batch_attr" invisible="1">
1321 <field name="batch_attributes" />
1322 </group>
1323+=======
1324+ <group>
1325+ <filter string="Single Item" icon="terp-accessories-archiver" domain="[('subtype','=','single')]"/>
1326+ <filter string="Kit/Module" icon="terp-accessories-archiver" domain="[('subtype','=','kit')]"/>
1327+ <filter string="Asset" icon="terp-accessories-archiver" domain="[('subtype','=','asset')]"/>
1328+ <group name="display_active_filter" invisible="1">
1329+ <label />
1330+ <filter name="active" string="Active" domain="[('active', '=', True)]" icon="terp-check" />
1331+ <filter name="inactive" string="Inactive" domain="[('active', '=', False)]" icon="gtk-dialog-error"/>
1332+ </group>
1333+ </group>
1334+>>>>>>> MERGE-SOURCE
1335 <newline/>
1336 <group expand="0" string="Extended Filters..." />
1337 <newline/>
1338
1339=== modified file 'bin/addons/product_list/product_list_view.xml'
1340--- bin/addons/product_list/product_list_view.xml 2019-08-12 15:10:42 +0000
1341+++ bin/addons/product_list/product_list_view.xml 2019-10-30 13:23:31 +0000
1342@@ -32,6 +32,7 @@
1343 <filter string="Sublist" name="only_sublist" domain="[('type', '=', 'sublist')]" icon="gtk-copy" />
1344 <separator orientation="vertical" />
1345 <filter string="Standard" name="standard" domain="[('standard_list_ok', '=', True)]" icon="terp-rating-rated" />
1346+ <separator orientation="vertical" />
1347 <filter string="Order list print" name="print_list" domain="[('order_list_print_ok', '=', True)]" icon="gtk-print" />
1348 <field name="ref" />
1349 <field name="name" />
1350
1351=== modified file 'bin/addons/product_nomenclature/product_nomenclature_view.xml'
1352--- bin/addons/product_nomenclature/product_nomenclature_view.xml 2019-02-28 15:19:06 +0000
1353+++ bin/addons/product_nomenclature/product_nomenclature_view.xml 2019-10-30 13:23:31 +0000
1354@@ -196,19 +196,6 @@
1355 </field>
1356 </record>
1357
1358- <!--<record id="product_nomenclature_action" model="ir.actions.act_window">
1359- <field name="name">Products by Nomenclature</field>
1360- <field name="type">ir.actions.act_window</field>
1361- <field name="res_model">product.nomenclature</field>
1362- <field name="domain">[('parent_id','=',False)]</field>
1363- <field name="view_type">tree</field>
1364- <field name="view_id" ref="product_nomenclature_tree_view" />
1365- <field name="help">Here is a list of all your products classified by
1366- nomenclature.</field>
1367- </record>
1368- <menuitem action="product_nomenclature_action" id="menu_products_nomenclature_sales"
1369- parent="base.menu_product" sequence="4" />-->
1370-
1371 <record id="product_nomenclature_action_form" model="ir.actions.act_window">
1372 <field name="name">Products Nomenclature</field>
1373 <field name="type">ir.actions.act_window</field>
1374
1375=== modified file 'bin/addons/purchase/purchase_view.xml'
1376--- bin/addons/purchase/purchase_view.xml 2019-10-28 14:42:19 +0000
1377+++ bin/addons/purchase/purchase_view.xml 2019-10-30 13:23:31 +0000
1378@@ -435,14 +435,12 @@
1379 <search string="Search Purchase Orders">
1380 <group col="8" colspan="4">
1381 <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"/>
1382- <filter icon="terp-check" name="approved" string="Validated" domain="[('state', 'in', ['validated', 'validated_p'])]" separator="1" help="Purchase orders which are in approved state."/>
1383+ <filter icon="terp-check" name="validated" string="Validated" domain="[('state', 'in', ['validated', 'validated_p'])]" separator="1" help="Purchase orders which are in approved state."/>
1384 <filter icon="gtk-paste-v" name="sourced" string="Sourced" domain="[('state','in',['sourced','sourced_p'])]" separator="1"/>
1385 <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."/>
1386 <filter icon="gtk-close" name="done" string="Closed" domain="[('state', 'in', ['done'])]" separator="1" help="Purchase orders which are in done state."/>
1387- <separator orientation="vertical"/>
1388 <filter icon="gtk-cancel" name="cancelled" string="Cancelled" domain="[('state', 'in', ['cancel'])]" separator="1" help="Purchase orders which are in cancelled state."/>
1389 <separator orientation="vertical"/>
1390- <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."/>
1391 <separator orientation="vertical"/>
1392 <field name="name" select="1" string="Reference"/>
1393 <field name="partner_id" select="1" string="Supplier"/>
1394@@ -547,7 +545,7 @@
1395 <field name="type">ir.actions.act_window</field>
1396 <field name="res_model">purchase.order</field>
1397 <field name="view_mode">tree,form,graph,calendar</field>
1398- <field name="context">{'purchase_order': True}</field>
1399+ <field name="context">{'purchase_order': True, 'search_default_draft': 1, 'search_default_validated': 1, 'search_default_sourced': 1}</field>
1400 <field name="domain">[('tender_id', '=', False), ('rfq_ok', '=', False)]</field>
1401 <field name="search_view_id" ref="purchase.view_purchase_order_filter"/>
1402 <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>
1403
1404=== modified file 'bin/addons/purchase/report/purchase_report_view.xml'
1405--- bin/addons/purchase/report/purchase_report_view.xml 2018-12-07 08:43:21 +0000
1406+++ bin/addons/purchase/report/purchase_report_view.xml 2019-10-30 13:23:31 +0000
1407@@ -56,16 +56,16 @@
1408 <search string="Purchase Orders">
1409 <group colspan="10" col="12">
1410 <filter icon="terp-go-year" string=" Year "
1411- domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
1412+ domain="['&amp;', ('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
1413 help="Order in current year"/>
1414 <filter icon="terp-go-month" string=" Month "
1415 name="month"
1416- 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'))]"
1417+ 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'))]"
1418 help="Order in current month"/>
1419 <filter icon="terp-go-month"
1420 string=" Month-1 "
1421 separator="1"
1422- 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'))]"
1423+ 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'))]"
1424 help="Order in last month"/>
1425 <separator orientation="vertical"/>
1426 <filter icon="terp-document-new"
1427@@ -75,7 +75,7 @@
1428 <filter icon="terp-gtk-jump-to-rtl"
1429 string="Orders"
1430 name="orders"
1431- domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
1432+ domain="['&amp;', ('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
1433 <separator orientation="vertical"/>
1434 <field name="partner_id"/>
1435 <field name="product_id"/>
1436
1437=== modified file 'bin/addons/reason_types_moves/stock_view.xml'
1438--- bin/addons/reason_types_moves/stock_view.xml 2019-04-09 09:14:46 +0000
1439+++ bin/addons/reason_types_moves/stock_view.xml 2019-10-30 13:23:31 +0000
1440@@ -1,25 +1,25 @@
1441 <?xml version="1.0" encoding="utf-8" ?>
1442 <openerp>
1443- <data>
1444-
1445- <!-- Override Stock Moves -->
1446- <record id="stock_move_tree2_type_id" model="ir.ui.view">
1447+ <data>
1448+
1449+ <!-- Override Stock Moves -->
1450+ <record id="stock_move_tree2_type_id" model="ir.ui.view">
1451 <field name="name">stock.move.tree2.type.id</field>
1452 <field name="model">stock.move</field>
1453 <field name="type">tree</field>
1454 <field name="priority">20</field>
1455 <field name="inherit_id" ref="stock.stock_move_tree2" />
1456 <field name="arch" type="xml">
1457- <data>
1458- <xpath expr="/tree/field[@name='location_dest_id']" position="replace">
1459- <field name="location_dest_id" on_change="location_dest_change(location_dest_id, location_id)" domain="[('id', '!=', location_id)]"/>
1460- </xpath>
1461+ <data>
1462+ <xpath expr="/tree/field[@name='location_dest_id']" position="replace">
1463+ <field name="location_dest_id" on_change="location_dest_change(location_dest_id, location_id)" domain="[('id', '!=', location_id)]"/>
1464+ </xpath>
1465
1466 <xpath expr="/tree/field[@name='product_uom']" position="after">
1467- <field name="reason_type_id" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}" />
1468+ <field name="reason_type_id" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}" />
1469 <field name="comment" />
1470 </xpath>
1471- </data>
1472+ </data>
1473 </field>
1474 </record>
1475
1476@@ -31,18 +31,17 @@
1477 <field name="priority">25</field>
1478 <field name="inherit_id" ref="stock.view_move_search" />
1479 <field name="arch" type="xml">
1480- <data>
1481+ <data>
1482 <xpath expr="/search//filter[@string='Done']" position="attributes">
1483 <attribute name="string">Closed</attribute>
1484 </xpath>
1485- <xpath expr="/search/group[@string='Group By...']/filter[@string='Destination']" position="after">
1486+ <xpath expr="/search/group[@string='Group By...']/filter[@string='Destination']" position="after">
1487 <separator />
1488 <filter string="Reason Type" name="groupby_reason_type_id" icon="terp-purchase" domain="[]" context="{'group_by':'reason_type_id'}"/>
1489 </xpath>
1490- </data>
1491+ </data>
1492 </field>
1493 </record>
1494-
1495
1496 <record id="inherit_view_move_search_reception_incoming_picking" model="ir.ui.view">
1497 <field name="name">inherit.view.move.search.reception.incoming.picking</field>
1498@@ -51,24 +50,24 @@
1499 <field name="priority">20</field>
1500 <field name="inherit_id" ref="stock.view_move_search_reception_incoming_picking" />
1501 <field name="arch" type="xml">
1502- <data>
1503+ <data>
1504 <xpath expr="/search//filter[@string='Done']" position="attributes">
1505 <attribute name="string">Closed</attribute>
1506 </xpath>
1507-
1508- <xpath expr="/search/group/field[@name='origin']" position="before">
1509- <field name="picking_id" />
1510- <field name="reason_type_id" widget="selection" domain="[('incoming_ok', '=', True)]" />
1511- </xpath>
1512- <xpath expr="/search//field[@name='product_id']" position="after">
1513- <field name="order_category" />
1514- <field name="state" />
1515- </xpath>
1516- <xpath expr="/search//filter[@string='Supplier']" position="after">
1517- <filter string="Reason Type" icon="terp-purchase" domain="[]" context="{'group_by':'reason_type_id'}"/>
1518- <separator orientation="vertical" />
1519- </xpath>
1520-
1521+
1522+ <xpath expr="/search/group/field[@name='origin']" position="before">
1523+ <field name="picking_id" />
1524+ <field name="reason_type_id" widget="selection" domain="[('incoming_ok', '=', True)]" />
1525+ </xpath>
1526+ <xpath expr="/search//field[@name='product_id']" position="after">
1527+ <field name="order_category" />
1528+ <field name="state" />
1529+ </xpath>
1530+ <xpath expr="/search//filter[@string='Supplier']" position="after">
1531+ <filter string="Reason Type" icon="terp-purchase" domain="[]" context="{'group_by':'reason_type_id'}"/>
1532+ <separator orientation="vertical" />
1533+ </xpath>
1534+
1535 </data>
1536 </field>
1537 </record>
1538@@ -80,69 +79,72 @@
1539 <field name="priority">20</field>
1540 <field name="inherit_id" ref="stock.view_move_search_reception_outcoming_picking" />
1541 <field name="arch" type="xml">
1542- <data>
1543- <xpath expr="/search//filter[@string='To Do']" position="attributes">
1544- <attribute name="string">In Progress</attribute>
1545- </xpath>
1546+ <data>
1547+ <xpath expr="/search//filter[@string='To Do']" position="attributes">
1548+ <attribute name="string">In Progress</attribute>
1549+ </xpath>
1550 <xpath expr="/search//filter[@string='Done']" position="attributes">
1551 <attribute name="string">Closed</attribute>
1552 </xpath>
1553-
1554+
1555 <xpath expr="/search//field[@name='origin']" position="before">
1556- <field name="picking_id" />
1557- <field name="reason_type_id" widget="selection" domain="[('outgoing_ok', '=', True)]" />
1558- </xpath>
1559-
1560- <xpath expr="/search/group/field[@name='product_id']" position="after">
1561- <newline />
1562- <field name="order_category" />
1563- <field name="state" />
1564- </xpath>
1565-
1566+ <field name="picking_id" />
1567+ <field name="reason_type_id" widget="selection" domain="[('outgoing_ok', '=', True)]" />
1568+ </xpath>
1569+
1570+ <xpath expr="/search/group/field[@name='product_id']" position="after">
1571+ <newline />
1572+ <field name="order_category" />
1573+ <field name="state" />
1574+ </xpath>
1575+
1576 <xpath expr="/search//filter[@string='Customer']" position="after">
1577 <separator orientation="vertical" />
1578 <filter string="Reason Type" icon="terp-purchase" domain="[]" context="{'group_by':'reason_type_id'}"/>
1579- </xpath>
1580-
1581- <xpath expr="/search/group[@string='Extended Filters...']/field[@name='tracking_id']" position="replace" />
1582- </data>
1583+ </xpath>
1584+
1585+ <xpath expr="/search/group[@string='Extended Filters...']/field[@name='tracking_id']" position="replace" />
1586+ </data>
1587 </field>
1588 </record>
1589
1590
1591- <record id="inherit_view_move_tree_reception_picking_board" model="ir.ui.view">
1592- <field name="name">inherit.view.move.tree.reception.picking.board</field>
1593- <field name="model">stock.move</field>
1594- <field name="type">tree</field>
1595+ <record id="inherit_view_move_tree_reception_picking_board" model="ir.ui.view">
1596+ <field name="name">inherit.view.move.tree.reception.picking.board</field>
1597+ <field name="model">stock.move</field>
1598+ <field name="type">tree</field>
1599 <field name="priority">20</field>
1600- <field name="inherit_id" ref="stock.view_move_tree_reception_picking_board" />
1601- <field name="arch" type="xml">
1602- <data>
1603- <xpath expr="/tree/field[@name='product_uom']" position="after">
1604- <field name="reason_type_id" />
1605- </xpath>
1606-
1607- <button name="action_done" position="attributes">
1608- <attribute name="invisible">1</attribute>
1609- </button>
1610- </data>
1611- </field>
1612- </record>
1613+ <field name="inherit_id" ref="stock.view_move_tree_reception_picking_board" />
1614+ <field name="arch" type="xml">
1615+ <data>
1616+ <xpath expr="/tree/field[@name='product_uom']" position="after">
1617+ <field name="reason_type_id" />
1618+ </xpath>
1619+
1620+ <button name="action_done" position="attributes">
1621+ <attribute name="invisible">1</attribute>
1622+ </button>
1623+ </data>
1624+ </field>
1625+ </record>
1626
1627 <!-- id: inherit_view_picking_in_form, name: inherit.view.picking.in.form, inherit_id: stock.view_picking_in_form was here -->
1628 <!-- id: inherit_view_picking_form, name: inherit.view.picking.form, inherit_id: stock.view_picking_form was here -->
1629 <!-- id: inherit_view_picking_out_form, name: inherit.view.picking.out.form, inherit_id: stock.view_picking_out_form was here -->
1630
1631 <record id="stock.view_picking_in_search" model="ir.ui.view">
1632- <field name="name">unifield.stock.picking.in.search</field>
1633- <field name="model">stock.picking</field>
1634- <field name="type">search</field>
1635+ <field name="name">unifield.stock.picking.in.search</field>
1636+ <field name="model">stock.picking</field>
1637+ <field name="type">search</field>
1638 <field name="priority">24</field>
1639- <field name="arch" type="xml">
1640- <search string="Incoming Shipments">
1641+ <field name="arch" type="xml">
1642+ <search string="Incoming Shipments">
1643 <group col="8" colspan="4">
1644+ <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state', '=', 'draft')]" />
1645+ <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state', '=', 'confirmed')]" />
1646 <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned','shipped','updated'))]" help="Incoming Shipments Available" />
1647 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
1648+ <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
1649 <separator orientation="vertical" />
1650 <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" />
1651 <separator orientation="vertical"/>
1652@@ -169,10 +171,10 @@
1653 <filter string="Reason type" icon="terp-purchase" domain="[]" context="{'group_by': 'reason_type_id'}" />
1654 </group>
1655 </search>
1656- </field>
1657- </record>
1658-
1659- <record id="stock.view_picking_in_tree" model="ir.ui.view">
1660+ </field>
1661+ </record>
1662+
1663+ <record id="stock.view_picking_in_tree" model="ir.ui.view">
1664 <field name="name">unifield.stock.picking.in.tree</field>
1665 <field name="model">stock.picking</field>
1666 <field name="type">tree</field>
1667@@ -195,13 +197,13 @@
1668 </tree>
1669 </field>
1670 </record>
1671-
1672+
1673 <record id="stock.action_picking_tree4" model="ir.actions.act_window">
1674 <field name="context">{'contact_display': 'partner_address',
1675 'subtype': 'in',
1676 'picking_type': 'incoming_shipment',
1677 'search_default_available':1}</field>
1678 </record>
1679- </data>
1680+ </data>
1681 </openerp>
1682
1683
1684=== modified file 'bin/addons/res_currency_functional/res_currency_functional_view.xml'
1685--- bin/addons/res_currency_functional/res_currency_functional_view.xml 2016-11-04 12:57:37 +0000
1686+++ bin/addons/res_currency_functional/res_currency_functional_view.xml 2019-10-30 13:23:31 +0000
1687@@ -57,7 +57,8 @@
1688 <field name="arch" type="xml">
1689 <search string="Currencies">
1690 <group>
1691- <filter name="active" icon="terp-check" string="Active" domain="[('active','=', True)]" />
1692+ <filter name="active" icon="terp-check" string="Active" domain="[('active','=', True)]" />
1693+ <filter name="inactive" icon="gtk-dialog-error" string="Inactive" domain="[('active','=', False)]" />
1694 <separator orientation="vertical"/>
1695 <field name="name"/>
1696 </group>
1697
1698=== modified file 'bin/addons/return_claim/return_claim_view.xml'
1699--- bin/addons/return_claim/return_claim_view.xml 2017-12-01 15:24:26 +0000
1700+++ bin/addons/return_claim/return_claim_view.xml 2019-10-30 13:23:31 +0000
1701@@ -205,8 +205,6 @@
1702 <filter icon="terp-personal" name="customer" string="Customer" domain="[('type_return_claim','=', 'customer')]" separator="1" />
1703 <filter icon="terp-personal" name="transport" string="Transport" domain="[('type_return_claim','=','transport')]" />
1704 <separator orientation="vertical" />
1705- <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="[]" context="{'active_test': False}" separator="1" />
1706- <separator orientation="vertical" />
1707 <field name="name" />
1708 <field name="type_return_claim" />
1709 <newline />
1710
1711=== modified file 'bin/addons/sale/report/sale_report_view.xml'
1712--- bin/addons/sale/report/sale_report_view.xml 2017-06-14 13:55:43 +0000
1713+++ bin/addons/sale/report/sale_report_view.xml 2019-10-30 13:23:31 +0000
1714@@ -59,16 +59,16 @@
1715 domain="[('invoiced','=', False)]" />
1716 <separator orientation="vertical"/>
1717 <filter icon="terp-go-year" string=" Year "
1718- domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
1719+ domain="['&amp;', ('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
1720 help="Field order created in current year"/>
1721 <filter icon="terp-go-month" string=" Month "
1722 name="month"
1723- 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'))]"
1724+ 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'))]"
1725 help="Field order created in current month"/>
1726 <filter icon="terp-go-month"
1727 string=" Month-1 "
1728 separator="1"
1729- 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'))]"
1730+ 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'))]"
1731 help="Field order created in last month"/>
1732 <separator orientation="vertical"/>
1733 <filter icon="terp-document-new"
1734
1735=== modified file 'bin/addons/sale/sale_view.xml'
1736--- bin/addons/sale/sale_view.xml 2019-10-28 14:42:19 +0000
1737+++ bin/addons/sale/sale_view.xml 2019-10-30 13:23:31 +0000
1738@@ -446,10 +446,11 @@
1739 <field name="arch" type="xml">
1740 <search string="Search Sales Order">
1741 <filter icon="terp-document-new" string="Draft" domain="[('state','in',['draft','draft_p'])]" help="Field Order that haven't yet been confirmed" />
1742- <filter icon="terp-camera_test" string="Validated" domain="[('state','in',['validated','validated_p'])]" help="Field Order validated"/>
1743+ <filter icon="terp-check" string="Validated" domain="[('state','in',['validated','validated_p'])]" help="Field Order validated"/>
1744 <filter icon="gtk-paste-v" name="sourced" string="Sourced" domain="[('state','in',['sourced','sourced_p'])]" separator="1" />
1745- <filter icon="terp-check" string="Confirmed" domain="[('state','in',('confirmed','confirmed_p'))]"/>
1746+ <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('confirmed','confirmed_p'))]"/>
1747 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]"/>
1748+ <filter icon="gtk-cancel" name="cancelled" string="Cancelled" domain="[('state','=','cancel')]"/>
1749 <separator orientation="vertical"/>
1750 <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
1751
1752@@ -656,7 +657,7 @@
1753 <field name="type">search</field>
1754 <field name="arch" type="xml">
1755 <search string="Search Sales Order">
1756- <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"/>
1757+ <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"/>
1758 <separator orientation="vertical"/>
1759 <field name="order_id"/>
1760 <field name="order_partner_id"/>
1761@@ -1072,7 +1073,7 @@
1762 <field name="arch" type="xml">
1763 <search string="Sourcing progress">
1764 <filter string="Done" name="done" domain="[('end_date', '!=', False)]" icon="terp-check" />
1765- <filter string="In Progress" name="progress" domain="[('end_date', '=', False), ('start_date', '!=', False)]" icon="gtk-execute" />
1766+ <filter string="In Progress" name="progress" domain="['&amp;', ('end_date', '=', False), ('start_date', '!=', False)]" icon="gtk-execute" />
1767 <field name="order_id" context="{'procurement_order': True, 'active_test': False}"
1768 domain="[('state', '!=', 'draft'), '|', ('procurement_request', '=', True), ('split_type_sale_order', '=', 'original_sale_order')]"/>
1769 <field name="start_date" />
1770
1771=== modified file 'bin/addons/stock/stock_view.xml'
1772--- bin/addons/stock/stock_view.xml 2019-10-29 09:27:27 +0000
1773+++ bin/addons/stock/stock_view.xml 2019-10-30 13:23:31 +0000
1774@@ -988,9 +988,11 @@
1775 <field name="arch" type="xml">
1776 <search string="Internal Picking List">
1777 <group col="8" colspan="4">
1778+ <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state', '=', 'draft')]" />
1779+ <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
1780 <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
1781- <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
1782 <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state','=','done')]" help="Internal Moves already processed"/>
1783+ <filter icon="gtk-cancel" name="cancel" string="Cancelled" domain="[('state','=','cancel')]" />
1784 <separator orientation="vertical"/>
1785 <filter icon="gtk-execute" name="sysint" string="System INT" domain="[('subtype', '!=', 'sysint')]" help="System internal moves"/>
1786 <separator orientation="vertical"/>
1787@@ -1166,7 +1168,7 @@
1788 <field name="arch" type="xml">
1789 <search string="Stock Moves">
1790 <group col="14" colspan="4">
1791- <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"/>
1792+ <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"/>
1793 <separator orientation="vertical"/>
1794 <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
1795 <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
1796@@ -1359,7 +1361,7 @@
1797 <field name="arch" type="xml">
1798 <search string="Stock Moves">
1799 <group col="8" colspan="4">
1800- <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"/>
1801+ <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"/>
1802 <separator orientation="vertical"/>
1803 <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
1804 <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
1805@@ -1395,7 +1397,7 @@
1806 <field name="arch" type="xml">
1807 <search string="Stock Moves">
1808 <group col="8" colspan="4">
1809- <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"/>
1810+ <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"/>
1811 <separator orientation="vertical"/>
1812 <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)"/>
1813 <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
1814
1815=== modified file 'bin/addons/stock_override/stock_view.xml'
1816--- bin/addons/stock_override/stock_view.xml 2019-08-22 10:11:24 +0000
1817+++ bin/addons/stock_override/stock_view.xml 2019-10-30 13:23:31 +0000
1818@@ -660,7 +660,7 @@
1819 <field name="arch" type="xml">
1820 <search string="Stock Moves">
1821 <group col="14" colspan="4">
1822- <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"/>
1823+ <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"/>
1824 <separator orientation="vertical"/>
1825 <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
1826 <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
1827
1828=== modified file 'bin/addons/supplier_catalogue/supplier_catalogue_view.xml'
1829--- bin/addons/supplier_catalogue/supplier_catalogue_view.xml 2018-09-13 08:44:17 +0000
1830+++ bin/addons/supplier_catalogue/supplier_catalogue_view.xml 2019-10-30 13:23:31 +0000
1831@@ -13,7 +13,8 @@
1832 <field name="type">search</field>
1833 <field name="arch" type="xml">
1834 <search string="Supplier catalogues">
1835- <filter name="active" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
1836+ <filter icon="terp-personal+" name="active" string="Show Active" domain="[('active', '=', True)]" default="1" />
1837+ <filter icon="gtk-missing-image" name="inactive" string="Show Inactive" domain="[('active', '=', False)]" />
1838 <field name="partner_id" />
1839 <field name="name" />
1840 <field name="period_from" />
1841
1842=== modified file 'bin/addons/tender_flow/report/purchase_report_view.xml'
1843--- bin/addons/tender_flow/report/purchase_report_view.xml 2017-05-10 12:47:14 +0000
1844+++ bin/addons/tender_flow/report/purchase_report_view.xml 2019-10-30 13:23:31 +0000
1845@@ -52,16 +52,16 @@
1846 domain="[('invoiced','=', False)]" />
1847 <separator orientation="vertical"/>
1848 <filter icon="terp-go-year" string=" Year "
1849- domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
1850+ domain="['&amp;', ('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
1851 help="Order in current year"/>
1852 <filter icon="terp-go-month" string=" Month "
1853 name="month"
1854- 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'))]"
1855+ 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'))]"
1856 help="Order in current month"/>
1857 <filter icon="terp-go-month"
1858 string=" Month-1 "
1859 separator="1"
1860- 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'))]"
1861+ 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'))]"
1862 help="Order in last month"/>
1863 <separator orientation="vertical"/>
1864 <field name="order_name" />
1865
1866=== modified file 'bin/addons/useability_dashboard_and_menu/menu/partner_menu.xml'
1867--- bin/addons/useability_dashboard_and_menu/menu/partner_menu.xml 2013-02-07 15:27:53 +0000
1868+++ bin/addons/useability_dashboard_and_menu/menu/partner_menu.xml 2019-10-30 13:23:31 +0000
1869@@ -53,7 +53,7 @@
1870 <field name="res_model">res.partner</field>
1871 <field name="view_type">form</field>
1872 <field name="search_view_id" ref="base.view_res_partner_filter"/>
1873- <field name="context">{"search_default_manufacturer":1, 'show_button_show_inactive':1}</field>
1874+ <field name="context">{"search_default_manufacturer":1, 'show_button_show_inactive':1, 'search_default_active': 1, 'active_test': 0}</field>
1875 <field name="help">You see here Other/Manufacturer who can be both Customer and Supplier.</field>
1876 </record>
1877
1878@@ -65,18 +65,6 @@
1879 sequence="13"
1880 />
1881
1882- <!-- The 3 records below enable the user to see the button "Show inactive" -->
1883- <record id="base.action_partner_supplier_form" model="ir.actions.act_window">
1884- <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1, 'show_button_show_inactive':1}</field>
1885- </record>
1886-
1887- <record id="base.action_partner_customer_form" model="ir.actions.act_window">
1888- <field name="context">{'default_customer':1, 'search_default_customer':1, 'show_button_show_inactive':1}</field>
1889- </record>
1890-
1891- <record id="base.action_partner_form" model="ir.actions.act_window">
1892- <field name="context">{"search_default_customer":1, 'show_button_show_inactive':1}</field>
1893- </record>
1894
1895 </data>
1896-</openerp>
1897\ No newline at end of file
1898+</openerp>

Subscribers

People subscribed via source and target branches