Apply all changes of task: first 10clicks accounting.
bzr revid: tta@openerp.com-20121120072236-98j1ntdb01aymw1a
This commit is contained in:
parent
d9d127403b
commit
a22d28baef
|
@ -58,7 +58,7 @@ class account_cashbox_line(osv.osv):
|
|||
return {'value' : {'subtotal_closing' : (pieces * number) or 0.0 }}
|
||||
|
||||
_columns = {
|
||||
'pieces': fields.float('Unit of Currency', digits_compute=dp.get_precision('Account')),
|
||||
'pieces': fields.float('Currency Denomination', digits_compute=dp.get_precision('Account')),
|
||||
'number_opening' : fields.integer('Number of Units', help='Opening Unit Numbers'),
|
||||
'number_closing' : fields.integer('Number of Units', help='Closing Unit Numbers'),
|
||||
'subtotal_opening': fields.function(_sub_total, string='Opening Subtotal', type='float', digits_compute=dp.get_precision('Account'), multi='subtotal'),
|
||||
|
|
|
@ -292,7 +292,7 @@
|
|||
<form string="Invoice" version="7.0">
|
||||
<header>
|
||||
<button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
|
||||
<button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
|
||||
<button name="invoice_print" string="Print" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
|
||||
<button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
|
||||
<button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
|
||||
<button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
|
||||
|
|
|
@ -103,6 +103,6 @@ class journal_print(report_sxw.rml_parse, common_report_header):
|
|||
return True
|
||||
return data['form']['amount_currency']
|
||||
|
||||
report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='internal')
|
||||
report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='external')
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -156,6 +156,6 @@ class journal_print(report_sxw.rml_parse, common_report_header):
|
|||
(tuple(move_state), period_id, tuple(journals)))
|
||||
return self.cr.fetchone()[0] or 0.0
|
||||
|
||||
report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml', parser=journal_print, header='internal')
|
||||
report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml', parser=journal_print, header='external')
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<field name="name">account.invoice.report.tree</field>
|
||||
<field name="model">account.invoice.report</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false" string="Invoices Analysis">
|
||||
<tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false" import="false" string="Invoices Analysis">
|
||||
<field name="date" invisible="1"/>
|
||||
<field name="user_id" invisible="1"/>
|
||||
<field name="year" invisible="1"/>
|
||||
|
|
|
@ -195,7 +195,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
|
|||
return 'Reference Number'
|
||||
return 'Date'
|
||||
|
||||
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='internal')
|
||||
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='internal')
|
||||
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
|
||||
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -56,6 +56,9 @@
|
|||
<field name="reconciled"/>
|
||||
<field name="unreconciled"/>
|
||||
</group>
|
||||
<footer>
|
||||
<button string="Close" class="oe_link" special="cancel"/>
|
||||
</footer>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
<field name="tax_id"
|
||||
on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
|
||||
widget="selection" nolabel="1"
|
||||
placeholder="Select tax..."
|
||||
placeholder="Taxes..."
|
||||
domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
|
||||
<field name="tax_amount" nolabel="1"/>
|
||||
<div class="oe_subtotal_footer_separator">
|
||||
|
@ -264,7 +264,7 @@
|
|||
<field name="tax_id"
|
||||
on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
|
||||
widget="selection" nolabel="1"
|
||||
placeholder="Select tax..."
|
||||
placeholder="Taxes..."
|
||||
|
||||
domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
|
||||
/>
|
||||
|
|
|
@ -389,11 +389,8 @@
|
|||
<t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/>
|
||||
</t>
|
||||
<t t-extend="ListView.buttons">
|
||||
<t t-jquery="span.oe_alternative">
|
||||
this.attr('t-if', 'widget.options.import_enabled');
|
||||
</t>
|
||||
<t t-jquery="span.oe_alternative" t-operation="append">
|
||||
<a href="#" class="oe_bold oe_list_button_import">Import</a>
|
||||
<t t-jquery="div.oe_list_buttons" t-operation="append">
|
||||
<a href="#" class="oe_bold oe_list_button_import" t-if="widget.fields_view.arch.attrs.import != 'false'">Import</a>
|
||||
</t>
|
||||
</t>
|
||||
</templates>
|
||||
|
|
|
@ -215,7 +215,7 @@
|
|||
<field name="name">account.coda.tree</field>
|
||||
<field name="model">account.coda</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="CODA Files">
|
||||
<tree string="CODA Files" create="false" import="false">
|
||||
<field name="coda_creation_date"/>
|
||||
<field name="name"/>
|
||||
<field name="date"/>
|
||||
|
@ -229,7 +229,7 @@
|
|||
<field name="name">account.coda.form</field>
|
||||
<field name="model">account.coda</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="CODA File" version="7.0">
|
||||
<form string="CODA File" version="7.0" create="false">
|
||||
<sheet>
|
||||
<group col="4">
|
||||
<field name="coda_creation_date"/>
|
||||
|
@ -282,7 +282,7 @@
|
|||
<field name="name">coda.bank.statement.list</field>
|
||||
<field name="model">coda.bank.statement</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="CODA Bank Statements">
|
||||
<tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="CODA Bank Statements" create="false">
|
||||
<field name="name"/>
|
||||
<field name="date"/>
|
||||
<field name="period_id"/>
|
||||
|
@ -299,7 +299,7 @@
|
|||
<field name="name">coda.bank.statement.form</field>
|
||||
<field name="model">coda.bank.statement</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="CODA Bank Statement" version="7.0">
|
||||
<form string="CODA Bank Statement" version="7.0" create="false">
|
||||
<sheet>
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
|
@ -396,7 +396,7 @@
|
|||
<field name="name">coda.bank.statement.line.list</field>
|
||||
<field name="model">coda.bank.statement.line</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree editable="bottom" string="CODA Statement Lines">
|
||||
<tree string="CODA Statement Lines" create="false">
|
||||
<field name="sequence" readonly="1" invisible="1"/>
|
||||
<field name="coda_bank_account_id" readonly="1"/>
|
||||
<field name="date" readonly="1"/>
|
||||
|
@ -418,7 +418,7 @@
|
|||
<field name="name">coda.bank.statement.line.form</field>
|
||||
<field name="model">coda.bank.statement.line</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="CODA Statement Line" version="7.0">
|
||||
<form string="CODA Statement Line" version="7.0" create="false">
|
||||
<group col="4">
|
||||
<field name="statement_id"/>
|
||||
<field name="coda_bank_account_id"/>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<field name="inherit_id" ref="account.invoice_supplier_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_id" position="replace">
|
||||
<field name="partner_id"
|
||||
<field string="Supplier" name="partner_id"
|
||||
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id)"
|
||||
/>
|
||||
</field>
|
||||
|
@ -21,7 +21,7 @@
|
|||
<field name="priority" eval="18"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_bank_id" position="replace">
|
||||
<field name="partner_bank_id"
|
||||
<field string="Supplier" name="partner_bank_id"
|
||||
domain="[('partner_id', '=', partner_id)]"
|
||||
on_change="onchange_partner_bank(partner_bank_id)"/>
|
||||
</field>
|
||||
|
@ -33,7 +33,7 @@
|
|||
<field name="inherit_id" ref="account.invoice_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_bank_id" position="replace">
|
||||
<field name="partner_bank_id"
|
||||
<field string="Supplier" name="partner_bank_id"
|
||||
domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
|
||||
</field>
|
||||
</field>
|
||||
|
|
Loading…
Reference in New Issue