[IMP] account_*: clean up views
bzr revid: rco@openerp.com-20120628150519-dtwgq8zcdlvj0b55
This commit is contained in:
parent
5b71d65450
commit
7597e4054d
|
@ -1284,10 +1284,10 @@
|
|||
<field name="partner_id" invisible="1"/>
|
||||
<field name="amount" invisible="1"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<notebook>
|
||||
<page string="Journal Items">
|
||||
<field name="balance" invisible="1"/>
|
||||
<field colspan="4" name="line_id" widget="one2many_list"
|
||||
<field name="line_id" widget="one2many_list"
|
||||
on_change="onchange_line_id(line_id)"
|
||||
context="{'balance': balance , 'journal': journal_id }">
|
||||
<form string="Journal Item" version="7.0">
|
||||
|
|
|
@ -12,9 +12,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<separator string="Confirm Draft Invoices" colspan="4"/>
|
||||
</group>
|
||||
<separator string="Confirm Draft Invoices"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -36,9 +34,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<separator string="Cancel Selected Invoices" colspan="4"/>
|
||||
</group>
|
||||
<separator string="Cancel Selected Invoices"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -13,9 +13,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<label string="Are you sure you want to open Journal Entries?"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -111,14 +111,12 @@ class account_move_journal(osv.osv_memory):
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group string="%s" colspan="4">
|
||||
<group string="%s">
|
||||
<field name="target_move" />
|
||||
</group>
|
||||
<group colspan="4" >
|
||||
<label width="300" string="%s"/>
|
||||
<newline/>
|
||||
<label width="300" string="%s"/>
|
||||
</group>
|
||||
</form>""" % (open_string, separator_string, journal_string, period_string)
|
||||
|
||||
view = etree.fromstring(view.encode('utf8'))
|
||||
|
|
|
@ -13,9 +13,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<label string="Are you sure you want to open Account move line entries!"/>
|
||||
</group>
|
||||
<label string="Are you sure you want to open Account move line entries?"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -13,8 +13,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<separator string="Are you sure?" colspan="4"/>
|
||||
<group>
|
||||
<group string="Are you sure?">
|
||||
<field name="sure"/>
|
||||
</group>
|
||||
</form>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Report Options" version="7.0">
|
||||
<header>
|
||||
<button name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"/>
|
||||
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Report Options" version="7.0">
|
||||
<header>
|
||||
<button name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"/>
|
||||
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel" />
|
||||
</header>
|
||||
|
|
|
@ -13,10 +13,9 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<label string="Are you sure you want to open this invoice ?"/>
|
||||
<newline/>
|
||||
<label string="(Invoice should be unreconciled if you want to open it)"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -13,10 +13,8 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<separator string="Unreconciliate Transactions"/>
|
||||
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -48,10 +46,8 @@
|
|||
<header>
|
||||
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight_on_dirty" />
|
||||
</header>
|
||||
<group>
|
||||
<separator string="Unreconciliation Transactions"/>
|
||||
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -45,9 +45,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<label string = "Are you sure you want to create entries?"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -53,10 +53,8 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<separator string="Post Journal Entries"/>
|
||||
<label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
|
||||
</group>
|
||||
<label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Crossovered Analytic" version="7.0">
|
||||
<header>
|
||||
<button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight_on_dirty"/>
|
||||
<button name="print_report" string="Print" type="object" class="oe_highlight_on_dirty"/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
|
|
|
@ -12,9 +12,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<label string="Save This Distribution as a Model"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -237,7 +237,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_payment_order_search"/>
|
||||
<field name="help">A payment order is a payment request from your company to pay a supplier invoice or a customer `credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for.</field>
|
||||
<field name="help">A payment order is a payment request from your company to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for.</field>
|
||||
</record>
|
||||
|
||||
<menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="menu_main_payment" sequence="3"/>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Search Payment lines" version="7.0">
|
||||
<header>
|
||||
<button name="search_entries" string="Search" colspan="1" type="object" class="oe_highlight_on_dirty"/>
|
||||
<button name="search_entries" string="Search" type="object" class="oe_highlight_on_dirty"/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
|
@ -31,8 +31,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<separator string="Entries"/>
|
||||
<group string="Entries">
|
||||
<field name="entries"/>
|
||||
</group>
|
||||
</form>
|
||||
|
|
|
@ -13,9 +13,7 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group>
|
||||
<separator string="Are you sure you want to make payment?"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -12,9 +12,8 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group colspan="4" >
|
||||
<group>
|
||||
<field name="date"/>
|
||||
<newline/>
|
||||
<field name="journal_ids" domain="[('type','in',['sale','purchase','cash'])]"/>
|
||||
</group>
|
||||
</form>
|
||||
|
@ -41,10 +40,8 @@
|
|||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group colspan="4" expand="1">
|
||||
<separator string="Payable and Receivables" colspan="4"/>
|
||||
<field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
|
||||
</group>
|
||||
<separator string="Payable and Receivables"/>
|
||||
<field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue