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

[MERGE] lp:opebobject-addons 

bzr revid: jam@tinyerp.com-20120621050852-ob0sd5c97821gpso
This commit is contained in:
Jigar Amin - OpenERP 2012-06-21 10:38:52 +05:30
parent 1168d166ac 855c4258a2
commit a2db2cc18f
442 changed files with 14667 additions and 13470 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"/>

21
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"/>
@ -373,8 +373,7 @@
<field name="origin" placeholder="SO0032"/>
<field name="move_id" groups="account.group_account_user"/>
</group>
<separator string="Additional Information"/>
<field name="comment"/>
<field name="comment" placeholder="Add an additional information in the invoice..."/>
</page>
<page string="Payments">
<field name="payment_ids">

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"/>

7
addons/account/account_move_line.py
View File

@ -997,6 +997,11 @@ class account_move_line(osv.osv):
for journal in journals:
all_journal.append(journal.id)
for field in journal.view_id.columns_id:
# sometimes, it's possible that a defined column is not loaded (the module containing
# this field is not loaded) when we make an update.
if field.name not in self._columns:
continue
if not field.field in fields:
fields[field.field] = [journal.id]
fld.append((field.field, field.sequence))
@ -1020,7 +1025,7 @@ class account_move_line(osv.osv):
}
document = etree.Element('tree', string=title, editable="top",
refresh="5", on_write="on_create_write",
on_write="on_create_write",
colors="red:state=='draft';black:state=='valid'")
fields_get = self.fields_get(cr, uid, flds, context)
for field, _seq in fld:

120
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>
@ -1829,27 +1829,28 @@
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
<field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
</header>
<group>
<sheet>
<group>
<field name="name"/>
<field name="model_id"/>
<field name="ref"/>
<group>
<field name="name"/>
<field name="model_id"/>
<field name="ref"/>
</group>
<newline/>
<group string="Starts on">
<field name="date_start"/>
<field name="period_total"/>
</group>
<group string="Valid Up to">
<field name="period_nbr"/>
<field name="period_type"/>
</group>
</group>
<newline/>
<group string="Starts on">
<field name="date_start"/>
<field name="period_total"/>
</group>
<group string="Valid Up to">
<field name="period_nbr"/>
<field name="period_type"/>
</group>
</group>
<separator string="Subscription Lines"/>
<field name="lines_id" widget="one2many_list"/>
<separator string="Subscription Lines"/>
<field name="lines_id" widget="one2many_list"/>
</sheet>
</form>
</field>
</record>
@ -2347,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

@ -2884,7 +2884,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
@ -6569,7 +6569,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

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

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-12 01:28+0000\n"
"PO-Revision-Date: 2012-06-15 22:54+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
"X-Generator: Launchpad (build 15389)\n"
"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
"X-Generator: Launchpad (build 15419)\n"
#. module: account
#: view:account.invoice.report:0
@ -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
@ -9119,7 +9119,7 @@ msgstr "買掛金"
#: view:report.account_type.sales:0
#: view:report.hr.timesheet.invoice.journal:0
msgid "This Year"
msgstr "今年度"
msgstr "今年"
#. module: account
#: view:board.board:0

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

6
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"/>
@ -114,7 +114,7 @@
<group name="bank" string="Information About the Bank">
<field name="bank" on_change="onchange_bank_id(bank)"/>
<field name="bank_name"/>
<field name="bank_bic"/>
<field name="bank_bic" placeholder="[Identifier code]"/>
</group>
</group>
</form>

23
addons/account/product_view.xml
View File

@ -9,19 +9,16 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Accounting">
<group name="properties">
<separator string="Sales Properties" colspan="2"/>
<separator string="Purchase Properties" colspan="2"/>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
</group>
<newline/>
<group colspan="2">
<separator string="Sale Taxes" colspan="2"/>
<separator string="Purchase Taxes" colspan="2"/>
<field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="supplier_taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
</group>
<group name="properties">
<group>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
</group>
<group>
<field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
<field name="supplier_taxes_id" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}" widget="many2many_tags"/>
</group>
</group>
</page>
</notebook>
</field>

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.)

2
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -29,7 +29,7 @@
</field>
</record>
<record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
<record id="account_analytic_account_form_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.form.inherit</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>

2
addons/account_analytic_plans/account_analytic_plans_view.xml
View File

@ -31,7 +31,7 @@
</field>
</record>
<record id="account.journal_col11" model="account.journal.column">
<record id="journal_col11" model="account.journal.column">
<field eval="&quot;&quot;&quot;Analytic Distribution&quot;&quot;&quot;" name="name"/>
<field eval="11" name="sequence"/>
<field name="view_id" ref="account.account_journal_view"/>

2
addons/account_anglo_saxon/product_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.product_normal_form_view"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group/field[@name='property_account_expense']" position="after">
<xpath expr="//field[@name='property_account_expense']" position="after">
<label string="" colspan="2"/>
<field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
<newline/>

28
addons/account_budget/account_budget_view.xml
View File

@ -231,19 +231,21 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Budget Lines" version="7.0">
<group col="4">
<field name="crossovered_budget_id"/>
<field name="analytic_account_id"/>
<field name="general_budget_id"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>
<field name="planned_amount"/>
<field name="practical_amount"/>
<field name="theoritical_amount"/>
<field name="percentage"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<sheet>
<group col="4">
<field name="crossovered_budget_id"/>
<field name="analytic_account_id"/>
<field name="general_budget_id"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>
<field name="planned_amount"/>
<field name="practical_amount"/>
<field name="theoritical_amount"/>
<field name="percentage"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</sheet>
</form>
</field>
</record>

8
addons/account_budget/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-08 01:54+0000\n"
"PO-Revision-Date: 2012-06-13 17:16+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15376)\n"
"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
"X-Generator: Launchpad (build 15405)\n"
#. module: account_budget
#: field:crossovered.budget,creating_user_id:0
@ -169,7 +169,7 @@ msgstr "会社"
#. module: account_budget
#: view:crossovered.budget:0
msgid "To Approve"
msgstr "承認のため"
msgstr "承認"
#. module: account_budget
#: view:crossovered.budget:0

126
addons/account_coda/account_coda_view.xml
View File

@ -241,24 +241,26 @@
</record>
<record model="ir.ui.view" id="view_account_coda_form">
<field name="name">account.coda.form</field>
<field name="model">account.coda</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="CODA File" version="7.0">
<group col="4">
<field name="coda_creation_date"/>
<field name="name"/>
<field name="coda_data" filename="name"/>
<field name="date"/>
<field name="user_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<separator string="Additional Information"/>
<field name="note"/>
<field name="statement_ids"/>
</form>
</field>
<field name="name">account.coda.form</field>
<field name="model">account.coda</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="CODA File" version="7.0">
<sheet>
<group col="4">
<field name="coda_creation_date"/>
<field name="name"/>
<field name="coda_data" filename="name"/>
<field name="date"/>
<field name="user_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<separator string="Additional Information"/>
<field name="note"/>
<field name="statement_ids"/>
</sheet>
</form>
</field>
</record>
<record id="view_account_coda_filter" model="ir.ui.view">
@ -322,57 +324,59 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="CODA Bank Statement" version="7.0">
<group col="4">
<field name="name"/>
<field name="date"/>
<field name="coda_bank_account_id"/>
<field name="currency"/>
<field name="period_id"/>
<field name="type"/>
<newline/>
<field name="balance_start"/>
<field name="balance_end_real"/>
</group>
<notebook>
<page string="Transactions">
<field name="line_ids">
<tree string="CODA Statement Lines">
<field name="sequence" string="Seq"/>
<sheet>
<group col="4">
<field name="name"/>
<field name="date"/>
<field name="val_date"/>
<field name="ref"/>
<field name="name" width="250"/>
<field name="coda_bank_account_id"/>
<field name="currency"/>
<field name="period_id"/>
<field name="type"/>
<field name="partner_id"/>
<field name="account_id"/>
<field name="amount"/>
<field name="globalisation_amount" string="Glob. Amount"/>
<field name="globalisation_id" string="Glob. Id"/>
</tree>
<form string="CODA Statement Lines" version="7.0">
<group col="4">
<newline/>
<field name="balance_start"/>
<field name="balance_end_real"/>
</group>
<notebook>
<page string="Transactions">
<field name="line_ids">
<tree string="CODA Statement Lines">
<field name="sequence" string="Seq"/>
<field name="date"/>
<field name="val_date"/>
<field name="name"/>
<field name="ref"/>
<field name="name" width="250"/>
<field name="type"/>
<field name="partner_id"/>
<field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field name="account_id"/>
<field name="amount"/>
<field name="ref"/>
<field name="globalisation_amount"/>
<field name="globalisation_level"/>
<field name="globalisation_id"/>
</group>
<separator string="Notes"/>
<field name="note"/>
</form>
</field>
</page>
</notebook>
<group colspan="4">
<field name="balance_end"/>
</group>
<field name="globalisation_amount" string="Glob. Amount"/>
<field name="globalisation_id" string="Glob. Id"/>
</tree>
<form string="CODA Statement Lines" version="7.0">
<group col="4">
<field name="sequence" string="Seq"/>
<field name="date"/>
<field name="val_date"/>
<field name="name"/>
<field name="type"/>
<field name="partner_id"/>
<field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field name="amount"/>
<field name="ref"/>
<field name="globalisation_amount"/>
<field name="globalisation_level"/>
<field name="globalisation_id"/>
</group>
<separator string="Notes"/>
<field name="note"/>
</form>
</field>
</page>
</notebook>
<group colspan="4">
<field name="balance_end"/>
</group>
</sheet>
</form>
</field>
</record>

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"/>

21
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -304,19 +304,34 @@
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet>
<group col="6">
<field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
<field name="currency_id" invisible="1"/>
<div class="oe_title">
<div class="oe_edit_only">
<label for="parter_id" />
</div>
<h1>
<field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
</h1>
</div>
<div>
Pay
<field name="amount"
invisible="context.get('line_type', False)"
string="Paid Amount"
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_inline"
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
string="Payment Method"/>
</div>
<group col="6">
<field name="currency_id" invisible="1"/>
<field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
<field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
<field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>

134
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -90,15 +90,32 @@
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet string="Sales Receipt" layout="auto">
<group col="6">
<field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
<field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
<field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
<field name="number"/>
<field name="name" colspan="2"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<div class="oe_title">
<label for="number" class="oe_edit_only"/>
<h1><field name="number" readonly="0" /></h1>
</div>
<group>
<group>
<field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
<field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
<field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
<field name="name" colspan="2"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<group>
<field name="currency_id"/>
<field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
<field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
<field name="account_id"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
domain="[('type','=','liquidity')]"/>
<field name="reference"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
/>
<field name="paid" invisible="1"/>
</group>
<field name="type" invisible="True"/>
<field name="currency_id"/>
</group>
<notebook>
<page string="Sales Information">
@ -111,26 +128,21 @@
</tree>
</field>
<group col="3">
<group string="Internal Notes" col="1">
<field name="narration"/>
<group colspan="1">
<field name="narration" placeholder="Internal Notes" nolabel="1" />
</group>
<group col="2">
<separator string="Payment Options" colspan="2"/>
<field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
<field name="account_id"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
domain="[('type','=','liquidity')]"/>
<!-- should select income accounts only. Or use the journal for this ? -->
<field name="reference"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
/>
<field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
<field name="paid" invisible="1"/>
</group>
<group col="4">
<separator string="Total" colspan="4"/>
<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"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/>
<group>
<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_subtotal_footer_separator" />
<button type="object"
icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
attrs="{'invisible': [('state','!=','draft')]}"/>
</group>
</group>
</group>
</page>
@ -215,18 +227,35 @@
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet string="Supplier Voucher">
<div class="oe_title">
<label for="number" class="oe_edit_only"/>
<h1><field name="number" readonly="0" /></h1>
</div>
<field name="pay_now" invisible="1"/>
<group>
<group>
<field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
<field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
<field name="date_due"/>
<field name="name" colspan="2"/>
</group>
<group>
<field name="paid" invisible="1"/>
<field name="currency_id"/>
<field name="journal_id"
domain="[('type','in',['purchase','purchase_refund'])]"
widget="selection"
on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
<field name="reference"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
<group col="6">
<field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
<field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
<field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
<field name="number"/>
<field name="name" colspan="2"/>
<field name="reference"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="account_id" domain="[('type','=','other')]" invisible="True"/>
<field name="type" invisible="True"/>
<field name="currency_id"/>
</group>
<notebook colspan="4">
<page string="Bill Information">
@ -238,20 +267,29 @@
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree>
</field>
<group col="3">
<group col="1" string="Internal Notes">
<field name="narration"/>
</group>
<group col="2">
<separator string="Payment Terms" colspan="2"/>
<field name="date_due"/>
<field name="paid" invisible="1"/>
</group>
<group col="4">
<separator string="Total" colspan="4"/>
<field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/>
<group>
<group>
<field name="narration" placeholder="Internal Notes" nolabel="1" />
</group>
<group class="oe_subtotal_footer">
<!--
<div>
<label for="tax_id" />
<button type="object"
icon="terp-stock_format-scientific"
name="compute_tax"
attrs="{'invisible': [('state','!=','draft')]}"/>
</div>
-->
<field name="tax_id"
on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
widget="selection"
domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
/>
<field name="tax_amount" />
<field name="amount" string="Total" class="oe_subtotal_footer_separator"/>
</group>
</group>
</page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">

4
addons/anonymization/anonymization_view.xml
View File

@ -10,6 +10,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Anonymized Field" version="7.0">
<sheet>
<group col="4">
<field name="model_id" on_change="onchange_model_id(model_id)" />
<field name="model_name" on_change="onchange_model_name(model_name)" />
@ -20,6 +21,7 @@
<field name="field_name" on_change="onchange_field_name(field_name, model_name)" />
<field name="state" />
</group>
</sheet>
</form>
</field>
</record>
@ -102,6 +104,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Anonymization History" version="7.0">
<sheet>
<group col="4">
<field name="date"/>
<field name="state"/>
@ -119,6 +122,7 @@
</tree>
</field>
</group>
</sheet>
</form>
</field>
</record>

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>

18
addons/audittrail/audittrail_view.xml
View File

@ -12,13 +12,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="AuditTrail Rule" version="7.0">
<header>
<button string="_Subscribe" name="subscribe" icon="gtk-ok"
type="object" states="draft" />
<button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
type="object" states="subscribed" />
<field name="state" widget="statusbar"/>
</header>
<header>
<button string="_Subscribe" name="subscribe" icon="gtk-ok"
type="object" states="draft" />
<button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
type="object" states="subscribed" />
<field name="state" widget="statusbar"/>
</header>
<sheet>
<group col="4">
<field name="name" required="1"/>
<field name="object_id"/>
@ -32,6 +33,7 @@
<field name="user_id" colspan="4" nolabel="1" />
<field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
</group>
</sheet>
</form>
</field>
</record>
@ -96,6 +98,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="AuditTrail Logs" version="7.0">
<sheet>
<group col="4">
<field name="timestamp" required="1" readonly="1"/>
<field name="user_id" readonly="1"/>
@ -141,6 +144,7 @@
<field name="new_value_text" />
</tree>
</field>
</sheet>
</form>
</field>
</record>

144
addons/base_action_rule/base_action_rule_view.xml
View File

@ -13,80 +13,82 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action Rule" version="7.0">
<group col="4">
<field name="name"/>
<field name="model_id" on_change="onchange_model_id(model_id)"/>
<field name="filter_id" />
<field name="sequence"/>
<field name="active"/>
</group>
<notebook>
<page string="Conditions">
<group>
<group name="model" string="Conditions on Model Fields">
<field name="regex_name"/>
<field name="trg_user_id"/>
</group>
<group name="partner" string="Conditions on Model Partner">
<field name="trg_partner_id"/>
<field name="trg_partner_categ_id"/>
</group>
<group string="Conditions on States">
<field name="trg_state_from"/>
<field name="trg_state_to"/>
</group>
<group string="Conditions on Timing">
<field name="trg_date_type"/>
<group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
<field name="trg_date_range" string="Delay After Trigger Date"/>
<field name="trg_date_range_type"/>
<sheet>
<group col="4">
<field name="name"/>
<field name="model_id" on_change="onchange_model_id(model_id)"/>
<field name="filter_id" />
<field name="sequence"/>
<field name="active"/>
</group>
<notebook>
<page string="Conditions">
<group>
<group name="model" string="Conditions on Model Fields">
<field name="regex_name"/>
<field name="trg_user_id"/>
</group>
<group name="partner" string="Conditions on Model Partner">
<field name="trg_partner_id"/>
<field name="trg_partner_categ_id"/>
</group>
<group string="Conditions on States">
<field name="trg_state_from"/>
<field name="trg_state_to"/>
</group>
<group string="Conditions on Timing">
<field name="trg_date_type"/>
<group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
<field name="trg_date_range" string="Delay After Trigger Date"/>
<field name="trg_date_range_type"/>
</group>
</group>
</group>
</group>
<separator string="Note"/>
<label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
</page>
<page string="Actions">
<group string="Fields to Change" col="4">
<field name="act_user_id"/>
<field name="act_state"/>
</group>
<group col="2" string="Server Action to be Triggered">
<field name="server_action_id"/>
</group>
</page>
<page string="Email Actions">
<group col="4">
<separator colspan="4" string="Email Reminders"/>
<field name="act_remind_partner"/>
<field name="act_remind_attach"/>
<field name="act_remind_user"/>
<group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
<field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
<separator string="Note"/>
<label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
</page>
<page string="Actions">
<group string="Fields to Change" col="4">
<field name="act_user_id"/>
<field name="act_state"/>
</group>
<separator colspan="4" string="Email Information"/>
<field name="act_email_from" />
<field name="act_email_to" />
<field name="act_mail_to_user"/>
<field colspan="4" name="act_mail_to_email"/>
<field name="act_mail_to_watchers"/>
<field colspan="4" name="act_email_cc"/>
<separator colspan="4" string="Email Body"/>
<field colspan="4" name="act_mail_body" height="250"
nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
<separator colspan="4" string="Special Keywords to be Used in the Body"/>
<label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
<label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
<label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
<label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
<label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
<label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
<label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
<label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
<label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
</group>
</page>
</notebook>
<group col="2" string="Server Action to be Triggered">
<field name="server_action_id"/>
</group>
</page>
<page string="Email Actions">
<group col="4">
<separator colspan="4" string="Email Reminders"/>
<field name="act_remind_partner"/>
<field name="act_remind_attach"/>
<field name="act_remind_user"/>
<group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
<field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
</group>
<separator colspan="4" string="Email Information"/>
<field name="act_email_from" />
<field name="act_email_to" />
<field name="act_mail_to_user"/>
<field colspan="4" name="act_mail_to_email"/>
<field name="act_mail_to_watchers"/>
<field colspan="4" name="act_email_cc"/>
<separator colspan="4" string="Email Body"/>
<field colspan="4" name="act_mail_body" height="250"
nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
<separator colspan="4" string="Special Keywords to be Used in the Body"/>
<label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
<label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
<label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
<label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
<label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
<label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
<label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
<label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
<label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>

63
addons/base_calendar/base_calendar_view.xml
View File

@ -28,37 +28,40 @@
statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet>
<group col="4">
<field name="email" string="Invitation To"/>
<field name="cutype" string="Invitation Type" />
<field name="rsvp" />
<field name="role" string="Role" />
<field name="sent_by_uid" string="Invitation From" />
<div class="oe_title">
<label for="email" string="Invitation To" class="oe_edit_only" />
<h1>
<field name="email" class="oe_inline" />
(<field name="language" class="oe_inline" />)
</h1>
<h2>
From <field name="event_date" class="oe_inline" />
to <field name="event_end_date" class="oe_inline"/>
</h2>
</div>
<group>
<group>
<field name="sent_by_uid" string="Invitation From" />
<field name="user_id" string="Invited User"/>
<field name="partner_id" string="Contact" />
</group>
<group>
<field name="cutype" string="Invitation Type" />
<field name="role" string="Role" />
<field name="rsvp" />
<field name="ref" readonly="1"/>
</group>
</group>
<group>
<group string="Delegrated From">
<field name="parent_ids" readonly="1" nolabel="1" />
</group>
<group string="Delegrated To" >
<field name="child_ids" readonly="1" nolabel="1" />
</group>
</group>
<notebook>
<page string="Invitation">
<group>
<group string="Invitation Detail">
<field name="user_id" string="Invited User"/>
<field name="partner_id" string="Contact" />
</group>
<group string="Event Detail">
<field name="event_date" />
<field name="event_end_date" />
<field name="language"/>
<field name="ref" readonly="1"/>
</group>
</group>
</page>
<page string="Delegation Info">
<separator string="Delegated From" colspan="4" />
<field name="parent_ids"
readonly="1" />
<separator string="Delegated To" colspan="4" />
<field name="child_ids"
readonly="1" />
</page>
</notebook>
</sheet>
</form>
</field>

37
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>
@ -42,22 +53,20 @@
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</header>
<sheet>
<group>
<group name="config_sale" colspan="4"/>
<group>
<group name="config_sale" colspan="4"/>
<!-- this part is necessary to allow the plugins to extend the view -->
<field name="module_crm" invisible="1"/>
<group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<separator string="Emails"/>
</group>
<field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
<newline/>
<field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
<group name="config_crm" colspan="2"/>
<!-- this part is necessary to allow the plugins to extend the view -->
<field name="module_crm" invisible="1"/>
<group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<separator string="Emails"/>
</group>
</sheet>
<field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
<newline/>
<field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
<group name="config_crm" colspan="2"/>
</group>
</form>
</field>
</record>

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