Merge lp:~fabien-morin/unifield-server/fm-us-2869 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4460
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-2869
Merge into: lp:unifield-server
Diff against target: 204 lines (+17/-15)
14 files modified
bin/addons/account/account_invoice_view.xml (+1/-1)
bin/addons/account/account_view.xml (+1/-1)
bin/addons/account/partner_view.xml (+1/-1)
bin/addons/account/project/project_view.xml (+1/-1)
bin/addons/account/wizard/account_chart_view.xml (+1/-1)
bin/addons/account_override/account_invoice_view.xml (+2/-2)
bin/addons/account_period_closing_level/wizard/account_period_create_view.xml (+1/-1)
bin/addons/base/res/partner/partner_view.xml (+2/-2)
bin/addons/financing_contract/financing_contract_view.xml (+1/-1)
bin/addons/msf_budget/msf_budget_view.xml (+1/-1)
bin/addons/msf_doc_import/view/account_view.xml (+1/-1)
bin/addons/purchase_override/purchase_view.xml (+1/-0)
bin/addons/res_currency_tables/wizard/wizard_report_currency_table_view.xml (+2/-2)
bin/addons/sale/sale_view.xml (+1/-0)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-2869
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+327504@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_invoice_view.xml'
2--- bin/addons/account/account_invoice_view.xml 2017-05-15 12:11:44 +0000
3+++ bin/addons/account/account_invoice_view.xml 2017-07-17 07:08:38 +0000
4@@ -53,7 +53,7 @@
5 <form string="Invoice Line">
6 <notebook>
7 <page string="Line">
8- <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
9+ <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})" default_focus="1"/>
10 <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
11 <field name="quantity"/>
12 <field name="price_unit"/>
13
14=== modified file 'bin/addons/account/account_view.xml'
15--- bin/addons/account/account_view.xml 2017-05-26 10:03:57 +0000
16+++ bin/addons/account/account_view.xml 2017-07-17 07:08:38 +0000
17@@ -13,7 +13,7 @@
18 <field name="arch" type="xml">
19 <form string="Fiscalyear">
20 <group>
21- <field name="name"/>
22+ <field name="name" default_focus="1"/>
23 <field name="code"/>
24 <field name="date_start"/>
25 <field name="date_stop"/>
26
27=== modified file 'bin/addons/account/partner_view.xml'
28--- bin/addons/account/partner_view.xml 2016-11-04 12:57:37 +0000
29+++ bin/addons/account/partner_view.xml 2017-07-17 07:08:38 +0000
30@@ -97,7 +97,7 @@
31 <form string="Bank account">
32 <field name="state"/>
33 <newline/>
34- <field name="acc_number" select="1"/>
35+ <field name="acc_number" select="1" default_focus="1"/>
36 <newline/>
37 <field name="bank"/>
38 <newline/>
39
40=== modified file 'bin/addons/account/project/project_view.xml'
41--- bin/addons/account/project/project_view.xml 2017-05-23 08:07:52 +0000
42+++ bin/addons/account/project/project_view.xml 2017-07-17 07:08:38 +0000
43@@ -364,7 +364,7 @@
44 <field name="type">form</field>
45 <field name="arch" type="xml">
46 <form string="Analytic Journal">
47- <field name="name" select="1"/>
48+ <field name="name" select="1" default_focus="1"/>
49 <field name="code" select="1"/>
50 <field name="type" select="2"/>
51 <field name="active" select="2"/>
52
53=== modified file 'bin/addons/account/wizard/account_chart_view.xml'
54--- bin/addons/account/wizard/account_chart_view.xml 2011-01-14 00:11:01 +0000
55+++ bin/addons/account/wizard/account_chart_view.xml 2017-07-17 07:08:38 +0000
56@@ -8,7 +8,7 @@
57 <field name="arch" type="xml">
58 <form string="Account charts">
59 <group colspan="4">
60- <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
61+ <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)" default_focus="1"/>
62 <field name="target_move"/>
63 <label align="0.7" colspan="4" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
64 <separator string="Periods" colspan="4"/>
65
66=== modified file 'bin/addons/account_override/account_invoice_view.xml'
67--- bin/addons/account_override/account_invoice_view.xml 2017-07-06 10:30:34 +0000
68+++ bin/addons/account_override/account_invoice_view.xml 2017-07-17 07:08:38 +0000
69@@ -415,7 +415,7 @@
70 <field name="inactive_error" invisible="1" />
71 </tree>
72 <form string="Donation Line">
73- <field name="product_id" on_change="onchange_donation_product(product_id, quantity, parent.currency_id, context)"/>
74+ <field name="product_id" on_change="onchange_donation_product(product_id, quantity, parent.currency_id, context)" default_focus="1"/>
75 <field name="account_id" domain="[('restricted_area', '=', 'donation_lines')]"/>
76 <field name="name" colspan="4" />
77 <field name="quantity" on_change="onchange_donation_qty_price(quantity, price_unit, context)"/>
78@@ -536,7 +536,7 @@
79 <form string="Intermission Voucher Lines">
80 <notebook>
81 <page string="Line">
82- <field name="name"/>
83+ <field name="name" default_focus="1"/>
84 <field name="account_id" domain="[('restricted_area', '=', 'intermission_lines')]"/>
85 <field name="quantity"/>
86 <field name="uos_id" string="UOM" invisible="1"/>
87
88=== modified file 'bin/addons/account_period_closing_level/wizard/account_period_create_view.xml'
89--- bin/addons/account_period_closing_level/wizard/account_period_create_view.xml 2011-04-01 07:02:04 +0000
90+++ bin/addons/account_period_closing_level/wizard/account_period_create_view.xml 2017-07-17 07:08:38 +0000
91@@ -7,7 +7,7 @@
92 <field name="type">form</field>
93 <field name="arch" type="xml">
94 <form string="Create Period">
95- <field name="fiscalyear"/>
96+ <field name="fiscalyear" default_focus="1"/>
97 <separator string="" colspan="4"/>
98 <group colspan="4" col="6">
99 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
100
101=== modified file 'bin/addons/base/res/partner/partner_view.xml'
102--- bin/addons/base/res/partner/partner_view.xml 2011-07-01 06:58:37 +0000
103+++ bin/addons/base/res/partner/partner_view.xml 2017-07-17 07:08:38 +0000
104@@ -254,7 +254,7 @@
105 <form string="Partners" col='1'>
106 <group col="6" colspan="4">
107 <group colspan="5" col="6">
108- <field name="name" select="1"/>
109+ <field name="name" select="1" default_focus="1"/>
110 <field name="ref" groups="base.group_extended"/>
111 <field domain="[('domain', '=', 'partner')]" name="title" size="0" groups="base.group_extended" widget="selection"/>
112 <field name="lang"/>
113@@ -513,7 +513,7 @@
114 <field name="type">form</field>
115 <field name="arch" type="xml">
116 <form string="Partner Category">
117- <field name="name" select="1"/>
118+ <field name="name" select="1" default_focus="1"/>
119 <field name="active" groups="base.group_extended"/>
120 <field name="parent_id"/>
121 <separator colspan="4" string="Partners"/>
122
123=== modified file 'bin/addons/financing_contract/financing_contract_view.xml'
124--- bin/addons/financing_contract/financing_contract_view.xml 2017-05-10 12:47:14 +0000
125+++ bin/addons/financing_contract/financing_contract_view.xml 2017-07-17 07:08:38 +0000
126@@ -69,7 +69,7 @@
127 </tree>
128 <form string="Reporting lines">
129 <group colspan="4" col="4">
130- <field name="code" colspan="2"/>
131+ <field name="code" colspan="2" default_focus="1"/>
132 <field name="name" colspan="2"/>
133 </group>
134 <group colspan="4" col="4">
135
136=== modified file 'bin/addons/msf_budget/msf_budget_view.xml'
137--- bin/addons/msf_budget/msf_budget_view.xml 2017-05-10 12:47:14 +0000
138+++ bin/addons/msf_budget/msf_budget_view.xml 2017-07-17 07:08:38 +0000
139@@ -197,7 +197,7 @@
140 <field name="type">form</field>
141 <field name="arch" type="xml">
142 <form string="Local Expenses">
143- <field name="cost_center_id"/>
144+ <field name="cost_center_id" default_focus="1"/>
145 <field name="fiscalyear_id"/>
146 <field name="start_period_id"/>
147 <field name="end_period_id"/>
148
149=== modified file 'bin/addons/msf_doc_import/view/account_view.xml'
150--- bin/addons/msf_doc_import/view/account_view.xml 2014-09-16 13:04:24 +0000
151+++ bin/addons/msf_doc_import/view/account_view.xml 2017-07-17 07:08:38 +0000
152@@ -26,7 +26,7 @@
153 <newline/>
154 <field name="file" filename="filename" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
155 <field name="filename" invisible="1"/>
156- <field name="date" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
157+ <field name="date" attrs="{'invisible': [('state', '!=', 'draft')]}" default_focus="1"/>
158 <field name="progression" widget="progressbar" nolabel="1" attrs="{'invisible': [('state', '=', 'draft')]}" colspan="4" />
159 <field name="message" nolabel="1" attrs="{'invisible': [('state', '=', 'draft')]}"/>
160 <newline/>
161
162=== modified file 'bin/addons/purchase_override/purchase_view.xml'
163--- bin/addons/purchase_override/purchase_view.xml 2017-05-18 12:04:06 +0000
164+++ bin/addons/purchase_override/purchase_view.xml 2017-07-17 07:08:38 +0000
165@@ -347,6 +347,7 @@
166 context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id, available_for_restriction=parent.partner_type,search_default_not_restricted=1,categ=parent.categ"
167 on_change="product_id_on_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,parent.state,old_price_unit,nomen_manda_0,comment,context)"
168 attrs="{'readonly': [('tender_line_id', '!=', False)]}"
169+ default_focus="1"
170 />
171 <!-- domain="[('purchase_type', '=', parent.categ)] />" -->
172 </xpath>
173
174=== modified file 'bin/addons/res_currency_tables/wizard/wizard_report_currency_table_view.xml'
175--- bin/addons/res_currency_tables/wizard/wizard_report_currency_table_view.xml 2013-04-05 14:55:15 +0000
176+++ bin/addons/res_currency_tables/wizard/wizard_report_currency_table_view.xml 2017-07-17 07:08:38 +0000
177@@ -9,7 +9,7 @@
178 <field name="arch" type="xml">
179 <form string="FX rates by currency">
180 <group colspan="4" col="6">
181- <field name="currency_id"/>
182+ <field name="currency_id" default_focus="1"/>
183 <field name="start_period_id" widget="selection"/>
184 <field name="end_period_id" widget="selection"/>
185 </group>
186@@ -35,4 +35,4 @@
187 <menuitem action="action_report_currency_table_menu" id="menu_action_report_currency_table_form" parent="account.menu_finance_currency_mgmt"/>
188
189 </data>
190-</openerp>
191\ No newline at end of file
192+</openerp>
193
194=== modified file 'bin/addons/sale/sale_view.xml'
195--- bin/addons/sale/sale_view.xml 2017-05-03 15:54:38 +0000
196+++ bin/addons/sale/sale_view.xml 2017-07-17 07:08:38 +0000
197@@ -129,6 +129,7 @@
198 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
199 name="product_id"
200 on_change="product_id_on_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
201+ default_focus="1"
202 />
203 <field
204 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"

Subscribers

People subscribed via source and target branches