Merge lp:~openerp-dev/openobject-addons/trunk-improve-formviews-tpa into lp:openobject-addons
- trunk-improve-formviews-tpa
- Merge into trunk
Proposed by
Turkesh Patel (openERP)
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-improve-formviews-tpa |
| Merge into: | lp:openobject-addons |
| Diff against target: |
944 lines (+332/-365) 14 files modified
account/account_view.xml (+16/-18) crm/crm_view.xml (+3/-3) crm_profiling/crm_profiling_view.xml (+29/-34) fleet/fleet_view.xml (+39/-43) hr_holidays/hr_holidays_view.xml (+12/-14) hr_payroll/hr_payroll_view.xml (+1/-1) hr_recruitment/hr_recruitment_view.xml (+0/-6) lunch/lunch_view.xml (+38/-45) membership/membership_view.xml (+31/-33) mrp/mrp_view.xml (+78/-75) point_of_sale/point_of_sale_view.xml (+41/-43) procurement/procurement_view.xml (+26/-28) product/product_view.xml (+11/-13) resource/resource_view.xml (+7/-9) |
| To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-improve-formviews-tpa |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Core Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
[IMP] remove sheet from the forms which are used for configuration
[IMP] improved some ugly form views
To post a comment you must log in.
- 8843. By Turkesh Patel (openERP)
-
[IMP] removed conflict files
- 8844. By Turkesh Patel (openERP)
-
[MRG] merge with lp:openobject-addons
Unmerged revisions
- 8844. By Turkesh Patel (openERP)
-
[MRG] merge with lp:openobject-addons
- 8843. By Turkesh Patel (openERP)
-
[IMP] removed conflict files
- 8842. By Turkesh Patel (openERP)
-
[MRG] merge with lp:openobject-addons
- 8841. By Turkesh Patel (openERP)
-
[MRG] merge with lp:openobject-addons
- 8840. By Turkesh Patel (openERP)
-
[MRG] merge with lp:openobject-addons
- 8839. By Turkesh Patel (openERP)
-
[MRG] merge with lp:openobject-addons
- 8838. By Turkesh Patel (openERP)
-
[MRG] merge with lp:openobject-addons
- 8837. By Turkesh Patel (openERP)
-
[IMP] improved place holders
- 8836. By Turkesh Patel (openERP)
-
[MRG] merge with lp:openobject-addons
- 8835. By Turkesh Patel (openERP)
-
[MRG] remove sheet from configuration form views lp:~openerp-dev/openobject-addons/trunk-improve-configuration-formviews-cod
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'account/account_view.xml' |
| 2 | --- account/account_view.xml 2014-05-02 13:07:53 +0000 |
| 3 | +++ account/account_view.xml 2014-05-06 12:16:18 +0000 |
| 4 | @@ -100,24 +100,22 @@ |
| 5 | <button name="action_draft" states="done" string="Re-Open Period" type="object" groups="account.group_account_manager"/> |
| 6 | <field name="state" widget="statusbar" nolabel="1"/> |
| 7 | </header> |
| 8 | - <sheet> |
| 9 | - <group> |
| 10 | - <group> |
| 11 | - <field name="name"/> |
| 12 | - <field name="fiscalyear_id" widget="selection"/> |
| 13 | - <label for="date_start" string="Duration"/> |
| 14 | - <div> |
| 15 | - <field name="date_start" class="oe_inline" nolabel="1"/> - |
| 16 | - <field name="date_stop" nolabel="1" class="oe_inline"/> |
| 17 | - </div> |
| 18 | - </group> |
| 19 | - <group> |
| 20 | - <field name="code"/> |
| 21 | - <field name="special"/> |
| 22 | - <field name="company_id" widget="selection" groups="base.group_multi_company"/> |
| 23 | - </group> |
| 24 | - </group> |
| 25 | - </sheet> |
| 26 | + <group> |
| 27 | + <group> |
| 28 | + <field name="name"/> |
| 29 | + <field name="fiscalyear_id" widget="selection"/> |
| 30 | + <label for="date_start" string="Duration"/> |
| 31 | + <div> |
| 32 | + <field name="date_start" class="oe_inline" nolabel="1"/> - |
| 33 | + <field name="date_stop" nolabel="1" class="oe_inline"/> |
| 34 | + </div> |
| 35 | + </group> |
| 36 | + <group> |
| 37 | + <field name="code"/> |
| 38 | + <field name="special"/> |
| 39 | + <field name="company_id" widget="selection" groups="base.group_multi_company"/> |
| 40 | + </group> |
| 41 | + </group> |
| 42 | </form> |
| 43 | </field> |
| 44 | </record> |
| 45 | |
| 46 | === modified file 'crm/crm_view.xml' |
| 47 | --- crm/crm_view.xml 2013-12-10 09:33:07 +0000 |
| 48 | +++ crm/crm_view.xml 2014-05-06 12:16:18 +0000 |
| 49 | @@ -258,14 +258,14 @@ |
| 50 | <field name="exclusif"/> |
| 51 | </group> |
| 52 | <notebook> |
| 53 | - <page string="Sales Purchase"> |
| 54 | + <page string="Sales Purchase" name="sale_purchase"> |
| 55 | <group> |
| 56 | <field name="sales_purchase_active"/> |
| 57 | </group> |
| 58 | - <separator string="Segmentation Test"/> |
| 59 | + <separator string="Segmentation Test Criteria"/> |
| 60 | <field name="segmentation_line" widget="one2many_list"/> |
| 61 | </page> |
| 62 | - <page string="Description"> |
| 63 | + <page string="Description" name="description"> |
| 64 | <field name="description"/> |
| 65 | </page> |
| 66 | </notebook> |
| 67 | |
| 68 | === modified file 'crm_profiling/crm_profiling_view.xml' |
| 69 | --- crm_profiling/crm_profiling_view.xml 2012-11-29 22:26:45 +0000 |
| 70 | +++ crm_profiling/crm_profiling_view.xml 2014-05-06 12:16:18 +0000 |
| 71 | @@ -137,47 +137,42 @@ |
| 72 | |
| 73 | <!-- CRM Segmentation Form view --> |
| 74 | |
| 75 | - <record model="ir.ui.view" id="crm.crm_segmentation-view"> |
| 76 | + <record model="ir.ui.view" id="crm_segmentation_profiling_view"> |
| 77 | <field name="name">crm.segmentation.form</field> |
| 78 | <field name="model">crm.segmentation</field> |
| 79 | + <field name="inherit_id" ref="crm.crm_segmentation-view"/> |
| 80 | <field name="arch" type="xml"> |
| 81 | - <form string="Partner Segmentation"> |
| 82 | - <notebook> |
| 83 | + <page name="sale_purchase" position="before"> |
| 84 | <page string="Segmentation"> |
| 85 | - <separator string="Segmentation Description" colspan="4"/> |
| 86 | - <field name="name"/> |
| 87 | - <field name="exclusif"/> |
| 88 | - <newline/> |
| 89 | - <field name="categ_id" colspan="2"/> |
| 90 | - <newline/> |
| 91 | - <field name="description" colspan="4"/> |
| 92 | - <field name="state"/> |
| 93 | - <group col="3" colspan="2"> |
| 94 | - <button name="process_start" |
| 95 | - states="not running" string="Compute Segmentation" type="object" |
| 96 | - icon="gtk-apply" /> |
| 97 | - <button name="process_stop" states="running" |
| 98 | - string="Stop Process" type="object" icon="gtk-stop" /> |
| 99 | - <button name="process_continue" states="running" |
| 100 | - string="Continue Process" type="object" icon="gtk-go-forward" /> |
| 101 | + <group col="4"> |
| 102 | + <field name="name"/> |
| 103 | + <field name="exclusif"/> |
| 104 | + <field name="categ_id"/> |
| 105 | </group> |
| 106 | - </page> |
| 107 | - <page string="Sales Purchase"> |
| 108 | - <field name="sales_purchase_active"/> |
| 109 | - <separator string="Segmentation Test" colspan="4"/> |
| 110 | - <field name="segmentation_line" widget="one2many_list" colspan="4"/> |
| 111 | - </page> |
| 112 | + <separator string="Segmentation Description"/> |
| 113 | + <field name="description" nolabel="1"/> |
| 114 | + </page> |
| 115 | + </page> |
| 116 | + <page name="description" position="replace"> |
| 117 | <page string="Profiling"> |
| 118 | - <field name="profiling_active" colspan="2"/> |
| 119 | - <separator string="Profiling Options" colspan="4"/> |
| 120 | - <field name="parent_id" colspan="2"/><newline/> |
| 121 | - <separator string="Included Answers :" colspan="2" /> |
| 122 | - <separator string="Excluded Answers :" colspan="2"/> |
| 123 | - <field name="answer_yes" nolabel="1" colspan="2"/> |
| 124 | - <field name="answer_no" nolabel="1" colspan="2"/> |
| 125 | + <group> |
| 126 | + <group> |
| 127 | + <field name="profiling_active"/> |
| 128 | + <separator string="Profiling Options" colspan="4"/> |
| 129 | + <field name="parent_id"/> |
| 130 | + </group> |
| 131 | + <newline/> |
| 132 | + <group> |
| 133 | + <separator string="Included Answers"/> |
| 134 | + <field name="answer_yes" nolabel="1" colspan="2"/> |
| 135 | + </group> |
| 136 | + <group> |
| 137 | + <separator string="Excluded Answers"/> |
| 138 | + <field name="answer_no" nolabel="1" colspan="2"/> |
| 139 | + </group> |
| 140 | + </group> |
| 141 | </page> |
| 142 | - </notebook> |
| 143 | - </form> |
| 144 | + </page> |
| 145 | </field> |
| 146 | </record> |
| 147 | |
| 148 | |
| 149 | === modified file 'fleet/fleet_view.xml' |
| 150 | --- fleet/fleet_view.xml 2014-03-28 13:30:51 +0000 |
| 151 | +++ fleet/fleet_view.xml 2014-05-06 12:16:18 +0000 |
| 152 | @@ -6,40 +6,38 @@ |
| 153 | <field name="model">fleet.vehicle.model</field> |
| 154 | <field name="arch" type="xml"> |
| 155 | <form string="Model" version="7.0"> |
| 156 | - <sheet> |
| 157 | - <field name="image_medium" widget='image' class="oe_left oe_avatar"/> |
| 158 | - <div class="oe_title"> |
| 159 | - <label for="modelname" class="oe_edit_only"/> |
| 160 | - <h1> |
| 161 | - <field name="modelname" /> |
| 162 | - </h1> |
| 163 | - <label for="brand_id" class="oe_edit_only"/> |
| 164 | - <h2> |
| 165 | - <field name="brand_id" on_change="on_change_brand(brand_id)"/> |
| 166 | - </h2> |
| 167 | - </div> |
| 168 | - <notebook> |
| 169 | - <page string="Vendors"> |
| 170 | - <field name="vendors" widget="many2many_kanban"> |
| 171 | - <kanban quick_create="false" create="true"> |
| 172 | - <field name="name"/> |
| 173 | - <templates> |
| 174 | - <t t-name="kanban-box"> |
| 175 | - <div style="position: relative"> |
| 176 | - <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a> |
| 177 | - <div class="oe_module_vignette"> |
| 178 | - <div class="oe_module_desc"> |
| 179 | - <field name="name"/> |
| 180 | - </div> |
| 181 | + <field name="image_medium" widget='image' class="oe_left oe_avatar"/> |
| 182 | + <div class="oe_title"> |
| 183 | + <label for="modelname" class="oe_edit_only"/> |
| 184 | + <h1> |
| 185 | + <field name="modelname" /> |
| 186 | + </h1> |
| 187 | + <label for="brand_id" class="oe_edit_only"/> |
| 188 | + <h2> |
| 189 | + <field name="brand_id" on_change="on_change_brand(brand_id)"/> |
| 190 | + </h2> |
| 191 | + </div> |
| 192 | + <notebook> |
| 193 | + <page string="Vendors"> |
| 194 | + <field name="vendors" widget="many2many_kanban"> |
| 195 | + <kanban quick_create="false" create="true"> |
| 196 | + <field name="name"/> |
| 197 | + <templates> |
| 198 | + <t t-name="kanban-box"> |
| 199 | + <div style="position: relative"> |
| 200 | + <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a> |
| 201 | + <div class="oe_module_vignette"> |
| 202 | + <div class="oe_module_desc"> |
| 203 | + <field name="name"/> |
| 204 | </div> |
| 205 | </div> |
| 206 | - </t> |
| 207 | - </templates> |
| 208 | - </kanban> |
| 209 | - </field> |
| 210 | - </page> |
| 211 | - </notebook> |
| 212 | - </sheet> |
| 213 | + </div> |
| 214 | + </t> |
| 215 | + </templates> |
| 216 | + </kanban> |
| 217 | + </field> |
| 218 | + </page> |
| 219 | + </notebook> |
| 220 | </form> |
| 221 | </field> |
| 222 | </record> |
| 223 | @@ -98,17 +96,15 @@ |
| 224 | <field name="model">fleet.vehicle.model.brand</field> |
| 225 | <field name="arch" type="xml"> |
| 226 | <form string="Model Brand" version="7.0"> |
| 227 | - <sheet> |
| 228 | - <group> |
| 229 | - <div> |
| 230 | - <field name="image_medium" widget="image" class="oe_left oe_avatar"/> |
| 231 | - <label for="name" class="oe_edit_only"/> |
| 232 | - <h1> |
| 233 | - <field name="name" class="oe_inline" /> |
| 234 | - </h1> |
| 235 | - </div> |
| 236 | - </group> |
| 237 | - </sheet> |
| 238 | + <group> |
| 239 | + <div> |
| 240 | + <field name="image_medium" widget="image" class="oe_left oe_avatar"/> |
| 241 | + <label for="name" class="oe_edit_only"/> |
| 242 | + <h1> |
| 243 | + <field name="name" class="oe_inline" /> |
| 244 | + </h1> |
| 245 | + </div> |
| 246 | + </group> |
| 247 | </form> |
| 248 | </field> |
| 249 | </record> |
| 250 | |
| 251 | === modified file 'hr_holidays/hr_holidays_view.xml' |
| 252 | --- hr_holidays/hr_holidays_view.xml 2014-03-26 12:00:56 +0000 |
| 253 | +++ hr_holidays/hr_holidays_view.xml 2014-05-06 12:16:18 +0000 |
| 254 | @@ -342,26 +342,24 @@ |
| 255 | <field name="model">hr.holidays.status</field> |
| 256 | <field name="arch" type="xml"> |
| 257 | <form string="Leave Type" version="7.0"> |
| 258 | - <sheet string="Leave Type"> |
| 259 | <group col="4"> |
| 260 | <field name="name"/> |
| 261 | <field name="categ_id"/> |
| 262 | </group> |
| 263 | <notebook> |
| 264 | - <page string="Details"> |
| 265 | - <group> |
| 266 | - <group name="selection" string="Validation"> |
| 267 | - <field name="double_validation"/> |
| 268 | - <field name="limit"/> |
| 269 | - </group> |
| 270 | - <group name="second" string="Misc"> |
| 271 | - <field name="color_name"/> |
| 272 | - <field name="active"/> |
| 273 | - </group> |
| 274 | - </group> |
| 275 | - </page> |
| 276 | + <page string="Details"> |
| 277 | + <group> |
| 278 | + <group name="selection" string="Validation"> |
| 279 | + <field name="double_validation"/> |
| 280 | + <field name="limit"/> |
| 281 | + </group> |
| 282 | + <group name="second" string="Misc"> |
| 283 | + <field name="color_name"/> |
| 284 | + <field name="active"/> |
| 285 | + </group> |
| 286 | + </group> |
| 287 | + </page> |
| 288 | </notebook> |
| 289 | - </sheet> |
| 290 | </form> |
| 291 | </field> |
| 292 | </record> |
| 293 | |
| 294 | === modified file 'hr_payroll/hr_payroll_view.xml' |
| 295 | --- hr_payroll/hr_payroll_view.xml 2014-05-02 13:07:53 +0000 |
| 296 | +++ hr_payroll/hr_payroll_view.xml 2014-05-06 12:16:18 +0000 |
| 297 | @@ -408,7 +408,7 @@ |
| 298 | <field name="name">hr.salary.rule.category.form</field> |
| 299 | <field name="model">hr.salary.rule.category</field> |
| 300 | <field name="arch" type="xml"> |
| 301 | - <form string="Salary Categories"> |
| 302 | + <form string="Salary Categories" version="7.0"> |
| 303 | <group col="4"> |
| 304 | <field name="name"/> |
| 305 | <field name="code"/> |
| 306 | |
| 307 | === modified file 'hr_recruitment/hr_recruitment_view.xml' |
| 308 | --- hr_recruitment/hr_recruitment_view.xml 2014-04-15 15:01:46 +0000 |
| 309 | +++ hr_recruitment/hr_recruitment_view.xml 2014-05-06 12:16:18 +0000 |
| 310 | @@ -541,7 +541,6 @@ |
| 311 | <field name="model">hr.recruitment.stage</field> |
| 312 | <field name="arch" type="xml"> |
| 313 | <form string="Stage" version="7.0"> |
| 314 | - <sheet> |
| 315 | <group string="Stage Definition"> |
| 316 | <group> |
| 317 | <field name="name"/> |
| 318 | @@ -555,7 +554,6 @@ |
| 319 | </group> |
| 320 | <separator string="Requirements"/> |
| 321 | <field name="requirements"/> |
| 322 | - </sheet> |
| 323 | </form> |
| 324 | </field> |
| 325 | </record> |
| 326 | @@ -601,12 +599,10 @@ |
| 327 | <field name="model">hr.recruitment.degree</field> |
| 328 | <field name="arch" type="xml"> |
| 329 | <form string="Degree" version="7.0"> |
| 330 | - <sheet> |
| 331 | <group> |
| 332 | <field name="name"/> |
| 333 | <field name="sequence" groups="base.group_no_one"/> |
| 334 | </group> |
| 335 | - </sheet> |
| 336 | </form> |
| 337 | </field> |
| 338 | </record> |
| 339 | @@ -641,11 +637,9 @@ |
| 340 | <field name="model">hr.recruitment.source</field> |
| 341 | <field name="arch" type="xml"> |
| 342 | <form string="Sources of Applicants" version="7.0"> |
| 343 | - <sheet> |
| 344 | <group> |
| 345 | <field name="name"/> |
| 346 | </group> |
| 347 | - </sheet> |
| 348 | </form> |
| 349 | </field> |
| 350 | </record> |
| 351 | |
| 352 | === modified file 'lunch/lunch_view.xml' |
| 353 | --- lunch/lunch_view.xml 2014-04-18 11:59:13 +0000 |
| 354 | +++ lunch/lunch_view.xml 2014-05-06 12:16:18 +0000 |
| 355 | @@ -293,11 +293,9 @@ |
| 356 | <field name="model">lunch.product.category</field> |
| 357 | <field name="arch" type="xml"> |
| 358 | <form string="Products Form" version="7.0"> |
| 359 | - <sheet> |
| 360 | <group> |
| 361 | <field name='name' string="Product Category: "/> |
| 362 | </group> |
| 363 | - </sheet> |
| 364 | </form> |
| 365 | </field> |
| 366 | </record> |
| 367 | @@ -425,20 +423,18 @@ |
| 368 | <form string="Products Form" version="7.0"> |
| 369 | <header> |
| 370 | </header> |
| 371 | - <sheet> |
| 372 | - <group> |
| 373 | - <group> |
| 374 | - <field name='name'/> |
| 375 | - <field name='category_id'/> |
| 376 | - </group> |
| 377 | - <group> |
| 378 | - <field name='supplier'/> |
| 379 | - <field name='price'/> |
| 380 | - </group> |
| 381 | - </group> |
| 382 | - <label for='description'/> |
| 383 | - <field name='description'/> |
| 384 | - </sheet> |
| 385 | + <group> |
| 386 | + <group> |
| 387 | + <field name='name'/> |
| 388 | + <field name='category_id'/> |
| 389 | + </group> |
| 390 | + <group> |
| 391 | + <field name='supplier'/> |
| 392 | + <field name='price'/> |
| 393 | + </group> |
| 394 | + </group> |
| 395 | + <label for='description'/> |
| 396 | + <field name='description'/> |
| 397 | </form> |
| 398 | </field> |
| 399 | </record> |
| 400 | @@ -462,35 +458,32 @@ |
| 401 | <field name="model">lunch.alert</field> |
| 402 | <field name="arch" type="xml"> |
| 403 | <form string="alert tree" version="7.0"> |
| 404 | - <sheet> |
| 405 | - <group string="Schedule Date"> |
| 406 | - <group> |
| 407 | - <field name="alter_type" class="oe_inline"/> |
| 408 | - <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/> |
| 409 | - </group> |
| 410 | - </group> |
| 411 | - <group attrs="{'invisible': [('alter_type','!=','week')]}"> |
| 412 | - <group> |
| 413 | - <field name="monday"/> |
| 414 | - <field name="tuesday"/> |
| 415 | - <field name="wednesday"/> |
| 416 | - <field name="thursday"/> |
| 417 | - </group> |
| 418 | - <group> |
| 419 | - <field name="friday"/> |
| 420 | - <field name="saturday"/> |
| 421 | - <field name="sunday"/> |
| 422 | - </group> |
| 423 | - </group> |
| 424 | - <group string="Schedule Hour"> |
| 425 | - <field name='active_from' widget='float_time'/> |
| 426 | - <field name='active_to' widget='float_time'/> |
| 427 | - </group> |
| 428 | - <group string='Message'> |
| 429 | - <field name='message' nolabel='1' placeholder="Write the message you want to display during the defined period..."/> |
| 430 | - </group> |
| 431 | - |
| 432 | - </sheet> |
| 433 | + <group string="Schedule Date"> |
| 434 | + <group> |
| 435 | + <field name="alter_type" class="oe_inline"/> |
| 436 | + <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/> |
| 437 | + </group> |
| 438 | + </group> |
| 439 | + <group attrs="{'invisible': [('alter_type','!=','week')]}"> |
| 440 | + <group> |
| 441 | + <field name="monday"/> |
| 442 | + <field name="tuesday"/> |
| 443 | + <field name="wednesday"/> |
| 444 | + <field name="thursday"/> |
| 445 | + </group> |
| 446 | + <group> |
| 447 | + <field name="friday"/> |
| 448 | + <field name="saturday"/> |
| 449 | + <field name="sunday"/> |
| 450 | + </group> |
| 451 | + </group> |
| 452 | + <group string="Schedule Hour"> |
| 453 | + <field name='active_from' widget='float_time'/> |
| 454 | + <field name='active_to' widget='float_time'/> |
| 455 | + </group> |
| 456 | + <group string='Message'> |
| 457 | + <field name='message' nolabel='1' placeholder="Write the message you want to display during the defined period..."/> |
| 458 | + </group> |
| 459 | </form> |
| 460 | </field> |
| 461 | </record> |
| 462 | |
| 463 | === modified file 'membership/membership_view.xml' |
| 464 | --- membership/membership_view.xml 2013-10-27 12:31:04 +0000 |
| 465 | +++ membership/membership_view.xml 2014-05-06 12:16:18 +0000 |
| 466 | @@ -44,39 +44,37 @@ |
| 467 | <field name="model">product.product</field> |
| 468 | <field name="arch" type="xml"> |
| 469 | <form string="Membership products" version="7.0"> |
| 470 | - <sheet> |
| 471 | - <label for="name" class="oe_edit_only"/> |
| 472 | - <h1> |
| 473 | - <field name="name"/> |
| 474 | - </h1> |
| 475 | - <group> |
| 476 | - <group> |
| 477 | - <field name="default_code"/> |
| 478 | - <field name="categ_id"/> |
| 479 | - <field name="membership" invisible="1"/> |
| 480 | - <field name="company_id" |
| 481 | - groups="base.group_multi_company" |
| 482 | - widget="selection"/> |
| 483 | - <field name="active"/> |
| 484 | - </group> |
| 485 | - <group> |
| 486 | - <label for="membership_date_from" string="Membership Duration"/> |
| 487 | - <div> |
| 488 | - <field name="membership_date_from" required="1" class="oe_inline"/> - |
| 489 | - <field name="membership_date_to" required="1" class="oe_inline"/> |
| 490 | - </div> |
| 491 | - <field name="list_price" string="Membership Fee"/> |
| 492 | - <field |
| 493 | - name="property_account_income" |
| 494 | - domain="[('type', '!=', 'view')]"/> |
| 495 | - <field name="taxes_id" widget="many2many_tags" string="Taxes"/> |
| 496 | - </group> |
| 497 | - </group> |
| 498 | - <label for="description"/> |
| 499 | - <field colspan="4" name="description" placeholder="Add a description..."/> |
| 500 | - <label for="description_sale"/> |
| 501 | - <field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/> |
| 502 | - </sheet> |
| 503 | + <label for="name" class="oe_edit_only"/> |
| 504 | + <h1> |
| 505 | + <field name="name"/> |
| 506 | + </h1> |
| 507 | + <group> |
| 508 | + <group> |
| 509 | + <field name="default_code"/> |
| 510 | + <field name="categ_id"/> |
| 511 | + <field name="membership" invisible="1"/> |
| 512 | + <field name="company_id" |
| 513 | + groups="base.group_multi_company" |
| 514 | + widget="selection"/> |
| 515 | + <field name="active"/> |
| 516 | + </group> |
| 517 | + <group> |
| 518 | + <label for="membership_date_from" string="Membership Duration"/> |
| 519 | + <div> |
| 520 | + <field name="membership_date_from" required="1" class="oe_inline"/> - |
| 521 | + <field name="membership_date_to" required="1" class="oe_inline"/> |
| 522 | + </div> |
| 523 | + <field name="list_price" string="Membership Fee"/> |
| 524 | + <field |
| 525 | + name="property_account_income" |
| 526 | + domain="[('type', '!=', 'view')]"/> |
| 527 | + <field name="taxes_id" widget="many2many_tags" string="Taxes"/> |
| 528 | + </group> |
| 529 | + </group> |
| 530 | + <label for="description"/> |
| 531 | + <field colspan="4" name="description" placeholder="Add a description..."/> |
| 532 | + <label for="description_sale"/> |
| 533 | + <field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/> |
| 534 | </form> |
| 535 | </field> |
| 536 | </record> |
| 537 | |
| 538 | === modified file 'mrp/mrp_view.xml' |
| 539 | --- mrp/mrp_view.xml 2014-05-02 13:07:53 +0000 |
| 540 | +++ mrp/mrp_view.xml 2014-05-06 12:16:18 +0000 |
| 541 | @@ -27,10 +27,11 @@ |
| 542 | <field name="model">mrp.property.group</field> |
| 543 | <field name="arch" type="xml"> |
| 544 | <form string="Properties categories" version="7.0"> |
| 545 | - <label for="name"/> |
| 546 | - <field name="name"/> |
| 547 | - <label for="description"/> |
| 548 | - <field name="description"/> |
| 549 | + <group> |
| 550 | + <field name="name"/> |
| 551 | + </group> |
| 552 | + <separator string="Description"/> |
| 553 | + <field name="description" nolabel="1"/> |
| 554 | </form> |
| 555 | </field> |
| 556 | </record> |
| 557 | @@ -84,8 +85,8 @@ |
| 558 | <field name="group_id"/> |
| 559 | <field name="composition"/> |
| 560 | </group> |
| 561 | - <label for="description"/> |
| 562 | - <field name="description"/> |
| 563 | + <separator string="Description"/> |
| 564 | + <field name="description" nolabel="1"/> |
| 565 | </form> |
| 566 | </field> |
| 567 | </record> |
| 568 | @@ -198,8 +199,8 @@ |
| 569 | <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/> |
| 570 | </group> |
| 571 | </group> |
| 572 | - <label for="note"/> |
| 573 | - <field name="note"/> |
| 574 | + <separator string="Description"/> |
| 575 | + <field name="note" nolabel="1"/> |
| 576 | </page> |
| 577 | </notebook> |
| 578 | </form> |
| 579 | @@ -345,73 +346,75 @@ |
| 580 | <field name="model">mrp.bom</field> |
| 581 | <field name="arch" type="xml"> |
| 582 | <form string="Bill of Material" version="7.0"> |
| 583 | - <group> |
| 584 | - <group> |
| 585 | - <field name="product_id" on_change="onchange_product_id(product_id, name, product_qty, context)" context="{'default_supply_method':'produce'}" class="oe_inline"/> |
| 586 | - <label for="product_qty" string="Quantity"/> |
| 587 | - <div> |
| 588 | - <field name="product_qty" class="oe_inline" on_change="onchange_product_id(product_id, name, product_qty, context)"/> |
| 589 | - <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/> |
| 590 | - </div> |
| 591 | - <label for="product_uos_qty" groups="product.group_uos"/> |
| 592 | - <div groups="product.group_uos" > |
| 593 | - <field name="product_uos_qty" |
| 594 | - class="oe_inline"/> |
| 595 | - <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> |
| 596 | - <field name="product_uos" class="oe_inline"/> |
| 597 | - </div> |
| 598 | - <label for="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/> |
| 599 | - <div groups="mrp.group_mrp_routings"> |
| 600 | - <field name="routing_id" class="oe_inline"/> |
| 601 | - </div> |
| 602 | - </group> |
| 603 | - <group> |
| 604 | - <field name="name" groups="product.group_mrp_properties"/> |
| 605 | - <field name="code" string="Reference"/> |
| 606 | - <field name="type"/> |
| 607 | - <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}"> |
| 608 | - When processing a sales order for this product, the delivery order |
| 609 | - will contain the raw materials, instead of the finished product. |
| 610 | - </p> |
| 611 | - <field name="company_id" groups="base.group_multi_company" widget="selection"/> |
| 612 | - </group> |
| 613 | - </group> |
| 614 | - <notebook> |
| 615 | - <page string="Components"> |
| 616 | - <field name="bom_lines" widget="one2many_list"> |
| 617 | - <tree string="Components" editable="bottom"> |
| 618 | - <field name="product_id" context="{'default_supply_method':'produce'}" on_change="onchange_product_id(product_id, name)"/> |
| 619 | - <field name="product_qty"/> |
| 620 | - <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/> |
| 621 | - <field name="name" invisible="1"/> |
| 622 | - <field name="date_start"/> |
| 623 | - <field name="date_stop"/> |
| 624 | - </tree> |
| 625 | - </field> |
| 626 | - </page> |
| 627 | - <page string="Properties" groups="product.group_mrp_properties"> |
| 628 | - <group> |
| 629 | - <group> |
| 630 | - <field name="position"/> |
| 631 | - <field name="bom_id"/> |
| 632 | - <field name="sequence"/> |
| 633 | - <field name="active"/> |
| 634 | - </group> |
| 635 | - <group> |
| 636 | - <field name="date_start"/> |
| 637 | - <field name="date_stop"/> |
| 638 | - <field name="product_rounding"/> |
| 639 | - <field name="product_efficiency"/> |
| 640 | - </group> |
| 641 | - </group> |
| 642 | - <separator string="Properties"/> |
| 643 | - <field name="property_ids" widget="many2many_tags"/> |
| 644 | - </page> |
| 645 | - </notebook> |
| 646 | - <div class="oe_chatter"> |
| 647 | - <field name="message_follower_ids" widget="mail_followers"/> |
| 648 | - <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> |
| 649 | - </div> |
| 650 | + <sheet> |
| 651 | + <group> |
| 652 | + <group> |
| 653 | + <field name="product_id" on_change="onchange_product_id(product_id, name, product_qty, context)" context="{'default_supply_method':'produce'}" class="oe_inline"/> |
| 654 | + <label for="product_qty" string="Quantity"/> |
| 655 | + <div> |
| 656 | + <field name="product_qty" class="oe_inline" on_change="onchange_product_id(product_id, name, product_qty, context)"/> |
| 657 | + <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/> |
| 658 | + </div> |
| 659 | + <label for="product_uos_qty" groups="product.group_uos"/> |
| 660 | + <div groups="product.group_uos" > |
| 661 | + <field name="product_uos_qty" |
| 662 | + class="oe_inline"/> |
| 663 | + <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> |
| 664 | + <field name="product_uos" class="oe_inline"/> |
| 665 | + </div> |
| 666 | + <label for="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/> |
| 667 | + <div groups="mrp.group_mrp_routings"> |
| 668 | + <field name="routing_id" class="oe_inline"/> |
| 669 | + </div> |
| 670 | + </group> |
| 671 | + <group> |
| 672 | + <field name="name" groups="product.group_mrp_properties"/> |
| 673 | + <field name="code" string="Reference"/> |
| 674 | + <field name="type"/> |
| 675 | + <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}"> |
| 676 | + When processing a sales order for this product, the delivery order |
| 677 | + will contain the raw materials, instead of the finished product. |
| 678 | + </p> |
| 679 | + <field name="company_id" groups="base.group_multi_company" widget="selection"/> |
| 680 | + </group> |
| 681 | + </group> |
| 682 | + <notebook> |
| 683 | + <page string="Components"> |
| 684 | + <field name="bom_lines" widget="one2many_list"> |
| 685 | + <tree string="Components" editable="bottom"> |
| 686 | + <field name="product_id" context="{'default_supply_method':'produce'}" on_change="onchange_product_id(product_id, name)"/> |
| 687 | + <field name="product_qty"/> |
| 688 | + <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/> |
| 689 | + <field name="name" invisible="1"/> |
| 690 | + <field name="date_start"/> |
| 691 | + <field name="date_stop"/> |
| 692 | + </tree> |
| 693 | + </field> |
| 694 | + </page> |
| 695 | + <page string="Properties" groups="product.group_mrp_properties"> |
| 696 | + <group> |
| 697 | + <group> |
| 698 | + <field name="position"/> |
| 699 | + <field name="bom_id"/> |
| 700 | + <field name="sequence"/> |
| 701 | + <field name="active"/> |
| 702 | + </group> |
| 703 | + <group> |
| 704 | + <field name="date_start"/> |
| 705 | + <field name="date_stop"/> |
| 706 | + <field name="product_rounding"/> |
| 707 | + <field name="product_efficiency"/> |
| 708 | + </group> |
| 709 | + </group> |
| 710 | + <separator string="Properties"/> |
| 711 | + <field name="property_ids" widget="many2many_tags"/> |
| 712 | + </page> |
| 713 | + </notebook> |
| 714 | + <div class="oe_chatter"> |
| 715 | + <field name="message_follower_ids" widget="mail_followers"/> |
| 716 | + <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> |
| 717 | + </div> |
| 718 | + </sheet> |
| 719 | </form> |
| 720 | </field> |
| 721 | </record> |
| 722 | |
| 723 | === modified file 'point_of_sale/point_of_sale_view.xml' |
| 724 | --- point_of_sale/point_of_sale_view.xml 2014-05-02 13:07:53 +0000 |
| 725 | +++ point_of_sale/point_of_sale_view.xml 2014-05-06 12:16:18 +0000 |
| 726 | @@ -715,49 +715,47 @@ |
| 727 | </div> |
| 728 | </header> |
| 729 | |
| 730 | - <sheet> |
| 731 | - <label for="name" class="oe_edit_only"/> |
| 732 | - <h1> |
| 733 | - <field name="name"/> |
| 734 | - </h1> |
| 735 | - <group col="4"> |
| 736 | - <field name="warehouse_id" widget="selection" groups="stock.group_locations" /> |
| 737 | - <field name="pricelist_id" groups="product.group_sale_pricelist"/> |
| 738 | - <field name="currency_id" invisible="1"/> |
| 739 | - <field name="journal_id" widget="selection"/> |
| 740 | - <field name="group_by" groups="account.group_account_user"/> |
| 741 | - <field name="sequence_id" readonly="1" groups="base.group_no_one"/> |
| 742 | - </group> |
| 743 | - <separator string="Available Payment Methods" colspan="4"/> |
| 744 | - <field name="journal_ids" colspan="4" nolabel="1"> |
| 745 | - <tree string="Journals"> |
| 746 | - <field name="code" /> |
| 747 | - <field name="name" /> |
| 748 | - <field name="type" /> |
| 749 | - <field name="cash_control" /> |
| 750 | - </tree> |
| 751 | - </field> |
| 752 | - <group string="Features" > |
| 753 | - <group> |
| 754 | - <field name="iface_vkeyboard" /> |
| 755 | - <field name="iface_invoicing" /> |
| 756 | - </group> |
| 757 | - <group> |
| 758 | - <field name="iface_big_scrollbars" /> |
| 759 | - </group> |
| 760 | - </group> |
| 761 | - <group string="Hardware Proxy" > |
| 762 | - <field name="proxy_ip" /> |
| 763 | - <field name="iface_print_via_proxy" /> |
| 764 | - <field name="iface_scan_via_proxy" /> |
| 765 | - <field name="iface_electronic_scale" /> |
| 766 | - <field name="iface_cashdrawer" /> |
| 767 | - </group> |
| 768 | - <group string="Receipt" > |
| 769 | - <field name="receipt_header" placeholder="A custom receipt header message"/> |
| 770 | - <field name="receipt_footer" placeholder="A custom receipt header footage"/> |
| 771 | - </group> |
| 772 | - </sheet> |
| 773 | + <label for="name" class="oe_edit_only"/> |
| 774 | + <h1> |
| 775 | + <field name="name"/> |
| 776 | + </h1> |
| 777 | + <group col="4"> |
| 778 | + <field name="warehouse_id" widget="selection" groups="stock.group_locations" /> |
| 779 | + <field name="pricelist_id" groups="product.group_sale_pricelist"/> |
| 780 | + <field name="currency_id" invisible="1"/> |
| 781 | + <field name="journal_id" widget="selection"/> |
| 782 | + <field name="group_by" groups="account.group_account_user"/> |
| 783 | + <field name="sequence_id" readonly="1" groups="base.group_no_one"/> |
| 784 | + </group> |
| 785 | + <separator string="Available Payment Methods" colspan="4"/> |
| 786 | + <field name="journal_ids" colspan="4" nolabel="1"> |
| 787 | + <tree string="Journals"> |
| 788 | + <field name="code" /> |
| 789 | + <field name="name" /> |
| 790 | + <field name="type" /> |
| 791 | + <field name="cash_control" /> |
| 792 | + </tree> |
| 793 | + </field> |
| 794 | + <group string="Features" > |
| 795 | + <group> |
| 796 | + <field name="iface_vkeyboard" /> |
| 797 | + <field name="iface_invoicing" /> |
| 798 | + </group> |
| 799 | + <group> |
| 800 | + <field name="iface_big_scrollbars" /> |
| 801 | + </group> |
| 802 | + </group> |
| 803 | + <group string="Hardware Proxy" > |
| 804 | + <field name="proxy_ip" /> |
| 805 | + <field name="iface_print_via_proxy" /> |
| 806 | + <field name="iface_scan_via_proxy" /> |
| 807 | + <field name="iface_electronic_scale" /> |
| 808 | + <field name="iface_cashdrawer" /> |
| 809 | + </group> |
| 810 | + <group string="Receipt" > |
| 811 | + <field name="receipt_header" placeholder="A custom receipt header message"/> |
| 812 | + <field name="receipt_footer" placeholder="A custom receipt header footage"/> |
| 813 | + </group> |
| 814 | |
| 815 | </form> |
| 816 | </field> |
| 817 | |
| 818 | === modified file 'procurement/procurement_view.xml' |
| 819 | --- procurement/procurement_view.xml 2014-04-15 13:02:44 +0000 |
| 820 | +++ procurement/procurement_view.xml 2014-05-06 12:16:18 +0000 |
| 821 | @@ -215,34 +215,32 @@ |
| 822 | <field name="model">stock.warehouse.orderpoint</field> |
| 823 | <field name="arch" type="xml"> |
| 824 | <form string="Reordering Rules" version="7.0"> |
| 825 | - <sheet> |
| 826 | - <group> |
| 827 | - <group> |
| 828 | - <field name="name" /> |
| 829 | - <field name="product_id" on_change="onchange_product_id(product_id)"/> |
| 830 | - </group> |
| 831 | - <group> |
| 832 | - <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" options="{'no_create': True}" groups="stock.group_locations"/> |
| 833 | - <field name="product_uom" groups="product.group_uom"/> |
| 834 | - <field name="location_id" groups="stock.group_locations"/> |
| 835 | - <field name="company_id" groups="base.group_multi_company" widget="selection"/> |
| 836 | - </group> |
| 837 | - </group> |
| 838 | - <group> |
| 839 | - <group string="Rules"> |
| 840 | - <field name="product_min_qty" /> |
| 841 | - <field name="product_max_qty" /> |
| 842 | - <field name="qty_multiple" string="Quantity Multiple"/> |
| 843 | - </group> |
| 844 | - <group string="Misc"> |
| 845 | - <field name="procurement_id" readonly="1"/> |
| 846 | - <field name="active" /> |
| 847 | - </group> |
| 848 | - </group> |
| 849 | - <group string="Procurement Orders to Process"> |
| 850 | - <field name="procurement_draft_ids" nolabel="1"/> |
| 851 | - </group> |
| 852 | - </sheet> |
| 853 | + <group> |
| 854 | + <group> |
| 855 | + <field name="name" /> |
| 856 | + <field name="product_id" on_change="onchange_product_id(product_id)"/> |
| 857 | + </group> |
| 858 | + <group> |
| 859 | + <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" options="{'no_create': True}" groups="stock.group_locations"/> |
| 860 | + <field name="product_uom" groups="product.group_uom"/> |
| 861 | + <field name="location_id" groups="stock.group_locations"/> |
| 862 | + <field name="company_id" groups="base.group_multi_company" widget="selection"/> |
| 863 | + </group> |
| 864 | + </group> |
| 865 | + <group> |
| 866 | + <group string="Rules"> |
| 867 | + <field name="product_min_qty" /> |
| 868 | + <field name="product_max_qty" /> |
| 869 | + <field name="qty_multiple" string="Quantity Multiple"/> |
| 870 | + </group> |
| 871 | + <group string="Misc"> |
| 872 | + <field name="procurement_id" readonly="1"/> |
| 873 | + <field name="active" /> |
| 874 | + </group> |
| 875 | + </group> |
| 876 | + <group string="Procurement Orders to Process"> |
| 877 | + <field name="procurement_draft_ids" nolabel="1"/> |
| 878 | + </group> |
| 879 | </form> |
| 880 | </field> |
| 881 | </record> |
| 882 | |
| 883 | === modified file 'product/product_view.xml' |
| 884 | --- product/product_view.xml 2014-04-22 10:03:06 +0000 |
| 885 | +++ product/product_view.xml 2014-05-06 12:16:18 +0000 |
| 886 | @@ -349,20 +349,18 @@ |
| 887 | <field name="model">product.category</field> |
| 888 | <field name="arch" type="xml"> |
| 889 | <form string="Product Categories" version="7.0"> |
| 890 | - <sheet> |
| 891 | - <div class="oe_title"> |
| 892 | - <label for="name" class="oe_edit_only"/> |
| 893 | - <h1> |
| 894 | - <field name="name"/> |
| 895 | - </h1> |
| 896 | - </div> |
| 897 | - <group> |
| 898 | - <group name="parent" col="4"> |
| 899 | - <field name="parent_id"/> |
| 900 | - <field name="type"/> |
| 901 | - </group> |
| 902 | + <div class="oe_title"> |
| 903 | + <label for="name" class="oe_edit_only"/> |
| 904 | + <h1> |
| 905 | + <field name="name"/> |
| 906 | + </h1> |
| 907 | + </div> |
| 908 | + <group> |
| 909 | + <group name="parent" col="4"> |
| 910 | + <field name="parent_id"/> |
| 911 | + <field name="type"/> |
| 912 | </group> |
| 913 | - </sheet> |
| 914 | + </group> |
| 915 | </form> |
| 916 | </field> |
| 917 | </record> |
| 918 | |
| 919 | === modified file 'resource/resource_view.xml' |
| 920 | --- resource/resource_view.xml 2014-04-11 13:18:42 +0000 |
| 921 | +++ resource/resource_view.xml 2014-05-06 12:16:18 +0000 |
| 922 | @@ -59,15 +59,13 @@ |
| 923 | <field name="model">resource.calendar</field> |
| 924 | <field name="arch" type="xml"> |
| 925 | <form string="Working Time" version="7.0"> |
| 926 | - <sheet> |
| 927 | - <group> |
| 928 | - <field name="name"/> |
| 929 | - <field name="manager"/> |
| 930 | - <field name="company_id" groups="base.group_multi_company"/> |
| 931 | - </group> |
| 932 | - <field name="attendance_ids"/> |
| 933 | - <field name="leave_ids"/> |
| 934 | - </sheet> |
| 935 | + <group> |
| 936 | + <field name="name"/> |
| 937 | + <field name="manager"/> |
| 938 | + <field name="company_id" groups="base.group_multi_company"/> |
| 939 | + </group> |
| 940 | + <field name="attendance_ids"/> |
| 941 | + <field name="leave_ids"/> |
| 942 | </form> |
| 943 | </field> |
| 944 | </record> |
