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

merge lp:openobject-server

Browse Source 
bzr revid: jam@tinyerp.com-20120824132957-6z5ovpfqqvjnazj3
This commit is contained in:
Jigar Amin - OpenERP
2012-08-24 18:59:57 +05:30
parent 260e25084d 0b464f0882
commit a4c132fcb6
142 changed files with 1572 additions and 1597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp-server
+1 -1
View File
@@ -105,7 +105,7 @@ def run_test_file(dbname, test_file):
db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
cr = db.cursor()
_logger.info('loading test file %s', test_file)
openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True)
openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
cr.rollback()
cr.close()
except Exception:
openerp/addons/base/__openerp__.py
+8 -6
View File
@@ -25,20 +25,21 @@
'name': 'Base',
'version': '1.3',
'category': 'Hidden',
'description': """The kernel of OpenERP, needed for all installation.""",
'description': """
The kernel of OpenERP, needed for all installation.
===================================================
""",
'author': 'OpenERP SA',
'maintainer': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': [],
'init_xml': [
'data': [
'base_data.xml',
'security/base_security.xml',
'base_menu.xml',
'res/res_security.xml',
'res/res_config.xml',
'data/res.country.state.csv'
],
'update_xml': [
'data/res.country.state.csv',
'ir/wizard/wizard_menu_view.xml',
'ir/ir.xml',
'ir/ir_filters.xml',
@@ -77,9 +78,10 @@
'res/res_widget_data.xml',
'publisher_warranty/publisher_warranty_data.xml',
],
'demo_xml': [
'demo': [
'base_demo.xml',
'res/res_partner_demo.xml',
'res/res_partner_demo.yml',
'res/res_widget_demo.xml',
],
'test': [
openerp/addons/base/base.sql
+4 -6
View File
@@ -146,17 +146,15 @@ select setval('ir_ui_menu_id_seq', 2);
CREATE TABLE res_users (
id serial NOT NULL,
name varchar(64) not null,
active boolean default True,
login varchar(64) NOT NULL UNIQUE,
password varchar(64) default null,
email varchar(64) default null,
context_tz varchar(64) default null,
signature text,
context_lang varchar(64) default '',
tz varchar(64) default null,
lang varchar(64) default '',
-- No FK references below, will be added later by ORM
-- (when the destination rows exist)
company_id int,
partner_id int,
primary key(id)
);
alter table res_users add constraint res_users_login_uniq unique (login);
@@ -385,7 +383,7 @@ CREATE TABLE ir_model_relation (
-- Users
---------------------------------
insert into res_users (id,login,password,name,active,company_id,context_lang) values (1,'admin','admin','Administrator',True,1,'en_US');
insert into res_users (id,login,password,active,company_id,partner_id,lang) values (1,'admin','admin',True,1,1,'en_US');
insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
-- Compatibility purpose, to remove V6.0
openerp/addons/base/base_data.xml
+20 -10
View File
@@ -4,7 +4,6 @@
<record id="view_menu" model="ir.ui.view">
<field name="name">ir.ui.menu.tree</field>
<field name="model">ir.ui.menu</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Menu" toolbar="1">
<field icon="icon" name="name"/>
@@ -1061,6 +1060,12 @@
<field name="company_id" eval="None"/>
<field name="customer" eval="False"/>
<field name="is_company" eval="True"/>
<field name="street"></field>
<field name="city"></field>
<field name="zip"></field>
<field name="phone"></field>
<field name="email">info@yourcompany.com</field>
<field name="website">www.yourcompany.com</field>
</record>
<!-- Currencies -->
@@ -1082,24 +1087,29 @@
<record id="main_company" model="res.company">
<field name="name">Your Company</field>
<field name="partner_id" ref="main_partner"/>
<field name="rml_footer1">Web: www.companyname.com - Tel: +1-212-555-12345</field>
<field name="rml_footer2">IBAN: XX12 3456 7890 1234 5678 - SWIFT: SWIFTCODE - VAT: Company vat number</field>
<field name="rml_header1">Your Company Slogan</field>
<field name="rml_footer1">Web: http://www.yourcompany.com - Tel: +33 1 49 51 23 94</field>
<field name="rml_footer2">Bank Accounts... to be configured in menu Settings > Accounting/Invoicing.</field>
<field name="currency_id" ref="base.EUR"/>
</record>
<record model="res.users" id="base.user_root">
<field name="signature">Administrator</field>
<record model="res.partner" id="base.partner_root">
<field name="name">Administrator</field>
<field name="company_id" ref="main_company"/>
<field name="customer" eval="False"/>
</record>
<record model="res.users" id="base.user_root">
<field name="partner_id" ref="base.partner_root"/>
<field name="company_id" ref="main_company"/>
<field name="menu_id" ref="action_menu_admin"/>
<field name="company_ids" eval="[(4, ref('main_company'))]"/>
<field name="menu_id" ref="action_menu_admin"/>
<field name="signature">Administrator</field>
</record>
<record id="main_partner" model="res.partner">
<field name="company_id" ref="main_company"/>
</record>
<record id="EUR" model="res.currency">
<field name="company_id" ref="main_company"/>
</record>
<!-- The Following currency rates are considered as on 1st Jan,2010 against EUR. -->
<!-- Currencies -->
@@ -1624,7 +1634,7 @@
</record>
<record id="res_bank_1" model="res.bank">
<field name="name">Reserve</field>
<field name="name">International Bank</field>
</record>
<record id="CRC" model="res.currency">
openerp/addons/base/base_demo.xml
-13
View File
@@ -1,19 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="demo_address" model="res.partner">
<field name="name">Fabien D'souza</field>
<field name="street">Chaussee de Namur</field>
<field name="zip">1367</field>
<field name="city">Gerompont</field>
<field name="phone">(+32).81.81.37.00</field>
<field name="type">default</field>
<field model="res.country" name="country_id" ref="be"/>
<!-- Company ID will be set later -->
<field name="company_id" eval="None"/>
</record>
<record id="user_demo" model="res.users">
<field name="login">demo</field>
<field name="password">demo</field>
openerp/addons/base/i18n/ab.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/af.po
+2 -2
View File
@@ -3653,7 +3653,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9864,7 +9864,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/am.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/ar.po
+2 -2
View File
@@ -3721,7 +3721,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "ضريبة القيمة المضافة"
#. module: base
@@ -9975,7 +9975,7 @@ msgstr "الأسابيع"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/base.pot
+2 -2
View File
@@ -3383,7 +3383,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9064,7 +9064,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/bg.po
+2 -2
View File
@@ -3705,7 +3705,7 @@ msgstr "Проверка на EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "ДДС"
#. module: base
@@ -9961,7 +9961,7 @@ msgstr "Седмици"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/bs.po
+2 -2
View File
@@ -3642,7 +3642,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9853,7 +9853,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/ca.po
+2 -2
View File
@@ -3757,7 +3757,7 @@ msgstr "Verificació EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "CIF/NIF"
#. module: base
@@ -10082,7 +10082,7 @@ msgstr "Setmanes"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/cs.po
+2 -2
View File
@@ -3787,7 +3787,7 @@ msgstr "Kontrola Ean"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "DIČ"
#. module: base
@@ -10090,7 +10090,7 @@ msgstr "Týdnů"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "DPH: "
#. module: base
openerp/addons/base/i18n/da.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "Moms"
#. module: base
@@ -9845,7 +9845,7 @@ msgstr "Uger"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/de.po
+2 -2
View File
@@ -4266,7 +4266,7 @@ msgstr "EAN Prüfung"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "USt-IdNr. / UID"
#. module: base
@@ -10907,7 +10907,7 @@ msgstr "Wochen"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "UID: "
#. module: base
openerp/addons/base/i18n/el.po
+2 -2
View File
@@ -3728,7 +3728,7 @@ msgstr "Έλεγχος ean"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "ΦΠΑ"
#. module: base
@@ -9997,7 +9997,7 @@ msgstr "Εβδομάδες"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/en_GB.po
+2 -2
View File
@@ -4123,7 +4123,7 @@ msgstr "Ean check"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "VAT"
#. module: base
@@ -10427,7 +10427,7 @@ msgstr "Weeks"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/es.po
+2 -2
View File
@@ -3977,7 +3977,7 @@ msgstr "Verificación EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "CIF/NIF"
#. module: base
@@ -10306,7 +10306,7 @@ msgstr "Semanas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/es_AR.po
+2 -2
View File
@@ -3668,7 +3668,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "CUIT"
#. module: base
@@ -9900,7 +9900,7 @@ msgstr "Semanas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/es_CL.po
+2 -2
View File
@@ -3795,7 +3795,7 @@ msgstr "Verificación EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "RUT"
#. module: base
@@ -10124,7 +10124,7 @@ msgstr "Semanas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/es_CR.po
+3 -3
View File
@@ -1975,7 +1975,7 @@ msgstr ""
"``BE0477472701``\n"
"será validado con la normativa belga.\n"
"\n"
"Hay dos niveles diferentes de validación del número de VAT: \n"
"Hay dos niveles diferentes de validación del número de TIN: \n"
"\n"
"*Por defecto, un simple fuera de linea de verificación se realiza mediante "
"la validación conocida\n"
@@ -4391,7 +4391,7 @@ msgstr "Verificación EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "CIF/NIF"
#. module: base
@@ -12421,7 +12421,7 @@ msgstr "Semanas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "IVA: "
#. module: base
openerp/addons/base/i18n/es_EC.po
+2 -2
View File
@@ -3971,7 +3971,7 @@ msgstr "Ean de verificación"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "CIF/NIF"
#. module: base
@@ -10350,7 +10350,7 @@ msgstr "Semanas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "IVA "
#. module: base
openerp/addons/base/i18n/et.po
+2 -2
View File
@@ -3665,7 +3665,7 @@ msgstr "Ean kontroll"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "Käibemaks"
#. module: base
@@ -9890,7 +9890,7 @@ msgstr "Nädalad"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/eu.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/fa.po
+2 -2
View File
@@ -3667,7 +3667,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "مالیات بر ارزش افزوده"
#. module: base
@@ -9894,7 +9894,7 @@ msgstr "هفته‌ها"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/fa_AF.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/fi.po
+2 -2
View File
@@ -3751,7 +3751,7 @@ msgstr "EAN tarkistus"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "ALV"
#. module: base
@@ -10091,7 +10091,7 @@ msgstr "Viikot"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "ALV: "
#. module: base
openerp/addons/base/i18n/fr.po
+2 -2
View File
@@ -4371,7 +4371,7 @@ msgstr "Vérification EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "TVA"
#. module: base
@@ -11707,7 +11707,7 @@ msgstr "Semaines"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "TVA: "
#. module: base
openerp/addons/base/i18n/gl.po
+2 -2
View File
@@ -3757,7 +3757,7 @@ msgstr "comprobar EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "IVE"
#. module: base
@@ -10069,7 +10069,7 @@ msgstr "Semanas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/gu.po
+2 -2
View File
@@ -3692,7 +3692,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9903,7 +9903,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/he.po
+2 -2
View File
@@ -3654,7 +3654,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "מע\"מ"
#. module: base
@@ -9877,7 +9877,7 @@ msgstr "שבועות"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/hr.po
+2 -2
View File
@@ -3784,7 +3784,7 @@ msgstr "Provjera Ean"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "PDV"
#. module: base
@@ -10050,7 +10050,7 @@ msgstr "Tjedni"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "PDV "
#. module: base
openerp/addons/base/i18n/hu.po
+2 -2
View File
@@ -3744,7 +3744,7 @@ msgstr "EAN ellenőrzés"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "Közösségi/nemzetközi adószám"
#. module: base
@@ -10063,7 +10063,7 @@ msgstr "Hetek"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/hy.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/id.po
+2 -2
View File
@@ -3638,7 +3638,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9849,7 +9849,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/is.po
+2 -2
View File
@@ -3668,7 +3668,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "VSK"
#. module: base
@@ -9880,7 +9880,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/it.po
+2 -2
View File
@@ -3807,7 +3807,7 @@ msgstr "Verifica EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "Partita IVA"
#. module: base
@@ -10132,7 +10132,7 @@ msgstr "Settimane"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/ja.po
+2 -2
View File
@@ -4131,7 +4131,7 @@ msgstr "EANチェック"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "VAT（Value Added Tax）"
#. module: base
@@ -11571,7 +11571,7 @@ msgstr "週"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/ka.po
+2 -2
View File
@@ -4267,7 +4267,7 @@ msgstr "EAN-ის შემოწმება"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "დღგ"
#. module: base
@@ -11688,7 +11688,7 @@ msgstr "კვირეები"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "დღგ: "
#. module: base
openerp/addons/base/i18n/kk.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr "апта"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/ko.po
+2 -2
View File
@@ -3681,7 +3681,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "부가세"
#. module: base
@@ -9906,7 +9906,7 @@ msgstr "주"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/lt.po
+2 -2
View File
@@ -3646,7 +3646,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "PVM"
#. module: base
@@ -9877,7 +9877,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/lt_LT.po
+1 -1
View File
@@ -4533,7 +4533,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
openerp/addons/base/i18n/lv.po
+2 -2
View File
@@ -3678,7 +3678,7 @@ msgstr "EAN pārbaude"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "PVN"
#. module: base
@@ -9919,7 +9919,7 @@ msgstr "Nedēļas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/mk.po
+2 -2
View File
@@ -3645,7 +3645,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9856,7 +9856,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/mn.po
+2 -2
View File
@@ -4166,7 +4166,7 @@ msgstr "Зур.код чеклэх"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "НӨАТ"
#. module: base
@@ -11762,7 +11762,7 @@ msgstr "7 хоног"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "НӨАТ: "
#. module: base
openerp/addons/base/i18n/nb.po
+2 -2
View File
@@ -3686,7 +3686,7 @@ msgstr "Ean sjekk"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "MVA"
#. module: base
@@ -9926,7 +9926,7 @@ msgstr "Uker"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/nl.po
+2 -2
View File
@@ -3863,7 +3863,7 @@ msgstr "Ean controle"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "BTW"
#. module: base
@@ -10292,7 +10292,7 @@ msgstr "Weken"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "BTW: "
#. module: base
openerp/addons/base/i18n/nl_BE.po
+2 -2
View File
@@ -3649,7 +3649,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9860,7 +9860,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/nl_NL.po
+1 -1
View File
@@ -4711,7 +4711,7 @@ msgstr "html"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "BTW"
#. module: base
openerp/addons/base/i18n/pl.po
+2 -2
View File
@@ -3730,7 +3730,7 @@ msgstr "Sprawdzanie EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "NIP"
#. module: base
@@ -10025,7 +10025,7 @@ msgstr "Tygodni"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "NIP: "
#. module: base
openerp/addons/base/i18n/pt.po
+2 -2
View File
@@ -3959,7 +3959,7 @@ msgstr "Verificar EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "IVA"
#. module: base
@@ -10340,7 +10340,7 @@ msgstr "Semanas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "IVA: "
#. module: base
openerp/addons/base/i18n/pt_BR.po
+3 -3
View File
@@ -4164,7 +4164,7 @@ msgstr "Verificar EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "Imposto"
#. module: base
@@ -10849,8 +10849,8 @@ msgstr "Semanas"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgstr "VAT: "
msgid "TIN: "
msgstr "TIN: "
#. module: base
#: model:res.country,name:base.af
openerp/addons/base/i18n/ro.po
+2 -2
View File
@@ -4363,7 +4363,7 @@ msgstr "Verificati codul EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "TVA"
#. module: base
@@ -12351,7 +12351,7 @@ msgstr "Saptamani"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "TVA: "
#. module: base
openerp/addons/base/i18n/ru.po
+2 -2
View File
@@ -3811,7 +3811,7 @@ msgstr "Проверка кода Ean"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "ИНН"
#. module: base
@@ -10154,7 +10154,7 @@ msgstr "Недели"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/sk.po
+2 -2
View File
@@ -3712,7 +3712,7 @@ msgstr "Ean kontrola"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "DPH"
#. module: base
@@ -9991,7 +9991,7 @@ msgstr "Týždne"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/sl.po
+2 -2
View File
@@ -3741,7 +3741,7 @@ msgstr "Preveri ean"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "DDV"
#. module: base
@@ -10047,7 +10047,7 @@ msgstr "Tedni"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/sq.po
+2 -2
View File
@@ -3633,7 +3633,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9844,7 +9844,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/sr.po
+2 -2
View File
@@ -3710,7 +3710,7 @@ msgstr "EAN provera"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "PDV"
#. module: base
@@ -9975,7 +9975,7 @@ msgstr "Nedelje"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/sr@latin.po
+2 -2
View File
@@ -4309,7 +4309,7 @@ msgstr "EAN provera"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "PDV"
#. module: base
@@ -11242,7 +11242,7 @@ msgstr "Nedelje"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "PDV: "
#. module: base
openerp/addons/base/i18n/sv.po
+2 -2
View File
@@ -3952,7 +3952,7 @@ msgstr "EAN kontroll"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "Moms"
#. module: base
@@ -10426,7 +10426,7 @@ msgstr "Veckor"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "Moms: "
#. module: base
openerp/addons/base/i18n/th.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/tlh.po
+2 -2
View File
@@ -3633,7 +3633,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9844,7 +9844,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/tr.po
+2 -2
View File
@@ -3773,7 +3773,7 @@ msgstr "EAN kontrolü"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "KDV"
#. module: base
@@ -10097,7 +10097,7 @@ msgstr "Hafta"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "VNO: "
#. module: base
openerp/addons/base/i18n/uk.po
+2 -2
View File
@@ -3669,7 +3669,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "ПДВ"
#. module: base
@@ -9893,7 +9893,7 @@ msgstr "Тижні"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/uk_UA.po
+1 -1
View File
@@ -4551,7 +4551,7 @@ msgstr "html"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "ПДВ"
#. module: base
openerp/addons/base/i18n/ur.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/vi.po
+2 -2
View File
@@ -3661,7 +3661,7 @@ msgstr "Kiểm tra EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "Thuế GTGT"
#. module: base
@@ -9878,7 +9878,7 @@ msgstr "Tuần"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/zh_CN.po
+2 -2
View File
@@ -4032,7 +4032,7 @@ msgstr "条码检查"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "增值税"
#. module: base
@@ -10638,7 +10638,7 @@ msgstr "周"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr "增值税： "
#. module: base
openerp/addons/base/i18n/zh_HK.po
+2 -2
View File
@@ -3634,7 +3634,7 @@ msgstr ""
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr ""
#. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/i18n/zh_TW.po
+2 -2
View File
@@ -3639,7 +3639,7 @@ msgstr "Ean 檢查"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgid "TIN"
msgstr "增值稅"
#. module: base
@@ -9858,7 +9858,7 @@ msgstr "週"
#. module: base
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgid "TIN: "
msgstr ""
#. module: base
openerp/addons/base/ir/ir.xml
-73
View File
@@ -6,7 +6,6 @@
<record id="values_view_form_action" model="ir.ui.view">
<field name="name">ir.values.form.action</field>
<field name="model">ir.values</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action Bindings" version="7.0">
<group>
@@ -29,7 +28,6 @@
<record id="values_view_form_defaults" model="ir.ui.view">
<field name="name">ir.values.form.defaults</field>
<field name="model">ir.values</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User-defined Defaults" version="7.0">
<group>
@@ -52,7 +50,6 @@
<record id="values_view_tree_action" model="ir.ui.view">
<field name="name">ir.values.tree.action</field>
<field name="model">ir.values</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Action Bindings/Defaults">
<field name="name"/>
@@ -65,7 +62,6 @@
<record id="values_view_search_action" model="ir.ui.view">
<field name="name">ir.values.search.action</field>
<field name="model">ir.values</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Client Actions">
<field name="name"
@@ -130,7 +126,6 @@
<record id="sequence_view" model="ir.ui.view">
<field name="name">ir.sequence.form</field>
<field name="model">ir.sequence</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sequences" version="7.0">
<sheet>
@@ -179,7 +174,6 @@
<record id="sequence_view_tree" model="ir.ui.view">
<field name="name">ir.sequence.tree</field>
<field name="model">ir.sequence</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sequences">
<field name="code"/>
@@ -197,7 +191,6 @@
<record id="view_sequence_search" model="ir.ui.view">
<field name="name">ir.sequence.search</field>
<field name="model">ir.sequence</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sequences">
<field name="name" string="Sequence"/>
@@ -223,7 +216,6 @@
<record id="sequence_type_form_view" model="ir.ui.view">
<field name="name">ir.sequence.type.form</field>
<field name="model">ir.sequence.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sequence Type" version="7.0">
<sheet>
@@ -239,7 +231,6 @@
<record id="sequence_type_tree_view" model="ir.ui.view">
<field name="name">ir.sequence.type.tree</field>
<field name="model">ir.sequence.type</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sequence Type">
<field name="name"/>
@@ -251,7 +242,6 @@
<record id="view_sequence_type_search" model="ir.ui.view">
<field name="name">ir.sequence.type.search</field>
<field name="model">ir.sequence.type</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sequences Type">
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Sequence Type"/>
@@ -276,7 +266,6 @@
<record id="action_view" model="ir.ui.view">
<field name="name">ir.actions.actions</field>
<field name="model">ir.actions.actions</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action" version="7.0">
<group>
@@ -290,7 +279,6 @@
<record id="action_view_tree" model="ir.ui.view">
<field name="name">ir.actions.actions.tree</field>
<field name="model">ir.actions.actions</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Action">
<field name="name"/>
@@ -301,7 +289,6 @@
<record id="action_view_search" model="ir.ui.view">
<field name="name">ir.actions.actions.search</field>
<field name="model">ir.actions.actions</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Action">
<field name="name" filter_domain="['|', ('name','ilike',self), ('type','ilike',self)]" string="Action"/>
@@ -327,7 +314,6 @@
<record id="act_report_xml_view" model="ir.ui.view">
<field name="name">ir.actions.report.xml</field>
<field name="model">ir.actions.report.xml</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Report" version="7.0">
<group>
@@ -372,7 +358,6 @@
<record id="act_report_xml_view_tree" model="ir.ui.view">
<field name="name">ir.actions.report.xml.tree</field>
<field name="model">ir.actions.report.xml</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Report xml">
<field name="name"/>
@@ -387,7 +372,6 @@
<record id="act_report_xml_search_view" model="ir.ui.view">
<field name="name">ir.actions.report.xml.search</field>
<field name="model">ir.actions.report.xml</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Report Xml">
<field name="name"
@@ -413,7 +397,6 @@
<record id="view_window_action_tree" model="ir.ui.view">
<field name="name">ir.actions.windows.tree</field>
<field name="model">ir.actions.act_window</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Open Window">
<field name="name"/>
@@ -428,7 +411,6 @@
<record id="view_window_action_form" model="ir.ui.view">
<field name="name">ir.actions.windows.form</field>
<field name="model">ir.actions.act_window</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Open a Window" version="7.0">
<group>
@@ -491,7 +473,6 @@
<record id="view_window_action_search" model="ir.ui.view">
<field name="name">ir.actions.windows.search</field>
<field name="model">ir.actions.act_window</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Open a Window">
<field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
@@ -527,7 +508,6 @@
<record id="act_wizard_view_tree" model="ir.ui.view">
<field name="name">ir.actions.wizard.tree</field>
<field name="model">ir.actions.wizard</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Wizard">
<field name="name"/>
@@ -540,7 +520,6 @@
<record id="act_wizard_view" model="ir.ui.view">
<field name="name">ir.actions.wizard</field>
<field name="model">ir.actions.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Wizards" version="7.0">
<group col="4">
@@ -558,7 +537,6 @@
<record id="act_wizard_search_view" model="ir.ui.view">
<field name="name">ir.actions.wizard.search</field>
<field name="model">ir.actions.wizard</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Wizards">
<field name="name"
@@ -582,8 +560,6 @@
<record model="ir.ui.view" id="view_ir_needaction_users_rel_tree">
<field name="name">ir.needaction_users_rel.tree</field>
<field name="model">ir.needaction_users_rel</field>
<field name="type">tree</field>
<field name="sequence">10</field>
<field name="arch" type="xml">
<tree string="Subscription">
<field name="user_id"/>
@@ -607,7 +583,6 @@
<record id="view_view_form" model="ir.ui.view">
<field name="name">ir.ui.view</field>
<field name="model">ir.ui.view</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Views" version="7.0">
<sheet>
@@ -633,7 +608,6 @@
<record id="view_view_tree" model="ir.ui.view">
<field name="name">ir.ui.view.tree</field>
<field name="model">ir.ui.view</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Views">
<field name="priority" string="Sequence"/>
@@ -649,7 +623,6 @@
<record id="view_view_search" model="ir.ui.view">
<field name="name">ir.ui.view.search</field>
<field name="model">ir.ui.view</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Views">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
@@ -686,7 +659,6 @@
<record id="view_view_custom_search" model="ir.ui.view">
<field name="name">ir.ui.view.custom.search</field>
<field name="model">ir.ui.view.custom</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Customized Views">
<field name="user_id"/>
@@ -697,7 +669,6 @@
<record id="view_view_custom_form" model="ir.ui.view">
<field name="name">ir.ui.view.custom.form</field>
<field name="model">ir.ui.view.custom</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Customized Views" version="7.0">
<sheet>
@@ -713,7 +684,6 @@
<record id="view_view_custom_tree" model="ir.ui.view">
<field name="name">ir.ui.view.custom.tree</field>
<field name="model">ir.ui.view.custom</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Customized Views">
<field name="user_id"/>
@@ -734,7 +704,6 @@
<record id="view_attachment_form" model="ir.ui.view">
<field name="name">ir.attachment.view</field>
<field name="model">ir.attachment</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Attachments" version="7.0">
<sheet>
@@ -773,7 +742,6 @@
<record id="view_attachment_tree" model="ir.ui.view">
<field name="name">ir.attachment.view.tree</field>
<field name="model">ir.attachment</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Attachments">
<field name="name"/>
@@ -788,7 +756,6 @@
<record id="view_attachment_search" model="ir.ui.view">
<field name="name">ir.attachment.search</field>
<field name="model">ir.attachment</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Attachments">
<field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
@@ -831,7 +798,6 @@
<record id="view_model_form" model="ir.ui.view">
<field name="name">ir.model.form</field>
<field name="model">ir.model</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Model Description" version="7.0">
<sheet>
@@ -921,7 +887,6 @@
<record id="view_model_tree" model="ir.ui.view">
<field name="name">ir.model.tree</field>
<field name="model">ir.model</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Model Description">
<field name="model"/>
@@ -935,7 +900,6 @@
<record id="view_model_search" model="ir.ui.view">
<field name="name">ir.model.search</field>
<field name="model">ir.model</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Model Description">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
@@ -957,7 +921,6 @@
<record id="view_model_fields_form" model="ir.ui.view">
<field name="name">ir.model.fields.form</field>
<field name="model">ir.model.fields</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fields" version="7.0">
<sheet>
@@ -1000,7 +963,6 @@
<record id="view_model_fields_tree" model="ir.ui.view">
<field name="name">ir.model.fields.tree</field>
<field name="model">ir.model.fields</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Fields">
<field name="name"/>
@@ -1015,7 +977,6 @@
<record id="view_model_fields_search" model="ir.ui.view">
<field name="name">ir.model.fields.search</field>
<field name="model">ir.model.fields</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Fields">
<field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
@@ -1044,7 +1005,6 @@
<record model="ir.ui.view" id="view_model_data_form">
<field name="name">ir.model.data.form</field>
<field name="model">ir.model.data</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="External Identifiers" version="7.0">
<group>
@@ -1071,7 +1031,6 @@
<record id="view_model_data_list" model="ir.ui.view">
<field name="name">ir.model.data.list</field>
<field name="model">ir.model.data</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="External Identifiers">
<field name="complete_name"/>
@@ -1084,7 +1043,6 @@
<record id="view_model_data_search" model="ir.ui.view">
<field name="name">ir.model.data.search</field>
<field name="model">ir.model.data</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="External Identifiers">
<field name="name"
@@ -1106,7 +1064,6 @@
<record model="ir.ui.view" id="view_model_constraint_form">
<field name="name">ir.model.constraint.form</field>
<field name="model">ir.model.constraint</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Model Constraints">
<field name="type"/>
@@ -1123,7 +1080,6 @@
<record id="view_model_constraint_list" model="ir.ui.view">
<field name="name">ir.model.constraint.list</field>
<field name="model">ir.model.constraint</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Model Constraints">
<field name="type"/>
@@ -1137,7 +1093,6 @@
<record model="ir.ui.view" id="view_model_relation_form">
<field name="name">ir.model.relation.form</field>
<field name="model">ir.model.relation</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="ManyToMany Relations">
<field name="name"/>
@@ -1153,7 +1108,6 @@
<record id="view_model_relation_list" model="ir.ui.view">
<field name="name">ir.model.relation.list</field>
<field name="model">ir.model.relation</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="ManyToMany Relations">
<field name="name"/>
@@ -1214,7 +1168,6 @@
<record id="view_translation_search" model="ir.ui.view">
<field name="name">Translations</field>
<field name="model">ir.translation</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Translations">
<filter icon="terp-gdu-smart-failing"
@@ -1230,7 +1183,6 @@
<record id="view_translation_form" model="ir.ui.view">
<field name="name">Translations</field>
<field name="model">ir.translation</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Translations" version="7.0">
<header>
@@ -1260,7 +1212,6 @@
<record id="view_translation_tree" model="ir.ui.view">
<field name="name">Translations</field>
<field name="model">ir.translation</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Translations">
<field name="src"/>
@@ -1289,7 +1240,6 @@
<record id="shortcut_form" model="ir.ui.view">
<field name="name">ir.ui.view_sc</field>
<field name="model">ir.ui.view_sc</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Shortcut" version="7.0">
<group col="4">
@@ -1302,7 +1252,6 @@
<record id="shortcut_tree" model="ir.ui.view">
<field name="name">ir.ui.view_sc</field>
<field name="model">ir.ui.view_sc</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Shortcut">
<field name="name"/>
@@ -1314,7 +1263,6 @@
<record id="edit_menu" model="ir.ui.view">
<field name="name">ir.ui.menu.tree</field>
<field name="model">ir.ui.menu</field>
<field name="type">tree</field>
<field eval="8" name="priority"/>
<field name="arch" type="xml">
<tree string="Menu">
@@ -1327,7 +1275,6 @@
<record id="edit_menu_access" model="ir.ui.view">
<field name="name">ir.ui.menu.form2</field>
<field name="model">ir.ui.menu</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Menu" version="7.0">
<sheet>
@@ -1367,7 +1314,6 @@
<record id="edit_menu_access_search" model="ir.ui.view">
<field name="name">ir.ui.menu.search</field>
<field name="model">ir.ui.menu</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Menu">
<field name="name" string="Menu"/>
@@ -1392,7 +1338,6 @@
<record id="ir_cron_view_tree" model="ir.ui.view">
<field name="name">ir.cron.tree</field>
<field name="model">ir.cron</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Scheduled Actions">
<field name="priority" string="Sequence"/>
@@ -1409,7 +1354,6 @@
<record id="ir_cron_view" model="ir.ui.view">
<field name="name">ir.cron.form</field>
<field name="model">ir.cron</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scheduled Actions" version="7.0">
<sheet>
@@ -1447,7 +1391,6 @@
<record id="ir_cron_view_search" model="ir.ui.view">
<field name="name">ir.cron.search</field>
<field name="model">ir.cron</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Scheduled Actions">
<field name="name" string="Scheduled Action"/>
@@ -1466,7 +1409,6 @@
<record model="ir.ui.view" id="ir_cron_view_calendar">
<field name="name">ir.cron.calendar</field>
<field name="model">ir.cron</field>
<field name="type">calendar</field>
<field name="priority" eval="2"/>
<field name="arch" type="xml">
<calendar string="Scheduled Actions" date_start="nextcall" color="user_id">
@@ -1493,7 +1435,6 @@
<record id="ir_access_view_tree" model="ir.ui.view">
<field name="name">ir.model.access.tree</field>
<field name="model">ir.model.access</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Access Controls" editable="bottom">
<field name="name"/>
@@ -1509,7 +1450,6 @@
<record id="ir_access_view_form" model="ir.ui.view">
<field name="name">ir.model.access.form</field>
<field name="model">ir.model.access</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Access Controls" version="7.0">
<sheet>
@@ -1531,7 +1471,6 @@
<record id="ir_access_view_search" model="ir.ui.view">
<field name="name">ir.model.access.search</field>
<field name="model">ir.model.access</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Access Controls">
<field name="name" string="Access Control"/>
@@ -1564,7 +1503,6 @@
<record id="view_rule_form" model="ir.ui.view">
<field name="name">Record rules</field>
<field name="model">ir.rule</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Record rules" version="7.0">
<sheet>
@@ -1607,7 +1545,6 @@
<record id="view_rule_tree" model="ir.ui.view">
<field name="name">Record rules</field>
<field name="model">ir.rule</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Record rules">
<field name="model_id"/>
@@ -1624,7 +1561,6 @@
<record id="view_rule_search" model="ir.ui.view">
<field name="name">Record rules</field>
<field name="model">ir.rule</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Record Rules">
<field name="name" string="Record Rule"/>
@@ -1660,7 +1596,6 @@
<record id="view_server_action_form" model="ir.ui.view">
<field name="name">Server Action</field>
<field name="model">ir.actions.server</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Server Action" version="7.0">
<group>
@@ -1750,7 +1685,6 @@
<record id="view_server_action_tree" model="ir.ui.view">
<field name="name">Server Actions</field>
<field name="model">ir.actions.server</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Server Actions">
<field name="name"/>
@@ -1764,7 +1698,6 @@
<record id="view_server_action_search" model="ir.ui.view">
<field name="name">ir.actions.server.search</field>
<field name="model">ir.actions.server</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Server Actions">
<field name="name" string="Server Action"/>
@@ -1794,7 +1727,6 @@
<record id="ir_actions_todo_tree" model="ir.ui.view">
<field name="model">ir.actions.todo</field>
<field name="name">Config Wizard Steps</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Config Wizard Steps">
<field name="sequence"/>
@@ -1812,7 +1744,6 @@
<record id="config_wizard_step_view_form" model="ir.ui.view">
<field name="model">ir.actions.todo</field>
<field name="name">Config Wizard Steps</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Config Wizard Steps" version="7.0">
<header>
@@ -1842,7 +1773,6 @@
<record id="config_wizard_step_view_search" model="ir.ui.view">
<field name="model">ir.actions.todo</field>
<field name="name">ir.actions.todo.select</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Actions">
<filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
@@ -1878,7 +1808,6 @@
<record model="ir.ui.view" id="ir_mail_server_form">
<field name="name">ir.mail.server.form</field>
<field name="model">ir.mail_server</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Outgoing Mail Servers" version="7.0">
<sheet>
@@ -1905,7 +1834,6 @@
<record model="ir.ui.view" id="ir_mail_server_list">
<field name="name">ir.mail.server.list</field>
<field name="model">ir.mail_server</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Outgoing Mail Servers">
<field name="sequence"/>
@@ -1920,7 +1848,6 @@
<record id="view_ir_mail_server_search" model="ir.ui.view">
<field name="name">ir.mail.server.search</field>
<field name="model">ir.mail_server</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Outgoing Mail Servers">
<field name="name"
openerp/addons/base/ir/ir_actions.py
+2 -2
View File
@@ -625,8 +625,8 @@ class actions_server(osv.osv):
if not email_from:
_logger.debug('--email-from command line option is not specified, using a fallback value instead.')
if user.user_email:
email_from = user.user_email
if user.email:
email_from = user.email
else:
email_from = "%s@%s" % (user.login, gethostname())
openerp/addons/base/ir/ir_config_parameter_view.xml
-3
View File
@@ -5,7 +5,6 @@
<record model="ir.ui.view" id="view_ir_config_search">
<field name="name">ir.config_parameter.search</field>
<field name="model">ir.config_parameter</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="System Properties">
<field name="key" string="Key"/>
@@ -16,7 +15,6 @@
<record model="ir.ui.view" id="view_ir_config_list">
<field name="name">ir.config_parameter.list</field>
<field name="model">ir.config_parameter</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="System Parameters">
<field name="key"/>
@@ -27,7 +25,6 @@
<record model="ir.ui.view" id="view_ir_config_form">
<field name="name">ir.config_parameter.form</field>
<field name="model">ir.config_parameter</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Parameters" version="7.0">
<sheet>
openerp/addons/base/ir/ir_filters.xml
-3
View File
@@ -14,7 +14,6 @@
<record id="ir_filters_view_form" model="ir.ui.view">
<field name="name">ir.filters.form</field>
<field name="model">ir.filters</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Filters" version="7.0">
<sheet>
@@ -35,7 +34,6 @@
<record id="ir_filters_view_tree" model="ir.ui.view">
<field name="name">ir.filters.tree</field>
<field name="model">ir.filters</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Filters">
<field name="name"/>
@@ -50,7 +48,6 @@
<record id="ir_filters_view_search" model="ir.ui.view">
<field name="name">ir.filters.search</field>
<field name="model">ir.filters</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Filters">
<field name="name" string="Filter Name"/>
openerp/addons/base/ir/ir_model.py
+6 -2
View File
@@ -183,7 +183,6 @@ class ir_model(osv.osv):
res = super(ir_model,self).create(cr, user, vals, context)
if vals.get('state','base')=='manual':
self.instanciate(cr, user, vals['model'], context)
self.pool.get(vals['model']).__init__(self.pool, cr)
ctx = dict(context,
field_name=vals['name'],
field_state='manual',
@@ -198,7 +197,9 @@ class ir_model(osv.osv):
x_custom_model._name = model
x_custom_model._module = False
a = x_custom_model.create_instance(self.pool, cr)
if (not a._columns) or ('x_name' in a._columns.keys()):
if not a._columns:
x_name = 'id'
elif 'x_name' in a._columns.keys():
x_name = 'x_name'
else:
x_name = a._columns.keys()[0]
@@ -931,6 +932,9 @@ class ir_model_data(osv.osv):
ir_model_relation = self.pool.get('ir.model.relation')
relation_ids = ir_model_relation.search(cr, uid, [('module', 'in', modules_to_remove)])
ir_module_module = self.pool.get('ir.module.module')
modules_to_remove_ids = ir_module_module.search(cr, uid, [('name', 'in', modules_to_remove)])
relation_ids = ir_model_relation.search(cr, uid, [('module', 'in', modules_to_remove_ids)])
ir_model_relation._module_data_uninstall(cr, uid, relation_ids, context)
unlink_if_refcount((model, res_id) for model, res_id in to_unlink
openerp/addons/base/ir/ir_model_constraint.py
+1 -3
View File
@@ -45,7 +45,6 @@ class ir_model_constraint(Model):
ids_set = set(ids)
ids.sort()
ids.reverse()
to_unlink = []
for data in self.browse(cr, uid, ids, context):
model = data.model.model
model_obj = self.pool.get(model)
@@ -75,5 +74,4 @@ class ir_model_constraint(Model):
cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
_logger.info('Dropped CONSTRAINT %s@%s', name, model)
to_unlink.append(data.id)
self.unlink(cr, uid, to_unlink, context)
self.unlink(cr, uid, ids, context)
openerp/addons/base/ir/ir_model_relation.py
+1 -4
View File
@@ -36,7 +36,6 @@ class ir_model_relation(Model):
to_drop_table = []
ids.sort()
ids.reverse()
to_unlink = []
for data in self.browse(cr, uid, ids, context):
model = data.model
model_obj = self.pool.get(model)
@@ -53,9 +52,7 @@ class ir_model_relation(Model):
if cr.fetchone() and not name in to_drop_table:
to_drop_table.append(name)
to_unlink.append(data.id)
self.unlink(cr, uid, to_unlink, context)
self.unlink(cr, uid, ids, context)
# drop m2m relation tables
for table in to_drop_table:
openerp/addons/base/ir/ir_ui_view.py
+22 -3
View File
@@ -24,6 +24,7 @@ from lxml import etree
from tools import graph
from tools.safe_eval import safe_eval as eval
import tools
from tools.view_validation import valid_view
import os
import logging
@@ -47,11 +48,22 @@ view_custom()
class view(osv.osv):
_name = 'ir.ui.view'
def _type_field(self, cr, uid, ids, name, args, context=None):
result = {}
for record in self.browse(cr, uid, ids, context):
# Get the type from the inherited view if any.
if record.inherit_id:
result[record.id] = record.inherit_id.type
else:
result[record.id] = etree.fromstring(record.arch.encode('utf8')).tag
return result
_columns = {
'name': fields.char('View Name',size=64, required=True),
'model': fields.char('Object', size=64, required=True, select=True),
'priority': fields.integer('Sequence', required=True),
'type': fields.selection((
'type': fields.function(_type_field, type='selection', selection=[
('tree','Tree'),
('form','Form'),
('mdx','mdx'),
@@ -60,7 +72,7 @@ class view(osv.osv):
('diagram','Diagram'),
('gantt', 'Gantt'),
('kanban', 'Kanban'),
('search','Search')), 'View Type', required=True, select=True),
('search','Search')], string='View Type', required=True, select=True, store=True),
'arch': fields.text('View Architecture', required=True),
'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade', select=True),
'field_parent': fields.char('Child Field',size=64),
@@ -76,6 +88,11 @@ class view(osv.osv):
# Holds the RNG schema
_relaxng_validator = None
def create(self, cr, uid, values, context=None):
if 'type' in values:
_logger.warning("Setting the `type` field is deprecated in the `ir.ui.view` model.")
return super(osv.osv, self).create(cr, uid, values, context)
def _relaxng(self):
if not self._relaxng_validator:
frng = tools.file_open(os.path.join('base','rng','view.rng'))
@@ -123,6 +140,8 @@ class view(osv.osv):
for error in validator.error_log:
_logger.error(tools.ustr(error))
return False
if not valid_view(view_arch):
return False
return True
_constraints = [
@@ -133,7 +152,7 @@ class view(osv.osv):
super(view, self)._auto_init(cr, context)
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'ir_ui_view_model_type_inherit_id\'')
if not cr.fetchone():
cr.execute('CREATE INDEX ir_ui_view_model_type_inherit_id ON ir_ui_view (model, type, inherit_id)')
cr.execute('CREATE INDEX ir_ui_view_model_type_inherit_id ON ir_ui_view (model, inherit_id)')
def get_inheriting_views_arch(self, cr, uid, view_id, model, context=None):
"""Retrieves the architecture of views that inherit from the given view, from the sets of
openerp/addons/base/ir/wizard/wizard_menu_view.xml
-1
View File
@@ -4,7 +4,6 @@
<record id="view_model_menu_create" model="ir.ui.view">
<field name="name">Create Menu</field>
<field name="model">wizard.ir.model.menu.create</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Menu" version="7.0">
<group>
openerp/addons/base/ir/workflow/workflow_view.xml
+1 -16
View File
@@ -12,7 +12,6 @@
<record id="view_workflow_form" model="ir.ui.view">
<field name="name">workflow.form</field>
<field name="model">workflow</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow" version="7.0">
<group col="4">
@@ -28,7 +27,6 @@
<record id="view_workflow_search" model="ir.ui.view">
<field name="name">workflow.search</field>
<field name="model">workflow</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow">
<field name="name" filter_domain="['|', ('name','ilike',self), ('osv','ilike',self)]" string="Workflow"/>
@@ -39,7 +37,6 @@
<record id="view_workflow_diagram" model="ir.ui.view">
<field name="name">workflow.diagram</field>
<field name="model">workflow</field>
<field name="type">diagram</field>
<field name="arch" type="xml">
<diagram string="Workflow Editor">
<node object="workflow.activity" shape="rectangle:subflow_id!=False" bgcolor="gray:flow_start==True;grey:flow_stop==True">
@@ -55,13 +52,13 @@
<field name="act_to"/>
<field name="signal"/>
</arrow>
<label string="When customizing a workflow, be sure you do not modify an existing node or arrow, but rather add new nodes or arrows. If you absolutly need to modify a node or arrow, you can only change fields that are empty or set to the default value. If you don't do that, your customization will be overwrited at the next update or upgrade to a future version of OpenERP."/>
</diagram>
</field>
</record>
<record id="view_workflow_tree" model="ir.ui.view">
<field name="name">workflow.tree</field>
<field name="model">workflow</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow">
<field name="name"/>
@@ -89,7 +86,6 @@
<record id="view_workflow_activity_form" model="ir.ui.view">
<field name="name">workflow.activity.form</field>
<field name="model">workflow.activity</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Activity" version="7.0">
<sheet>
@@ -145,7 +141,6 @@
<record id="view_workflow_activity_tree" model="ir.ui.view">
<field name="name">workflow.activity.tree</field>
<field name="model">workflow.activity</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Activity">
<field name="name"/>
@@ -160,7 +155,6 @@
<record id="view_workflow_activity_search" model="ir.ui.view">
<field name="name">workflow.activity.search</field>
<field name="model">workflow.activity</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Activity">
<field name="name" string="Workflow Activity"/>
@@ -197,7 +191,6 @@
<record id="view_workflow_transition_form" model="ir.ui.view">
<field name="name">workflow.transition.form</field>
<field name="model">workflow.transition</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Transition" version="7.0">
<sheet>
@@ -221,7 +214,6 @@
<record id="view_workflow_transition_tree" model="ir.ui.view">
<field name="name">workflow.transition.tree</field>
<field name="model">workflow.transition</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Transition">
<field name="act_from"/>
@@ -235,7 +227,6 @@
<record id="view_workflow_transition_search" model="ir.ui.view">
<field name="name">workflow.transition.search</field>
<field name="model">workflow.transition</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Transition">
<field name="signal" filter_domain="['|', ('signal','ilike',self), ('condition','ilike',self)]" string="Workflow Transition"/>
@@ -263,7 +254,6 @@
<record id="view_workflow_instance_form" model="ir.ui.view">
<field name="name">workflow.instance.form</field>
<field name="model">workflow.instance</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Instances" version="7.0">
<sheet>
@@ -280,7 +270,6 @@
<record id="view_workflow_instance_tree" model="ir.ui.view">
<field name="name">workflow.instance.tree</field>
<field name="model">workflow.instance</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow Instances">
<field name="wkf_id"/>
@@ -293,7 +282,6 @@
<record id="view_workflow_instance_search" model="ir.ui.view">
<field name="name">workflow.instance.search</field>
<field name="model">workflow.instance</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Instances">
<field name="res_type" string="Resource Object"/>
@@ -324,7 +312,6 @@
<record id="view_workflow_workitem_form" model="ir.ui.view">
<field name="name">workflow.workitem.form</field>
<field name="model">workflow.workitem</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Workitems" version="7.0">
<sheet>
@@ -342,7 +329,6 @@
<record id="view_workflow_workitem_tree" model="ir.ui.view">
<field name="name">workflow.workitem.tree</field>
<field name="model">workflow.workitem</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow Workitems">
<field name="wkf_id"/>
@@ -356,7 +342,6 @@
<record id="view_workflow_workitem_search" model="ir.ui.view">
<field name="name">workflow.workitem.search</field>
<field name="model">workflow.workitem</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Workitems">
<field name="state" string="State"/>
openerp/addons/base/module/module.py
+21 -6
View File
@@ -18,12 +18,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import base64
from docutils.core import publish_string
import imp
import logging
import re
import urllib
import zipimport
import base64
from openerp import modules, pooler, release, tools, addons
from openerp.tools.parse_version import parse_version
@@ -94,6 +96,14 @@ class module(osv.osv):
'module %s', name, exc_info=True)
return info
def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None):
res = dict.fromkeys(ids, '')
for module in self.browse(cr, uid, ids, context=context):
overrides = dict(embed_stylesheet=False, doctitle_xform=False, output_encoding='unicode')
output = publish_string(source=module.description, writer_name='html', settings_overrides=overrides)
res[module.id] = output
return res
def _get_latest_version(self, cr, uid, ids, field_name=None, arg=None, context=None):
res = dict.fromkeys(ids, '')
for m in self.browse(cr, uid, ids):
@@ -139,14 +149,17 @@ class module(osv.osv):
# We use try except, because views or menus may not exist.
try:
res_mod_dic = res[module_rec.id]
for v in view_obj.browse(cr, uid, imd_models.get('ir.ui.view', []), context=context):
view_ids = imd_models.get('ir.ui.view', [])
for v in view_obj.browse(cr, uid, view_ids, context=context):
aa = v.inherit_id and '* INHERIT ' or ''
res_mod_dic['views_by_module'].append(aa + v.name + '('+v.type+')')
for rx in report_obj.browse(cr, uid, imd_models.get('ir.actions.report.xml', []), context=context):
report_ids = imd_models.get('ir.actions.report.xml', [])
for rx in report_obj.browse(cr, uid, report_ids, context=context):
res_mod_dic['reports_by_module'].append(rx.name)
for um in menu_obj.browse(cr, uid, imd_models.get('ir.ui.menu', []), context=context):
menu_ids = imd_models.get('ir.ui.menu', [])
for um in menu_obj.browse(cr, uid, menu_ids, context=context):
res_mod_dic['menus_by_module'].append(um.complete_name)
except KeyError, e:
_logger.warning(
@@ -180,6 +193,7 @@ class module(osv.osv):
'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True),
'summary': fields.char('Summary', size=64, readonly=True, translate=True),
'description': fields.text("Description", readonly=True, translate=True),
'description_html': fields.function(_get_desc, string='Description HTML', type='html', method=True, readonly=True),
'author': fields.char("Author", size=128, readonly=True),
'maintainer': fields.char('Maintainer', size=128, readonly=True),
'contributors': fields.text('Contributors', readonly=True),
@@ -219,7 +233,7 @@ class module(osv.osv):
('AGPL-3', 'Affero GPL-3'),
('Other OSI approved licence', 'Other OSI Approved Licence'),
('Other proprietary', 'Other Proprietary')
], string='License', readonly=True),
], string='License', readonly=True),
'menus_by_module': fields.function(_get_views, string='Menus', type='text', multi="meta", store=True),
'reports_by_module': fields.function(_get_views, string='Reports', type='text', multi="meta", store=True),
'views_by_module': fields.function(_get_views, string='Views', type='text', multi="meta", store=True),
@@ -368,7 +382,8 @@ class module(osv.osv):
ir_model_data = self.pool.get('ir.model.data')
ir_model_constraint = self.pool.get('ir.model.constraint')
modules_to_remove = [m.name for m in self.browse(cr, uid, ids, context)]
constraint_ids = ir_model_constraint.search(cr, uid, [('module', 'in', modules_to_remove)])
modules_to_remove_ids = [m.id for m in self.browse(cr, uid, ids, context)]
constraint_ids = ir_model_constraint.search(cr, uid, [('module', 'in', modules_to_remove_ids)])
ir_model_constraint._module_data_uninstall(cr, uid, constraint_ids, context)
ir_model_data._module_data_uninstall(cr, uid, modules_to_remove, context)
self.write(cr, uid, ids, {'state': 'uninstalled'})
openerp/addons/base/module/module_view.xml
+3 -9
View File
@@ -7,7 +7,6 @@
<record id="view_module_category_form" model="ir.ui.view">
<field name="name">ir.module.category.form</field>
<field name="model">ir.module.category</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Module Category" version="7.0">
<group col="4">
@@ -23,7 +22,6 @@
<record id="view_module_category_tree" model="ir.ui.view">
<field name="name">ir.module.category.tree</field>
<field name="model">ir.module.category</field>
<field name="type">tree</field>
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
<tree string="Module Category">
@@ -38,10 +36,9 @@
<record id="view_module_filter" model="ir.ui.view">
<field name="name">ir.module.module.list.select</field>
<field name="model">ir.module.module</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search modules">
<field name="name" filter_domain="['|', '|', '|', ('description', 'ilike', self), ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
<field name="name" filter_domain="['|', '|', ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
'ilike', self)]"/>
<filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
<filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
@@ -60,7 +57,6 @@
<record model="ir.ui.view" id="module_view_kanban">
<field name="name">Modules Kanban</field>
<field name="model">ir.module.module</field>
<field name="type">kanban</field>
<field name="arch" type="xml">
<kanban create="false">
<field name="icon"/>
@@ -69,7 +65,7 @@
<field name="summary"/>
<templates>
<t t-name="kanban-box">
<div class="oe_module_vignette oe_kanban_auto_height">
<div class="oe_module_vignette">
<t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
<img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
<div class="oe_module_desc">
@@ -108,7 +104,6 @@
<record id="module_form" model="ir.ui.view">
<field name="name">ir.module.module.form</field>
<field name="model">ir.module.module</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Module" version="7.0">
<sheet>
@@ -138,7 +133,7 @@
</group>
<notebook>
<page string="Description">
<field name="description"/>
<field name="description_html"/>
</page>
<page string="Technical Data" groups="base.group_no_one">
<group col="4">
@@ -170,7 +165,6 @@
<record id="module_tree" model="ir.ui.view">
<field name="name">ir.module.module.tree</field>
<field name="model">ir.module.module</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state=='to upgrade' or state=='to install';red:state=='uninstalled';grey:state=='uninstallable';black:state=='installed'" string="Modules">
<field name="shortdesc"/>
openerp/addons/base/module/wizard/base_export_language_view.xml
-1
View File
@@ -5,7 +5,6 @@
<record id="wizard_lang_export" model="ir.ui.view">
<field name="name">Export Translations</field>
<field name="model">base.language.export</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Export Translations" version="7.0">
<group colspan="4" states="choose">
openerp/addons/base/module/wizard/base_import_language_view.xml
-1
View File
@@ -5,7 +5,6 @@
<record id="view_base_import_language" model="ir.ui.view">
<field name="name">Import Translation</field>
<field name="model">base.language.import</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Translation" version="7.0">
<group>
openerp/addons/base/module/wizard/base_language_install_view.xml
-1
View File
@@ -5,7 +5,6 @@
<record id="view_base_language_install" model="ir.ui.view">
<field name="name">Load a Translation</field>
<field name="model">base.language.install</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Load a Translation" version="7.0">
<field name="state" invisible="1"/>
openerp/addons/base/module/wizard/base_module_configuration_view.xml
-1
View File
@@ -5,7 +5,6 @@
<record id="view_base_module_configuration_form" model="ir.ui.view">
<field name="name">Module Configuration</field>
<field name="model">base.module.configuration</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Configuration Done" version="7.0">
<label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
openerp/addons/base/module/wizard/base_module_import_view.xml
-1
View File
@@ -5,7 +5,6 @@
<record id="view_base_module_import" model="ir.ui.view">
<field name="name">Module Import</field>
<field name="model">base.module.import</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import module" version="7.0">
<field name="state" invisible="1"/>
openerp/addons/base/module/wizard/base_module_scan_view.xml
-1
View File
@@ -5,7 +5,6 @@
<record id="view_base_module_scan" model="ir.ui.view">
<field name="name">Module Scan</field>
<field name="model">base.module.scan</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scan for new modules" version="7.0">
<label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
openerp/addons/base/module/wizard/base_module_update_view.xml
-1
View File
@@ -5,7 +5,6 @@
<record id="view_base_module_update" model="ir.ui.view">
<field name="name">Module Update</field>
<field name="model">base.module.update</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Update Module List" version="7.0">
<field name="state" invisible="1"/>
openerp/addons/base/module/wizard/base_module_upgrade_view.xml
-2
View File
@@ -5,7 +5,6 @@
<record id="view_base_module_upgrade" model="ir.ui.view">
<field name="name">Module Upgrade</field>
<field name="model">base.module.upgrade</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Update" version="7.0">
<div><label string="Your system will be updated."/></div>
@@ -41,7 +40,6 @@
<record id="view_base_module_upgrade_install" model="ir.ui.view">
<field name="name">Module Upgrade Install</field>
<field name="model">base.module.upgrade</field>
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<form string="Apply Schedule Upgrade" version="7.0">
openerp/addons/base/module/wizard/base_update_translations_view.xml
-1
View File
@@ -4,7 +4,6 @@
<record id="wizard_update_translations" model="ir.ui.view">
<field name="name">Synchronize Terms</field>
<field name="model">base.update.translations</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Synchronize Terms" version="7.0">
<group string="Synchronize Translation">
openerp/addons/base/publisher_warranty/publisher_warranty.py
+2 -2
View File
@@ -86,7 +86,7 @@ class publisher_warranty_contract(osv.osv):
db_create_date = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.create_date')
user = self.pool.get("res.users").browse(cr, uid, uid)
user_name = user.name
email = user.user_email
email = user.email
msg = {'contract_name': valid_contract.name,
'tb': tb,
@@ -333,7 +333,7 @@ def get_sys_logs(cr, uid):
"db_create_date": db_create_date,
"version": release.version,
"contracts": [c.name for c in contracts],
"language": user.context_lang,
"language": user.lang,
}
add_arg = {"timeout":30} if sys.version_info >= (2,6) else {}
openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
-5
View File
@@ -7,7 +7,6 @@
<record id="publisher_warranty_contract_tree_view" model="ir.ui.view">
<field name="name">publisher_warranty.contract.tree</field>
<field name="model">publisher_warranty.contract</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Publisher Warranty Contracts">
<field name="name"/>
@@ -21,7 +20,6 @@
<record id="publisher_warranty_contract_form_view" model="ir.ui.view">
<field name="name">publisher_warranty.contract.form</field>
<field name="model">publisher_warranty.contract</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Publisher Warranty Contract" version="7.0">
<header>
@@ -55,7 +53,6 @@
<record id="publisher_warranty_contract_search_view" model="ir.ui.view">
<field name="name">publisher_warranty.contract.search</field>
<field name="model">publisher_warranty.contract</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Publisher Warranty Contract">
<field name="name" string="Serial Key"/>
@@ -68,7 +65,6 @@
<record id="publisher_warranty_contract_view_calendar" model="ir.ui.view">
<field name="name">publisher_warranty.contract.calendar</field>
<field name="model">publisher_warranty.contract</field>
<field name="type">calendar</field>
<field name="arch" type="xml">
<calendar string="Maintenance Contract" date_start="date_start" color="state">
<field name="name"/>
@@ -91,7 +87,6 @@
<record id="publisher_warranty_contract_add_wizard" model="ir.ui.view">
<field name="name">publisher_warranty.contract.add.wizard</field>
<field name="model">publisher_warranty.contract.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Register a Contract" version="7.0">
<field name="state" invisible="1"/>
openerp/addons/base/res/ir_property_view.xml
-3
View File
@@ -5,7 +5,6 @@
<record id="ir_property_view_search" model="ir.ui.view">
<field name="name">ir.property.search</field>
<field name="model">ir.property</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Parameters">
<field name="name" string="Name"/>
@@ -21,7 +20,6 @@
<record id="ir_property_view" model="ir.ui.view">
<field name="name">ir.property.form</field>
<field name="model">ir.property</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Parameters" version="7.0">
<sheet>
@@ -46,7 +44,6 @@
<record id="ir_property_view_tree" model="ir.ui.view">
<field name="name">ir.property.tree</field>
<field name="model">ir.property</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Parameters">
<field name="name"/>
openerp/addons/base/res/photo.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

openerp/addons/base/res/res_bank_view.xml
-7
View File
@@ -5,7 +5,6 @@
<record id="view_res_bank_form" model="ir.ui.view">
<field name="name">res.bank.form</field>
<field name="model">res.bank</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bank" version="7.0">
<sheet>
@@ -41,7 +40,6 @@
<record id="view_res_bank_tree" model="ir.ui.view">
<field name="name">res.bank.tree</field>
<field name="model">res.bank</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Banks">
<field name="name"/>
@@ -63,7 +61,6 @@
<record id="view_partner_bank_type_form" model="ir.ui.view">
<field name="name">res.partner.bank.type.form</field>
<field name="model">res.partner.bank.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bank Account Type" version="7.0">
<group col="4">
@@ -78,7 +75,6 @@
<record id="view_partner_bank_type_tree" model="ir.ui.view">
<field name="name">res.partner.bank.type.tree</field>
<field name="model">res.partner.bank.type</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Bank Account Type">
<field name="name"/>
@@ -90,7 +86,6 @@
<record id="view_partner_bank_form" model="ir.ui.view">
<field name="name">res.partner.bank.form</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bank account" version="7.0">
<group col="4">
@@ -127,7 +122,6 @@
<record id="view_partner_bank_tree" model="ir.ui.view">
<field name="name">res.partner.bank.tree</field>
<field name="model">res.partner.bank</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Bank Accounts">
<field name="sequence" invisible="1"/>
@@ -142,7 +136,6 @@
<record id="view_partner_bank_search" model="ir.ui.view">
<field name="name">res.partner.bank.search</field>
<field name="model">res.partner.bank</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Bank Accounts">
<field name="bank_name" filter_domain="['|', ('bank_name','ilike',self), ('acc_number','ilike',self)]" string="Bank Name"/>
openerp/addons/base/res/res_company.py
+2 -4
View File
@@ -142,18 +142,16 @@ class res_company(osv.osv):
if phone: val.append(_('Phone: ')+phone)
if fax: val.append(_('Fax: ')+fax)
if website: val.append(_('Website: ')+website)
if vat: val.append(_('VAT: ')+vat)
if vat: val.append(_('TIN: ')+vat)
if reg: val.append(_('Reg: ')+reg)
return {'value': {'rml_footer1':' | '.join(val)}}
def _search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False, access_rights_uid=None):
if context is None:
context = {}
user_preference = context.get('user_preference', False)
if user_preference:
if context.get('user_preference'):
# We browse as superuser. Otherwise, the user would be able to
# select only the currently visible companies (according to rules,
# which are probably to allow to see the child companies) even if
openerp/addons/base/res/res_company_view.xml
-5
View File
@@ -17,7 +17,6 @@
<record id="view_company_form" model="ir.ui.view">
<field name="name">res.company.form</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Company" version="7.0">
<sheet>
@@ -102,7 +101,6 @@
<record id="view_company_tree" model="ir.ui.view">
<field name="name">res.company.tree</field>
<field name="model">res.company</field>
<field name="type">tree</field>
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
<tree string="Companies">
@@ -131,7 +129,6 @@
<record id="view_inventory_tree" model="ir.ui.view">
<field name="name">multi_company.default.tree</field>
<field name="model">multi_company.default</field>
<field name="type">tree</field>
<field name="priority" eval="8"/>
<field name="arch" type="xml">
<tree string="Multi Company">
@@ -148,7 +145,6 @@
<record id="view_inventory_form" model="ir.ui.view">
<field name="name">multi_company.default.form</field>
<field name="model">multi_company.default</field>
<field name="type">form</field>
<field name="priority" eval="8"/>
<field name="arch" type="xml">
<form string="Multi Company" version="7.0">
@@ -173,7 +169,6 @@
<record id="view_inventory_search" model="ir.ui.view">
<field name="name">multi_company.default.search</field>
<field name="model">multi_company.default</field>
<field name="type">search</field>
<field name="priority" eval="8"/>
<field name="arch" type="xml">
<search string="Multi Company">

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