pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] latest trunk

Browse Source 
bzr revid: abo@openerp.com-20120620174901-e0dqnrt4fwowbsy7
This commit is contained in:
Antonin Bourguignon
2012-06-20 19:49:01 +02:00
parent 86b2f33f71 855c4258a2
commit db6a717716
88 changed files with 192 additions and 9300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+2 -4
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")
addons/account/account_installer.xml
+21 -23
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"/>
addons/account/account_menuitem.xml
+1 -1
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"/>
addons/account/account_view.xml
+43 -30
View File
@@ -2348,48 +2348,61 @@
<!-- Wizard for Multi Charts of Accounts -->
<record id="view_wizard_multi_chart" model="ir.ui.view">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="name">Set Your Accounting Options</field>
<field name="model">wizard.multi.charts.accounts</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
<data>
<form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute>
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<button name="action_skip" position="replace"/>
<group string="res_config_contents" position="replace">
<label string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" width="150" />
<separator string="Generate Your Chart of Accounts from a Chart Template" />
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
<field name="code_digits" groups="account.group_account_user"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
<field name="seq_journal"/>
<field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<newline/>
<field name ="sale_tax_rate" attrs="{'invisible': [('complete_tax_set', '=', True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
<field name ="purchase_tax_rate" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
<field name ="complete_tax_set" invisible="1"/>
<newline/> <!-- extended view because the web UI is not good for one2many -->
<field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
<form string="Bank Information">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection"/>
</form>
<tree editable="bottom" string="Bank Information">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection"/>
</tree>
</field>
<field name="only_one_chart_template" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
<p>This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template.</p>
<div groups="base.group_multi_company">
<label for="company_id"/>
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
</div>
<group string="Set Your Accounting Options">
<div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
<label for="chart_template_id"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
</div>
<newline/>
<group groups="account.group_account_user">
<field name="code_digits"/>
</group>
<group>
<field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
<div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
<field name="sale_tax_rate" class="oe_inline" on_change="onchange_tax_rate(sale_tax_rate)"/> %%
</div>
<field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<label for="purchase_tax_rate" string="Purchase Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
<div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
<field name="purchase_tax_rate" class="oe_inline"/> %%
</div>
</group>
</group>
<div groups="account.group_account_user">
<label for="bank_accounts_id" string="Bank Information"/>
<field name="bank_accounts_id">
<tree editable="bottom">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection"/>
</tree>
</field>
</div>
</group>
</data>
</field>
</record>
<record id="action_wizard_multi_chart" model="ir.actions.act_window">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="name">Set Your Accounting Options</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">wizard.multi.charts.accounts</field>
<field name="view_id" ref="view_wizard_multi_chart"/>
addons/account/data/configurable_account_chart.xml
+1 -1
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>
addons/account/i18n/account.pot
+2 -2
View File
@@ -2913,7 +2913,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Generate Chart of Accounts from a Chart Template"
msgid "Set Your Accounting Options"
msgstr ""
#. module: account
@@ -6608,7 +6608,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgid "Configure your Chart of Accounts"
msgstr ""
#. module: account
addons/account/i18n/ar.po
+1 -1
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
addons/account/i18n/bg.po
+1 -1
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
addons/account/i18n/br.po
+1 -1
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
addons/account/i18n/bs.po
+1 -1
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
addons/account/i18n/ca.po
+1 -1
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
addons/account/i18n/cs.po
+1 -1
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
addons/account/i18n/da.po
+1 -1
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
addons/account/i18n/de.po
+1 -1
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
addons/account/i18n/el.po
+1 -1
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
addons/account/i18n/en_GB.po
+1 -1
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
addons/account/i18n/en_US.po
+1 -1
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
addons/account/i18n/es.po
+1 -1
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
addons/account/i18n/es_AR.po
+1 -1
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
addons/account/i18n/es_CL.po
+1 -1
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
addons/account/i18n/es_CR.po
+1 -1
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
addons/account/i18n/es_EC.po
+1 -1
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
addons/account/i18n/es_MX.po.moved
-9130
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_PY.po
+1 -1
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
addons/account/i18n/es_VE.po
+1 -1
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
addons/account/i18n/et.po
+1 -1
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
addons/account/i18n/eu.po
+1 -1
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
addons/account/i18n/fa.po
+1 -1
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
addons/account/i18n/fa_AF.po
+1 -1
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
addons/account/i18n/fi.po
+1 -1
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
addons/account/i18n/fr.po
+1 -1
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
addons/account/i18n/fr_BE.po
+1 -1
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
addons/account/i18n/gl.po
+1 -1
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
addons/account/i18n/gu.po
+1 -1
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
addons/account/i18n/he.po
+1 -1
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
addons/account/i18n/hi.po
+1 -1
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
addons/account/i18n/hr.po
+1 -1
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
addons/account/i18n/hu.po
+1 -1
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
addons/account/i18n/id.po
+1 -1
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
addons/account/i18n/it.po
+1 -1
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
addons/account/i18n/ja.po
+1 -1
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
addons/account/i18n/kab.po
+1 -1
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
addons/account/i18n/kk.po
+1 -1
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
addons/account/i18n/ko.po
+1 -1
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
addons/account/i18n/lo.po
+1 -1
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
addons/account/i18n/lt.po
+1 -1
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
addons/account/i18n/lv.po
+1 -1
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
addons/account/i18n/mk.po
+1 -1
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
addons/account/i18n/mn.po
+1 -1
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
addons/account/i18n/nb.po
+1 -1
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
addons/account/i18n/nl.po
+1 -1
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
addons/account/i18n/nl_BE.po
+1 -1
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
addons/account/i18n/oc.po
+1 -1
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
addons/account/i18n/pl.po
+1 -1
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
addons/account/i18n/pt.po
+1 -1
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
addons/account/i18n/pt_BR.po
+1 -1
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
addons/account/i18n/ro.po
+1 -1
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
addons/account/i18n/ru.po
+1 -1
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
addons/account/i18n/si.po
+1 -1
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
addons/account/i18n/sk.po
+1 -1
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
addons/account/i18n/sl.po
+1 -1
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
addons/account/i18n/sq.po
+1 -1
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
addons/account/i18n/sr.po
+1 -1
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
addons/account/i18n/sr@latin.po
+1 -1
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
addons/account/i18n/sv.po
+1 -1
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
addons/account/i18n/ta.po
+1 -1
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
addons/account/i18n/te.po
+1 -1
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
addons/account/i18n/th.po
+1 -1
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
addons/account/i18n/tlh.po
+1 -1
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
addons/account/i18n/tr.po
+1 -1
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
addons/account/i18n/ug.po
+1 -1
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
addons/account/i18n/uk.po
+1 -1
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
addons/account/i18n/ur.po
+1 -1
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
addons/account/i18n/vi.po
+1 -1
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
addons/account/i18n/zh_CN.po
+1 -1
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
addons/account/i18n/zh_HK.po
+1 -1
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
addons/account/i18n/zh_TW.po
+1 -1
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
addons/account/res_config.py
-3
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,
addons/account/res_config_view.xml
-1
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)]}"
addons/account_accountant/account_accountant_data.xml
+5
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.)
addons/anonymous/static/src/xml/anonymous.xml
+4 -8
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>
addons/base_setup/base_setup_views.xml
+11
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>
addons/crm/crm_lead_view.xml
+11 -9
View File
@@ -245,15 +245,17 @@
</t>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
<a class="oe_kanban_menuaction oe_i">B</a>
<ul class="oe_kanban_menu">
<li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
<li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
<li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
<li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
<li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
</div>
<div class="oe_kanban_content">
<div>
<b><field name="name"/></b>
addons/hr_recruitment/hr_recruitment_view.xml
+8 -6
View File
@@ -274,12 +274,14 @@
<t t-name="kanban-box">
<t t-if="record.priority.raw_value == '1'" t-set="border">oe_kanban_color_green</t>
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
<a class="oe_kanban_menuaction oe_i">B</a>
<ul class="oe_kanban_menu">
<li><a type="edit">Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<li><a type="edit">Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
</div>
<div class="oe_kanban_content" >
<h3 class="oe_kanban_ellipsis"><field name="name"/>
</h3>
addons/project/project_view.xml
+8 -6
View File
@@ -207,12 +207,14 @@
<templates>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click">
<a class="oe_kanban_menuaction oe_i">B</a>
<ul class="oe_kanban_menu">
<li><a type="edit">Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<li><a type="edit">Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
</div>
<div class="oe_kanban_content">
<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
addons/sale/sale_view.xml
+3 -3
View File
@@ -109,7 +109,7 @@
<button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
<button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
<button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
<button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
<button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
<button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
<button name="print_quotation" string="Send by Post" type="object" states="sent"/>
<button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
@@ -525,7 +525,7 @@
</record>
<act_window
context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
id="act_res_partner_2_sale_order"
name="Quotations and Sales"
groups="base.group_sale_salesman"
@@ -533,7 +533,7 @@
src_model="res.partner"/>
<act_window
context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
context="{'search_default_product_id': active_id, 'default_product_id': active_id}"
id="action_order_line_product_tree"
name="Sales Order Lines"
res_model="sale.order.line"
addons/stock/stock_view.xml
-1
View File
@@ -779,7 +779,6 @@
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed"/>
<field name="location_dest_id" groups="stock.group_locations"/>
<field name="date_expected" string="Date Expected"/>
<field name="state"/>
</tree>
<form string="Stock Moves" version="7.0">
addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+2 -2
View File
@@ -3,9 +3,9 @@
-->
<templates id="template" xml:space="preserve">
<t t-name="Systray.Shortcuts">
<div class="oe_systray_shortcuts oe_systray_dropdown">
<div class="oe_systray_shortcuts oe_dropdown_toggle">
<a href="#"><img src="/web_shortcuts/static/src/img/icon.png" width="22" height="22" border="0"/></a>
<ul class="oe_systray_shortcuts_items oe_systray_dropdown_options"/>
<ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
</div>
</t>
<t t-name="Systray.Shortcuts.Item">