Tejas Tank (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-first-10clicks-accounting-tta into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first-10clicks-accounting-tta/+merge/135096
Hello,
All changes applied for task : "first 10 clicks in accounting".
Thanks,
tta
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first-10clicks-accounting-tta/+merge/135096
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-first-10clicks-accounting-tta.
=== modified file 'account/account_cash_statement.py'
--- account/account_cash_statement.py 2012-11-03 17:16:27 +0000
+++ account/account_cash_statement.py 2012-11-20 10:08:32 +0000
@@ -58,7 +58,7 @@
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'),
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-11-15 08:34:00 +0000
+++ account/account_invoice_view.xml 2012-11-20 10:08:32 +0000
@@ -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"/>
=== modified file 'account/report/account_central_journal.py'
--- account/report/account_central_journal.py 2012-03-05 17:41:11 +0000
+++ account/report/account_central_journal.py 2012-11-20 10:08:32 +0000
@@ -103,6 +103,6 @@
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:
=== modified file 'account/report/account_general_journal.py'
--- account/report/account_general_journal.py 2012-03-05 17:41:11 +0000
+++ account/report/account_general_journal.py 2012-11-20 10:08:32 +0000
@@ -156,6 +156,6 @@
(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:
=== modified file 'account/report/account_invoice_report_view.xml'
--- account/report/account_invoice_report_view.xml 2012-10-18 11:34:44 +0000
+++ account/report/account_invoice_report_view.xml 2012-11-20 10:08:32 +0000
@@ -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"/>
=== modified file 'account/report/account_journal.py'
--- account/report/account_journal.py 2012-02-06 10:27:00 +0000
+++ account/report/account_journal.py 2012-11-20 10:08:32 +0000
@@ -195,7 +195,7 @@
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:
=== modified file 'account/wizard/account_automatic_reconcile_view.xml'
--- account/wizard/account_automatic_reconcile_view.xml 2012-08-08 10:59:07 +0000
+++ account/wizard/account_automatic_reconcile_view.xml 2012-11-20 10:08:32 +0000
@@ -56,6 +56,9 @@
<field name="reconciled"/>
<field name="unreconciled"/>
</group>
+ <footer>
+ <button string="Close" class="oe_link" special="cancel"/>
+ </footer>
</form>
</field>
</record>
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml 2012-11-15 12:38:51 +0000
+++ account_voucher/voucher_sales_purchase_view.xml 2012-11-20 10:08:32 +0000
@@ -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)]"
/>
=== modified file 'base_import/static/src/xml/import.xml'
--- base_import/static/src/xml/import.xml 2012-11-06 08:43:53 +0000
+++ base_import/static/src/xml/import.xml 2012-11-20 10:08:32 +0000
@@ -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>
=== modified file 'l10n_be_coda/l10n_be_coda_view.xml'
--- l10n_be_coda/l10n_be_coda_view.xml 2012-10-22 13:33:54 +0000
+++ l10n_be_coda/l10n_be_coda_view.xml 2012-11-20 10:08:32 +0000
@@ -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"/>
=== modified file 'l10n_ch/account_invoice.xml'
--- l10n_ch/account_invoice.xml 2012-08-08 13:06:14 +0000
+++ l10n_ch/account_invoice.xml 2012-11-20 10:08:32 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
