Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1100427-hip into lp:openobject-addons

  1. trunk-bug-1100427-hip
  2. Merge into trunk
Proposed by Hiral Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1100427-hip
Merge into: lp:openobject-addons
Diff against target: 126 lines (+59/-57)
1 file modified
account/account_view.xml (+59/-57)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1100427-hip
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+143865@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

8508. By Hiral Patel (OpenERP)

[trunk][FIX] 'Default debit-credit account' fields on the journal form view are not visible without horizontal scrolling

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2013-01-08 15:18:05 +0000
+++ account/account_view.xml 2013-01-18 11:44:30 +0000
@@ -384,63 +384,65 @@
384 <field name="model">account.journal</field>384 <field name="model">account.journal</field>
385 <field name="arch" type="xml">385 <field name="arch" type="xml">
386 <form string="Account Journal" version="7.0">386 <form string="Account Journal" version="7.0">
387 <div class="oe_title">387 <sheet>
388 <label for="name" class="oe_edit_only"/>388 <div class="oe_title">
389 <h1><field name="name"/></h1>389 <label for="name" class="oe_edit_only"/>
390 </div>390 <h1><field name="name"/></h1>
391 <group>391 </div>
392 <group>392 <group>
393 <field name="code"/>393 <group>
394 <field name="type"/>394 <field name="code"/>
395 </group>395 <field name="type"/>
396 <group>396 </group>
397 <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>397 <group>
398 <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>398 <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
399 <field name="currency" groups="base.group_multi_currency"/>399 <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
400 <field name="company_id" groups="base.group_multi_company"/>400 <field name="currency" groups="base.group_multi_currency"/>
401 </group>401 <field name="company_id" groups="base.group_multi_company"/>
402 </group>402 </group>
403 <notebook>403 </group>
404 <page string="Advanced Settings">404 <notebook>
405 <group>405 <page string="Advanced Settings">
406 <group>406 <group>
407 <field name="user_id"/>407 <group>
408 <field name="sequence_id" required="0"/>408 <field name="user_id"/>
409 </group>409 <field name="sequence_id" required="0"/>
410 <group>410 </group>
411 <field name="centralisation"/>411 <group>
412 <field name="entry_posted"/>412 <field name="centralisation"/>
413 <field name="allow_date"/>413 <field name="entry_posted"/>
414 <field name="group_invoice_lines"/>414 <field name="allow_date"/>
415 </group>415 <field name="group_invoice_lines"/>
416 </group>416 </group>
417 </page>417 </group>
418 <page string="Entry Controls">418 </page>
419 <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>419 <page string="Entry Controls">
420 <field colspan="4" name="type_control_ids" nolabel="1"/>420 <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
421 <separator colspan="4" string="Accounts Allowed (empty for no control)"/>421 <field colspan="4" name="type_control_ids" nolabel="1"/>
422 <field colspan="4" name="account_control_ids" nolabel="1"/>422 <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
423 </page>423 <field colspan="4" name="account_control_ids" nolabel="1"/>
424 <page string="Cash Registers">424 </page>
425 <group>425 <page string="Cash Registers">
426 <group string="Accounts">426 <group>
427 <field name="profit_account_id" domain="[('type','!=','view')]"/>427 <group string="Accounts">
428 <field name="loss_account_id" domain="[('type','!=','view')]"/>428 <field name="profit_account_id" domain="[('type','!=','view')]"/>
429 <field name="internal_account_id"/>429 <field name="loss_account_id" domain="[('type','!=','view')]"/>
430 </group>430 <field name="internal_account_id"/>
431 <group string="Miscellaneous">431 </group>
432 <field name="with_last_closing_balance"/>432 <group string="Miscellaneous">
433 <field name="cash_control"/>433 <field name="with_last_closing_balance"/>
434 </group>434 <field name="cash_control"/>
435 </group>435 </group>
436 <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>436 </group>
437 <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">437 <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
438 <tree string="CashBox Lines" editable="bottom">438 <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
439 <field name="pieces" />439 <tree string="CashBox Lines" editable="bottom">
440 </tree>440 <field name="pieces" />
441 </field>441 </tree>
442 </page>442 </field>
443 </notebook>443 </page>
444 </notebook>
445 </sheet>
444 </form>446 </form>
445 </field>447 </field>
446 </record>448 </record>

Subscribers

People subscribed via source and target branches

to all changes: