[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
commit d145817fb8
126 changed files with 411 additions and 9515 deletions

View File

@ -2969,10 +2969,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
_columns = { _columns = {
'company_id':fields.many2one('res.company', 'Company', required=True), '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), '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), '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"), '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"), "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
"purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"),
'sale_tax_rate': fields.float('Sales 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'}]}) res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]})
if 'company_id' in fields: if 'company_id' in fields:
res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id}) 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) ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
if ids: if ids:
if 'chart_template_id' in fields: 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: if 'sale_tax' in fields:
sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
, "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence") , "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")

View File

@ -6,36 +6,34 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="base.res_config_installer"/> <field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <form position="attributes" version="7.0">
<form position="attributes">
<attribute name="string">Accounting Application Configuration</attribute> <attribute name="string">Accounting Application Configuration</attribute>
</form> </form>
<xpath expr="//button[@string='Install Modules']" position="attributes"> <button name="action_skip" position="replace"/>
<attribute name="string">Configure</attribute> <button name="action_next" position="attributes">
</xpath> <attribute name="string">Continue</attribute>
<xpath expr="//separator[@string='title']" position="after"> </button>
<group colspan="4" width="600"> <separator string="title" position="replace">
<field name="charts"/> <group string="Select an Accounting Setup">
<group colspan="4" groups="account.group_account_user"> <label colspan="2" string="This will automatically configure your taxes and accounts."/>
<separator col="4" colspan="4" string="Configure Fiscal Year"/> <field name="charts"/>
<field name="has_default_company" invisible="1" /> </group>
<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 --> <group string="Configure your Fiscal Year" groups="account.group_account_user">
<field name="date_start" on_change="on_change_start_date(date_start)"/> <field name="has_default_company" invisible="1" />
<field name="date_stop"/> <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="period" colspan="4"/> <label for="date_start" string="Date Range"/>
</group> <div>
</group> <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
</xpath> <field name="date_stop" class="oe_inline"/>
<separator string="title" position="attributes"> </div>
<attribute name="string">Configure Your Chart of Accounts</attribute> <field name="period"/>
<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."/> </group>
</separator> </separator>
</data>
</field> </field>
</record> </record>
<record id="action_account_configuration_installer" model="ir.actions.act_window"> <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="type">ir.actions.act_window</field>
<field name="res_model">account.installer</field> <field name="res_model">account.installer</field>
<field name="view_id" ref="view_account_configuration_installer"/> <field name="view_id" ref="view_account_configuration_installer"/>

View File

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

View File

@ -2,7 +2,7 @@
<openerp> <openerp>
<data> <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" groups="group_account_user,group_account_manager,group_account_invoice"
web_icon="images/accounting.png" web_icon="images/accounting.png"
web_icon_hover="images/accounting-hover.png"/> web_icon_hover="images/accounting-hover.png"/>

View File

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

View File

@ -548,7 +548,7 @@
</record> </record>
<record id="action_wizard_multi_chart_todo" model="ir.actions.todo"> <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="action_id" ref="account.action_wizard_multi_chart"/>
<field name="category_id" ref="account.category_accounting_configuration"/> <field name="category_id" ref="account.category_accounting_configuration"/>
<field name="type">automatic</field> <field name="type">automatic</field>

View File

@ -2913,7 +2913,7 @@ msgstr ""
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart #: 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 "" msgstr ""
#. module: account #. module: account
@ -6608,7 +6608,7 @@ msgstr ""
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts" msgid "Configure your Chart of Accounts"
msgstr "" msgstr ""
#. module: account #. module: account

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -7076,7 +7076,7 @@ msgstr "Nadřazená šablona účtu"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Instalovat vaši účtovou osnovu"
#. module: account #. module: account

View File

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

View File

@ -7428,7 +7428,7 @@ msgstr "Basiskonto Vorlage"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Installieren Sie Ihren Kontenplan"
#. module: account #. module: account

View File

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

View File

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

View File

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

View File

@ -7386,7 +7386,7 @@ msgstr "Plantilla cuenta padre"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Instalar su árbol de cuentas"
#. module: account #. module: account

View File

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

View File

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

View File

@ -7391,7 +7391,7 @@ msgstr "Plantilla cuenta padre"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Instalar su árbol de cuentas"
#. module: account #. module: account

View File

@ -7366,7 +7366,7 @@ msgstr "Plantilla de cuenta padre"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Instalar su Plan de Cuentas"
#. module: account #. module: account

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -7463,7 +7463,7 @@ msgstr "Modèle de compte parent"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Installer votre plan comptable"
#. module: account #. module: account

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -7206,7 +7206,7 @@ msgstr "Predložak nadređenog konta"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Instalirajte kontni plan"
#. module: account #. module: account

View File

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

View File

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

View File

@ -7222,7 +7222,7 @@ msgstr ""
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Installa un Piano dei Conti"
#. module: account #. module: account

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -7392,7 +7392,7 @@ msgstr "Bovenliggerde grootboekkaart template"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Installeer uw rekeningschema"
#. module: account #. module: account

View File

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

View File

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

View File

@ -7234,7 +7234,7 @@ msgstr "Szablon konta nadrzędnego"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Instaluj swój plan kont"
#. module: account #. module: account

View File

@ -7377,7 +7377,7 @@ msgstr "Template da Conta Ascedente"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Instale o seu Plano de Contas"
#. module: account #. module: account

View File

@ -7365,7 +7365,7 @@ msgstr "Modelo de conta-pai"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Instale o seu Plano de Contas"
#. module: account #. module: account

View File

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

View File

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

View File

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

View File

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

View File

@ -7114,7 +7114,7 @@ msgstr ""
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Namestitev kontnega načrta"
#. module: account #. module: account

View File

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

View File

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

View File

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

View File

@ -7073,7 +7073,7 @@ msgstr "Parent Account Template"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer #: 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" msgstr "Installera din kontoplan"
#. module: account #. module: account

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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'), '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)]"), '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"), '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"), 'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"), 'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
'sale_tax_rate': fields.float('Sales Tax (%)'), 'sale_tax_rate': fields.float('Sales Tax (%)'),
@ -128,7 +127,6 @@ class account_config_settings(osv.osv_memory):
_defaults = { _defaults = {
'company_id': _default_company, 'company_id': _default_company,
'has_default_company': _default_has_default_company, 'has_default_company': _default_has_default_company,
'seq_journal': True,
'date_start': lambda *a: time.strftime('%Y-01-01'), 'date_start': lambda *a: time.strftime('%Y-01-01'),
'date_stop': lambda *a: time.strftime('%Y-12-31'), 'date_stop': lambda *a: time.strftime('%Y-12-31'),
'period': 'month', 'period': 'month',
@ -237,7 +235,6 @@ class account_config_settings(osv.osv_memory):
'company_id': config.company_id.id, 'company_id': config.company_id.id,
'chart_template_id': config.chart_template_id.id, 'chart_template_id': config.chart_template_id.id,
'code_digits': config.code_digits or 6, 'code_digits': config.code_digits or 6,
'seq_journal': config.seq_journal,
'sale_tax': config.sale_tax.id, 'sale_tax': config.sale_tax.id,
'purchase_tax': config.purchase_tax.id, 'purchase_tax': config.purchase_tax.id,
'sale_tax_rate': config.sale_tax_rate, 'sale_tax_rate': config.sale_tax_rate,

View File

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

View File

@ -2,6 +2,11 @@
<openerp> <openerp>
<data> <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 It's easier for new users to not activate this (ex: they misconfigure
header and footer.) header and footer.)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,17 @@
<openerp> <openerp>
<data> <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--> <!-- Specify Your Terminology Config Wiz-->
<record id="base_setup_terminology_form" model="ir.ui.view"> <record id="base_setup_terminology_form" model="ir.ui.view">
<field name="name">Specify Your Terminology</field> <field name="name">Specify Your Terminology</field>

View File

@ -10,9 +10,9 @@
<field name="property_account_payable" position="after" version="7.0"> <field name="property_account_payable" position="after" version="7.0">
<label for="vat"/> <label for="vat"/>
<div> <div>
<field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" 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_form_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_form_inline"/> <field name="vat_subjected" class="oe_inline"/>
</div> </div>
</field> </field>
</field> </field>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -19,7 +19,7 @@
<table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%"> <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
<tr> <tr>
<td class="oe_edi_view"> <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"> <button type="button" class="oe_edi_action_print">
View/Print <img src="/edi/static/src/img/pdf.png"/> View/Print <img src="/edi/static/src/img/pdf.png"/>
</button> </button>

View File

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

View File

@ -59,7 +59,7 @@ openerp.event = function(instance, mod) {
address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value); address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
} }
// TODO repalce by widget_option selector self.options.selector // 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); self.map.render_map(address,el);
}); });
}, },

View File

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

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