odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] lp:openobject-addons 

bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
This commit is contained in:
Jigar Amin - OpenERP 2012-06-21 10:07:47 +05:30
parent 8002649442 855c4258a2
commit d145817fb8
126 changed files with 411 additions and 9515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/account.py
View File

@ -2969,10 +2969,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
_columns = {
'company_id':fields.many2one('res.company', 'Company', required=True),
'only_one_chart_template': fields.boolean('Only One Chart Template Available'),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
"sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
"purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"),
'sale_tax_rate': fields.float('Sales Tax(%)'),
@ -3009,13 +3009,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]})
if 'company_id' in fields:
res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id})
if 'seq_journal' in fields:
res.update({'seq_journal': True})
ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
if ids:
if 'chart_template_id' in fields:
res.update({'chart_template_id': ids[0]})
res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': ids[0]})
if 'sale_tax' in fields:
sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
, "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")

44
addons/account/account_installer.xml
View File

@ -6,36 +6,34 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="4" width="600">
<field name="charts"/>
<group colspan="4" groups="account.group_account_user">
<separator col="4" colspan="4" string="Configure Fiscal Year"/>
<field name="has_default_company" invisible="1" />
<field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
<field name="date_start" on_change="on_change_start_date(date_start)"/>
<field name="date_stop"/>
<field name="period" colspan="4"/>
</group>
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Chart of Accounts</attribute>
<label string="The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default."/>
<button name="action_skip" position="replace"/>
<button name="action_next" position="attributes">
<attribute name="string">Continue</attribute>
</button>
<separator string="title" position="replace">
<group string="Select an Accounting Setup">
<label colspan="2" string="This will automatically configure your taxes and accounts."/>
<field name="charts"/>
</group>
<group string="Configure your Fiscal Year" groups="account.group_account_user">
<field name="has_default_company" invisible="1" />
<field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
<label for="date_start" string="Date Range"/>
<div>
<field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
<field name="date_stop" class="oe_inline"/>
</div>
<field name="period"/>
</group>
</separator>
</data>
</field>
</record>
<record id="action_account_configuration_installer" model="ir.actions.act_window">
<field name="name">Install your Chart of Accounts</field>
<field name="name">Configure your Chart of Accounts</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.installer</field>
<field name="view_id" ref="view_account_configuration_installer"/>

18
addons/account/account_invoice_view.xml
View File

@ -56,8 +56,8 @@
<field name="name"/>
<label string="Quantity" for="quantity" align="1.0"/>
<div>
<field name="quantity" class="oe_form_inline"/>
<field name="uos_id" class="oe_form_inline"
<field name="quantity" class="oe_inline"/>
<field name="uos_id" class="oe_inline"
on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
</div>
<field name="price_unit"/>
@ -218,10 +218,10 @@
</field>
<button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
</div>
<group class="oe_form_subtotal_footer">
<group class="oe_subtotal_footer">
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_form_subtotal_footer_separator"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
<field name="residual" style="margin-top: 10px"/>
<field name="reconciled" invisible="1"/>
@ -290,9 +290,9 @@
<label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
<label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
<label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
<field name="number" readonly="1" class="oe_form_inline"/>
<field name="number" readonly="1" class="oe_inline"/>
</h1>
<label string="Concerns" for="name" class="oe_form_readonly_hidden"/>
<label string="Concerns" for="name" class="oe_edit_only"/>
<h2>
<field name="name" placeholder="Project XYZ"/>
</h2>
@ -321,7 +321,7 @@
<label for="currency_id"/>
<div>
<field name="currency_id" class="oe_form_inline"/>
<field name="currency_id" class="oe_inline"/>
<button name="%(action_account_change_currency)d" type="action"
icon="terp-stock_effects-object-colorize"
attrs="{'invisible':[('state','!=','draft')]}"
@ -352,10 +352,10 @@
type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
help="This action will erase taxes"/>
</div>
<group class="oe_form_subtotal_footer">
<group class="oe_subtotal_footer">
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_form_subtotal_footer_separator"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
<field name="residual" style="margin-top: 10px"/>
<field name="reconciled" invisible="1"/>

2
addons/account/account_menuitem.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="14"
<menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="14"
groups="group_account_user,group_account_manager,group_account_invoice"
web_icon="images/accounting.png"
web_icon_hover="images/accounting-hover.png"/>

81
addons/account/account_view.xml
View File

@ -170,7 +170,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account" version="7.0">
<label for="name" class="oe_form_readonly_hidden" string="Account Name and Code:"/>
<label for="name" class="oe_edit_only" string="Account Name and Code:"/>
<h1>
<field name="name"/> -
<field name="code"/>
@ -465,10 +465,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account Journal" version="7.0">
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="type" class="oe_form_readonly_hidden"/>
<label for="type" class="oe_edit_only"/>
<h2><field name="type" on_change="onchange_type(type, currency, context)"/></h2>
</div>
<notebook>
@ -2348,48 +2348,61 @@
<!-- Wizard for Multi Charts of Accounts -->
<record id="view_wizard_multi_chart" model="ir.ui.view">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="name">Set Your Accounting Options</field>
<field name="model">wizard.multi.charts.accounts</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
<data>
<form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute>
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<button name="action_skip" position="replace"/>
<group string="res_config_contents" position="replace">
<label string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" width="150" />
<separator string="Generate Your Chart of Accounts from a Chart Template" />
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
<field name="code_digits" groups="account.group_account_user"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
<field name="seq_journal"/>
<field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<newline/>
<field name ="sale_tax_rate" attrs="{'invisible': [('complete_tax_set', '=', True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
<field name ="purchase_tax_rate" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
<field name ="complete_tax_set" invisible="1"/>
<newline/> <!-- extended view because the web UI is not good for one2many -->
<field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
<form string="Bank Information">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection"/>
</form>
<tree editable="bottom" string="Bank Information">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection"/>
</tree>
</field>
<field name="only_one_chart_template" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
<p>This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template.</p>
<div groups="base.group_multi_company">
<label for="company_id"/>
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
</div>
<group string="Set Your Accounting Options">
<div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
<label for="chart_template_id"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
</div>
<newline/>
<group groups="account.group_account_user">
<field name="code_digits"/>
</group>
<group>
<field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
<div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
<field name="sale_tax_rate" class="oe_inline" on_change="onchange_tax_rate(sale_tax_rate)"/> %%
</div>
<field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<label for="purchase_tax_rate" string="Purchase Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
<div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
<field name="purchase_tax_rate" class="oe_inline"/> %%
</div>
</group>
</group>
<div groups="account.group_account_user">
<label for="bank_accounts_id" string="Bank Information"/>
<field name="bank_accounts_id">
<tree editable="bottom">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection"/>
</tree>
</field>
</div>
</group>
</data>
</field>
</record>
<record id="action_wizard_multi_chart" model="ir.actions.act_window">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="name">Set Your Accounting Options</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">wizard.multi.charts.accounts</field>
<field name="view_id" ref="view_wizard_multi_chart"/>

2
addons/account/data/configurable_account_chart.xml
View File

@ -548,7 +548,7 @@
</record>
<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="name">Set Your Accounting Options</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="category_id" ref="account.category_accounting_configuration"/>
<field name="type">automatic</field>

4
addons/account/i18n/account.pot
View File

@ -2913,7 +2913,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Generate Chart of Accounts from a Chart Template"
msgid "Set Your Accounting Options"
msgstr ""
#. module: account
@ -6608,7 +6608,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/ar.po
View File

@ -7175,7 +7175,7 @@ msgstr "قالب حساب رئيسي"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/bg.po
View File

@ -7102,7 +7102,7 @@ msgstr "Шаблон на родителска сметка"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/br.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/bs.po
View File

@ -7005,7 +7005,7 @@ msgstr "Predložak roditeljskog računa"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/ca.po
View File

@ -7273,7 +7273,7 @@ msgstr "Plantilla compte pare"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/cs.po
View File

@ -7076,7 +7076,7 @@ msgstr "Nadřazená šablona účtu"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Instalovat vaši účtovou osnovu"
#. module: account

2
addons/account/i18n/da.po
View File

@ -6983,7 +6983,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/de.po
View File

@ -7428,7 +7428,7 @@ msgstr "Basiskonto Vorlage"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Installieren Sie Ihren Kontenplan"
#. module: account

2
addons/account/i18n/el.po
View File

@ -7056,7 +7056,7 @@ msgstr "Πρότυπο Μητρικού Λογαριασμού"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/en_GB.po
View File

@ -7026,7 +7026,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/en_US.po
View File

@ -6970,7 +6970,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/es.po
View File

@ -7386,7 +7386,7 @@ msgstr "Plantilla cuenta padre"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Instalar su árbol de cuentas"
#. module: account

2
addons/account/i18n/es_AR.po
View File

@ -7019,7 +7019,7 @@ msgstr "Plantilla cuenta padre"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/es_CL.po
View File

@ -6984,7 +6984,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/es_CR.po
View File

@ -7391,7 +7391,7 @@ msgstr "Plantilla cuenta padre"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Instalar su árbol de cuentas"
#. module: account

2
addons/account/i18n/es_EC.po
View File

@ -7366,7 +7366,7 @@ msgstr "Plantilla de cuenta padre"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Instalar su Plan de Cuentas"
#. module: account

9130
addons/account/i18n/es_MX.po.moved
View File

File diff suppressed because it is too large Load Diff

2
addons/account/i18n/es_PY.po
View File

@ -7277,7 +7277,7 @@ msgstr "Plantilla cuenta padre"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/es_VE.po
View File

@ -6982,7 +6982,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/et.po
View File

@ -6974,7 +6974,7 @@ msgstr "Ülemkonto mall"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/eu.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/fa.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/fa_AF.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/fi.po
View File

@ -7025,7 +7025,7 @@ msgstr "Ylätilin malli"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/fr.po
View File

@ -7463,7 +7463,7 @@ msgstr "Modèle de compte parent"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Installer votre plan comptable"
#. module: account

2
addons/account/i18n/fr_BE.po
View File

@ -6968,7 +6968,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/gl.po
View File

@ -7180,7 +7180,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/gu.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/he.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/hi.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/hr.po
View File

@ -7206,7 +7206,7 @@ msgstr "Predložak nadređenog konta"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Instalirajte kontni plan"
#. module: account

2
addons/account/i18n/hu.po
View File

@ -7226,7 +7226,7 @@ msgstr "Gyűjtő főkönyvi számla sablon"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/id.po
View File

@ -7139,7 +7139,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/it.po
View File

@ -7222,7 +7222,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Installa un Piano dei Conti"
#. module: account

2
addons/account/i18n/ja.po
View File

@ -7102,7 +7102,7 @@ msgstr "親アカウントテンプレート"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "会計表のインストール"
#. module: account

2
addons/account/i18n/kab.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/kk.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/ko.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/lo.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/lt.po
View File

@ -6997,7 +6997,7 @@ msgstr "Tėvinis sąskaitos šablonas"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/lv.po
View File

@ -7165,7 +7165,7 @@ msgstr "Virskonta Veidne"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/mk.po
View File

@ -6976,7 +6976,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/mn.po
View File

@ -7078,7 +7078,7 @@ msgstr "Эцэг загвар"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/nb.po
View File

@ -7018,7 +7018,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/nl.po
View File

@ -7392,7 +7392,7 @@ msgstr "Bovenliggerde grootboekkaart template"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Installeer uw rekeningschema"
#. module: account

2
addons/account/i18n/nl_BE.po
View File

@ -7231,7 +7231,7 @@ msgstr "Hoofdrekeningsjabloon"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/oc.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/pl.po
View File

@ -7234,7 +7234,7 @@ msgstr "Szablon konta nadrzędnego"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Instaluj swój plan kont"
#. module: account

2
addons/account/i18n/pt.po
View File

@ -7377,7 +7377,7 @@ msgstr "Template da Conta Ascedente"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Instale o seu Plano de Contas"
#. module: account

2
addons/account/i18n/pt_BR.po
View File

@ -7365,7 +7365,7 @@ msgstr "Modelo de conta-pai"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Instale o seu Plano de Contas"
#. module: account

2
addons/account/i18n/ro.po
View File

@ -7278,7 +7278,7 @@ msgstr "Şablon cont părinte"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/ru.po
View File

@ -7184,7 +7184,7 @@ msgstr "Шаблон основного счета"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/si.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/sk.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/sl.po
View File

@ -7114,7 +7114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Namestitev kontnega načrta"
#. module: account

2
addons/account/i18n/sq.po
View File

@ -6977,7 +6977,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/sr.po
View File

@ -7003,7 +7003,7 @@ msgstr "Predložak nadređenog konta"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/sr@latin.po
View File

@ -7010,7 +7010,7 @@ msgstr "Predložak nadređenog konta"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/sv.po
View File

@ -7073,7 +7073,7 @@ msgstr "Parent Account Template"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "Installera din kontoplan"
#. module: account

2
addons/account/i18n/ta.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/te.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/th.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/tlh.po
View File

@ -6965,7 +6965,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/tr.po
View File

@ -7229,7 +7229,7 @@ msgstr "Ana Hesap Şablonu"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/ug.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/uk.po
View File

@ -6968,7 +6968,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/ur.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/vi.po
View File

@ -7239,7 +7239,7 @@ msgstr "Parent Account Template"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/zh_CN.po
View File

@ -7020,7 +7020,7 @@ msgstr "上级科目模板"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "导入会计科目表"
#. module: account

2
addons/account/i18n/zh_HK.po
View File

@ -6966,7 +6966,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account

2
addons/account/i18n/zh_TW.po
View File

@ -7017,7 +7017,7 @@ msgstr "上級科目模板"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr "導入會計科目表"
#. module: account

4
addons/account/partner_view.xml
View File

@ -104,8 +104,8 @@
<div>
<field name="street" placeholder="Street..."/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>

8
addons/account/project/project_view.xml
View File

@ -173,16 +173,16 @@
<field name="amount"/>
<label for="amount_currency"/>
<div>
<field name="amount_currency" class="oe_form_inline"/>
<field name="currency_id" class="oe_form_inline"/>
<field name="amount_currency" class="oe_inline"/>
<field name="currency_id" class="oe_inline"/>
</div>
</group>
<group string="Product Information">
<field name="product_id"/>
<label for="unit_amount"/>
<div>
<field name="unit_amount" class="oe_form_inline"/>
<field name="product_uom_id" class="oe_form_inline"/>
<field name="unit_amount" class="oe_inline"/>
<field name="product_uom_id" class="oe_inline"/>
</div>
</group>
<group string="General Accounting">

3
addons/account/res_config.py
View File

@ -49,7 +49,6 @@ class account_config_settings(osv.osv_memory):
'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
'seq_journal': fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
'sale_tax_rate': fields.float('Sales Tax (%)'),
@ -128,7 +127,6 @@ class account_config_settings(osv.osv_memory):
_defaults = {
'company_id': _default_company,
'has_default_company': _default_has_default_company,
'seq_journal': True,
'date_start': lambda *a: time.strftime('%Y-01-01'),
'date_stop': lambda *a: time.strftime('%Y-12-31'),
'period': 'month',
@ -237,7 +235,6 @@ class account_config_settings(osv.osv_memory):
'company_id': config.company_id.id,
'chart_template_id': config.chart_template_id.id,
'code_digits': config.code_digits or 6,
'seq_journal': config.seq_journal,
'sale_tax': config.sale_tax.id,
'purchase_tax': config.purchase_tax.id,
'sale_tax_rate': config.sale_tax_rate,

17
addons/account/res_config_view.xml
View File

@ -34,7 +34,6 @@
name="%(open_account_charts_modules)d" type="action"/>
<newline/>
<field name="code_digits" groups="account.group_account_user"/>
<field name="seq_journal"/>
<newline/>
<field name="complete_tax_set" invisible="1"/>
<field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
@ -75,14 +74,14 @@
<group string="Customer Invoices">
<label string="Invoice Sequence" for="sale_sequence_prefix"/>
<div>
<field name="sale_sequence_prefix" class="oe_form_inline"/>
<field name="sale_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
<field name="sale_sequence_prefix" class="oe_inline"/>
<field name="sale_sequence_next" class="oe_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</div>
<label string="Credit Note Sequence" for="sale_refund_sequence_prefix"/>
<div>
<field name="sale_refund_sequence_prefix" class="oe_form_inline"/>
<field name="sale_refund_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
<field name="sale_refund_sequence_prefix" class="oe_inline"/>
<field name="sale_refund_sequence_next" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</div>
<field name="module_account_invoice_layout"/>
<field name="module_account_voucher"/>
@ -92,13 +91,13 @@
<group string="Supplier Invoices">
<label string="Supplier Invoice Sequence" for="purchase_sequence_prefix"/>
<div>
<field name="purchase_sequence_prefix" class="oe_form_inline"/>
<field name="purchase_sequence_next" class="oe_form_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
<field name="purchase_sequence_prefix" class="oe_inline"/>
<field name="purchase_sequence_next" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</div>
<label string="Supplier Credit Note Sequence" for="purchase_refund_sequence_prefix"/>
<div>
<field name="purchase_refund_sequence_prefix" class="oe_form_inline"/>
<field name="purchase_refund_sequence_next" class="oe_form_inline"
<field name="purchase_refund_sequence_prefix" class="oe_inline"/>
<field name="purchase_refund_sequence_next" class="oe_inline"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
</div>
<field name="module_account_payment"/>

5
addons/account_accountant/account_accountant_data.xml
View File

@ -2,6 +2,11 @@
<openerp>
<data>
<!-- rename root menu "Accounting" -->
<record id="account.menu_finance" model="ir.ui.menu">
<field name="name">Accounting</field>
</record>
<!--
It's easier for new users to not activate this (ex: they misconfigure
header and footer.)

12
addons/account_payment/account_payment_view.xml
View File

@ -131,8 +131,8 @@
<field name="date"/>
<label for="amount_currency"/>
<div>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
<field name="currency" nolabel="1" class="oe_form_inline"/>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
<field name="currency" nolabel="1" class="oe_inline"/>
</div>
<field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@ -151,8 +151,8 @@
<group col="4" string="General Information">
<label for="amount"/>
<div>
<field name="amount" class="oe_form_inline"/>
<field name="company_currency" class="oe_form_inline"/>
<field name="amount" class="oe_inline"/>
<field name="company_currency" class="oe_inline"/>
</div>
<separator colspan="4" string="Entry Information"/>
<field name="create_date" readonly="1"/>
@ -259,8 +259,8 @@
<field name="date"/>
<label for="amount_currency"/>
<div>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
<field name="currency" class="oe_form_inline"/>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
<field name="currency" class="oe_inline"/>
</div>
<field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/>

8
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -304,8 +304,8 @@
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet>
<div class="oe_form_title">
<div class="oe_form_readonly_hidden">
<div class="oe_title">
<div class="oe_edit_only">
<label for="parter_id" />
</div>
<h1>
@ -317,14 +317,14 @@
<field name="amount"
invisible="context.get('line_type', False)"
string="Paid Amount"
class="oe_form_inline"
class="oe_inline"
on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
by
<field name="journal_id"
domain="[('type','in',['bank', 'cash'])]"
invisible="context.get('line_type', False)"
widget="selection"
class="oe_form_inline"
class="oe_inline"
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
string="Payment Method"/>

16
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -90,8 +90,8 @@
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet string="Sales Receipt" layout="auto">
<div class="oe_form_title">
<label for="number" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="number" class="oe_edit_only"/>
<h1><field name="number" readonly="0" /></h1>
</div>
@ -132,13 +132,13 @@
<field name="narration" placeholder="Internal Notes" nolabel="1" />
</group>
<group>
<group class="oe_form_subtotal_footer" string="Total">
<group class="oe_subtotal_footer" string="Total">
<field name="tax_id"
on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
widget="selection"
domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
<field name="tax_amount" nolabel="1"/>
<field name="amount" class="oe_form_subtotal_footer_separator" />
<field name="amount" class="oe_subtotal_footer_separator" />
<button type="object"
icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
attrs="{'invisible': [('state','!=','draft')]}"/>
@ -227,8 +227,8 @@
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet string="Supplier Voucher">
<div class="oe_form_title">
<label for="number" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="number" class="oe_edit_only"/>
<h1><field name="number" readonly="0" /></h1>
</div>
@ -271,7 +271,7 @@
<group>
<field name="narration" placeholder="Internal Notes" nolabel="1" />
</group>
<group class="oe_form_subtotal_footer">
<group class="oe_subtotal_footer">
<!--
<div>
<label for="tax_id" />
@ -287,7 +287,7 @@
domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
/>
<field name="tax_amount" />
<field name="amount" string="Total" class="oe_form_subtotal_footer_separator"/>
<field name="amount" string="Total" class="oe_subtotal_footer_separator"/>
</group>
</group>

12
addons/anonymous/static/src/xml/anonymous.xml
View File

@ -4,14 +4,10 @@
<templates id="template" xml:space="preserve">
<t t-name="UserMenu.anonymous">
<ul class="oe_user_menu oe_topbar_item">
<li>
<a href="#" class="oe_topbar_anonymous_login">
<img class="oe_topbar_avatar" t-att-src="_s + '/web/static/src/img/icons/gtk-dialog-authentication.png'"/>
Login
</a>
</li>
</ul>
<a href="#" class="oe_user_menu oe_topbar_item oe_topbar_anonymous_login">
<img class="oe_topbar_avatar" t-att-src="_s + '/web/static/src/img/icons/gtk-dialog-authentication.png'"/>
Login
</a>
</t>
</templates>

12
addons/base_calendar/base_calendar_view.xml
View File

@ -19,16 +19,16 @@
</header>
<sheet>
<div class="oe_form_title">
<label for="email" string="Invitation To" class="oe_form_readonly_hidden" />
<div class="oe_title">
<label for="email" string="Invitation To" class="oe_edit_only" />
<h1>
<field name="email" class="oe_form_inline" />
(<field name="language" class="oe_form_inline" />)
<field name="email" class="oe_inline" />
(<field name="language" class="oe_inline" />)
</h1>
<h2>
From <field name="event_date" class="oe_form_inline" />
to <field name="event_end_date" class="oe_form_inline"/>
From <field name="event_date" class="oe_inline" />
to <field name="event_end_date" class="oe_inline"/>
</h2>
</div>
<group>

11
addons/base_setup/base_setup_views.xml
View File

@ -1,6 +1,17 @@
<openerp>
<data>
<!-- Show menus that are hidden in module base -->
<record id="base.menu_res_company_global" model="ir.ui.menu">
<field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
</record>
<record id="base.menu_users" model="ir.ui.menu">
<field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
</record>
<record id="base.menu_publisher_warranty" model="ir.ui.menu">
<field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
</record>
<!-- Specify Your Terminology Config Wiz-->
<record id="base_setup_terminology_form" model="ir.ui.view">
<field name="name">Specify Your Terminology</field>

6
addons/base_vat/base_vat_view.xml
View File

@ -10,9 +10,9 @@
<field name="property_account_payable" position="after" version="7.0">
<label for="vat"/>
<div>
<field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_form_inline"/>
<button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_form_inline"/>
<field name="vat_subjected" class="oe_form_inline"/>
<field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_inline"/>
<button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_inline"/>
<field name="vat_subjected" class="oe_inline"/>
</div>
</field>
</field>

50
addons/crm/crm_lead_view.xml
View File

@ -93,7 +93,7 @@
on_change="onchange_stage_id(stage_id)"/>
</header>
<sheet>
<div class="oe_right oe_form_button_box" name="buttons">
<div class="oe_right oe_button_box" name="buttons">
<button type="action"
name="%(act_crm_opportunity_crm_meeting_new)d"
string="Meetings" />
@ -103,7 +103,7 @@
string="Phone Calls" />
</div>
<label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
<label for="name" class="oe_edit_only" string="Lead Description"/>
<h1><field name="name" placeholder="Describe the lead..."/></h1>
<group>
<group>
@ -125,8 +125,8 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
@ -171,7 +171,7 @@
</page>
</notebook>
</sheet>
<div class="oe_form_bottom">
<div class="oe_bottom">
<field name="message_ids" widget="ThreadView"/>
</div>
</form>
@ -245,15 +245,17 @@
</t>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
<a class="oe_kanban_menuaction oe_i">B</a>
<ul class="oe_kanban_menu">
<li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
<li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
<li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
<li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
<li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
</div>
<div class="oe_kanban_content">
<div>
<b><field name="name"/></b>
@ -413,7 +415,7 @@
on_change="onchange_stage_id(stage_id)"/>
</header>
<sheet>
<div class="oe_right oe_form_button_box">
<div class="oe_right oe_button_box">
<button string="Schedule/Log Call"
name="%(opportunity2phonecall_act)d"
type="action"/>
@ -421,15 +423,15 @@
name="action_makeMeeting"
type="object"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="planned_revenue" class="oe_form_readonly_hidden"/>
<label for="planned_revenue" class="oe_edit_only"/>
<h2>
<field name="planned_revenue" class="oe_form_inline"/>
<field name="company_currency" class="oe_form_readonly_hidden oe_form_inline"/> at
<field name="probability" class="oe_form_inline"/> %% success rate
<field name="planned_revenue" class="oe_inline"/>
<field name="company_currency" class="oe_edit_only oe_inline"/> at
<field name="probability" class="oe_inline"/> %% success rate
</h2>
</div>
<group>
@ -446,7 +448,7 @@
<label for="title_action"/>
<div>
<field name="date_action" nolabel="1"/> -
<field name="title_action" class="oe_form_inline" nolabel="1" placeholder="Call for proposal"/>
<field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
</div>
<field name="date_deadline"/>
<field name="priority"/>
@ -482,8 +484,8 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>

14
addons/crm/crm_meeting_view.xml
View File

@ -38,32 +38,32 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
</header>
<sheet>
<div class="oe_form_title">
<div class="oe_form_readonly_hidden">
<div class="oe_title">
<div class="oe_edit_only">
<label for="name" string="Title"/>
(<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_form_inline"/>
(<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
<label for="allday" string="All Day?"/>)
</div>
<h1>
<field name="name"/>
</h1>
<h2>
At <field name="location" class="oe_form_inline" />
At <field name="location" class="oe_inline" />
</h2>
</div>
<h2>
<label for="duration" string="Duration" />
<field name="duration" widget="float_time"
on_change="onchange_dates(date,duration,False,allday)"
class="oe_form_inline"/> from
class="oe_inline"/> from
<field name="date"
string="Start Date"
required="1"
class="oe_form_readonly_hidden oe_form_inline"/> to
class="oe_edit_only oe_inline"/> to
<field name="date_deadline"
string="End Date" required="1"
on_change="onchange_dates(date,False,date_deadline)"
class="oe_form_inline"/>
class="oe_inline"/>
</h2>
<group colspan="4" col="4">
<group colspan="2">

6
addons/crm/crm_phonecall_view.xml
View File

@ -83,12 +83,12 @@
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
</header>
<sheet string="Phone Call">
<div class="oe_form_title">
<div class="oe_form_readonly_hidden">
<div class="oe_title">
<div class="oe_edit_only">
<label for="name" string="Title"/>
</div>
<h1><field name="name" required="1"/></h1>
<div class="oe_form_readonly_hidden">
<div class="oe_edit_only">
<label for="partner_phone" string="Phone" />
</div>
<h2><field name="partner_phone"/></h2>

2
addons/crm_claim/crm_claim_view.xml
View File

@ -166,7 +166,7 @@
</notebook>
</group>
</sheet>
<div class="oe_form_sheet_width">
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>

2
addons/crm_helpdesk/crm_helpdesk_view.xml
View File

@ -47,7 +47,7 @@
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet string="Helpdesk Support" layout="auto">
<group col="4" class="oe_form_header">
<group col="4" class="oe_header">
<field name="name" string="Query"/>
<field name="section_id" widget="selection"/>
<field name="user_id"/>

8
addons/delivery/delivery_view.xml
View File

@ -143,9 +143,9 @@
<field colspan="4" name="name"/>
<div>
<label string="condition" for="type"/>
<field name="type" class="oe_form_inline"/>
<field name="operator" class="oe_form_inline"/>
<field name="max_value" class="oe_form_inline"/>
<field name="type" class="oe_inline"/>
<field name="operator" class="oe_inline"/>
<field name="max_value" class="oe_inline"/>
</div>
<group col="4">
<field name="list_price"/>
@ -260,7 +260,7 @@
<group>
<label for="carrier_id"/>
<div>
<field name="carrier_id" context="{'order_id':active_id or False}" class="oe_form_inline"/>
<field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
<button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
</div>
<label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>

2
addons/edi/static/src/xml/edi.xml
View File

@ -19,7 +19,7 @@
<table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
<tr>
<td class="oe_edi_view">
<p class="oe_form_paragraph"><t t-raw="widget.content"/></p>
<p class="oe_paragraph"><t t-raw="widget.content"/></p>
<button type="button" class="oe_edi_action_print">
View/Print <img src="/edi/static/src/img/pdf.png"/>
</button>

12
addons/event/event_view.xml
View File

@ -63,13 +63,13 @@
<sheet>
<div class="oe_right" style="height: 200px"></div>
<div class="oe_form_title">
<div class="oe_title">
<h1><field name="name"/></h1>
<group>
<group>
<field name="type" on_change="onchange_event_type(type,context)"/>
<field name="user_id"/>
<field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
<field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
</group>
<group>
<field name="date_begin"/>
@ -85,12 +85,12 @@
<field name="note" colspan="4" nolabel="1"/>
</page>
<page string="Internal Data">
<group class="oe_form_group_label_border" colspan="2" col="2">
<group class="oe_group_label_border" colspan="2" col="2">
<field name="register_current"/>
<field name="register_prospect"/>
<field name="register_attended"/>
</group>
<group class="oe_form_group_label_border" colspan="2" col="2">
<group class="oe_group_label_border" colspan="2" col="2">
<field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
<field name="speaker_confirmed"/>
</group>
@ -130,7 +130,7 @@
</page>
</notebook>
</sheet>
<div class="oe_form_sheet_width">
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
@ -406,7 +406,7 @@
</notebook>
</sheet>
<div class="oe_form_sheet_width">
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>

2
addons/google_map/static/src/js/google_map.js
View File

@ -59,7 +59,7 @@ openerp.event = function(instance, mod) {
address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
}
// TODO repalce by widget_option selector self.options.selector
var el = self.view.$element.find(".oe_form_google_map")[0];
var el = self.view.$element.find(".oe_google_map")[0];
self.map.render_map(address,el);
});
},

10
addons/hr/hr_view.xml
View File

@ -22,18 +22,18 @@
<field name="arch" type="xml">
<form string="Employee" version="7.0">
<sheet>
<div class="oe_right oe_form_button_box">
<div class="oe_right oe_button_box">
<!-- Put here related buttons -->
</div>
<field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="company_id" class="oe_form_readonly_hidden" groups="base.group_multi_company"/>
<label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
<h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2>
<label for="department_id" class="oe_form_readonly_hidden"/>
<label for="department_id" class="oe_edit_only"/>
<h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
</div>
<notebook>

Some files were not shown because too many files have changed in this diff Show More