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

[MERGE] Merge with trunk

Browse Source 
bzr revid: fme@openerp.com-20110825115919-vbpn3111a0gwjl13
This commit is contained in:
Fabien Meghazi
2011-08-25 13:59:19 +02:00
parent a54a00ea62 c8bb3c1ea5
commit 39d2fbbce6
114 changed files with 761 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/po/bg.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/ca.po
Vendored
+2 -2
View File
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/cs.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/da.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/de.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/el.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/en_GB.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/es.po
Vendored
+2 -2
View File
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/es_CL.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/es_EC.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/fa.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/fi.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/fr.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/gl.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/he.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/hr.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/hu.po
Vendored
+2 -2
View File
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/it.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/ja.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/ko.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/lv.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/mn.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/nb.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/nl.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/pl.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/pt.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/pt_BR.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/ro.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/ru.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/sk.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/sq.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/sr.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/sv.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
"X-Poedit-Language: Swedish\n"
#. Type: string
debian/po/tr.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/uk.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/vi.po
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/zh_CN.po
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. Type: string
#. Description
debian/po/zh_TW.po
Vendored
+2 -2
View File
@@ -12,8 +12,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
"X-Poedit-Country: TAIWAN\n"
"X-Poedit-Language: Chinese\n"
"X-Poedit-SourceCharset: utf-8\n"
openerp/addons/base/__openerp__.py
+1 -3
View File
@@ -62,7 +62,7 @@
'res/partner/partner_report.xml',
'res/partner/partner_view.xml',
'res/partner/partner_shortcut_data.xml',
'res/bank_view.xml',
'res/partner/bank_view.xml',
'res/country_view.xml',
'res/res_currency_view.xml',
'res/partner/crm_view.xml',
@@ -71,11 +71,9 @@
'res/partner/wizard/partner_clear_ids_view.xml',
'res/partner/wizard/partner_wizard_ean_check_view.xml',
'res/partner/partner_data.xml',
'res/ir_property_view.xml',
'security/base_security.xml',
'publisher_warranty/publisher_warranty_view.xml',
'security/ir.model.access.csv',
'res/res_widget_view.xml',
'res/res_widget_data.xml',
openerp/addons/base/base_update.xml
+27 -8
View File
@@ -189,6 +189,16 @@
<report id="preview_report" model="res.company" name="preview.report" multi="True"
rml="base/report/preview_report.rml" string="Preview Report"/>
<record id="bank_account_update" model="ir.actions.act_window">
<field name="name">Company Bank Accounts</field>
<field name="res_model">res.partner.bank</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
<field name="help">Configure your company's bank account and select those that must appear on the report footer. You can drag &amp; drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
</record>
<record id="view_company_form" model="ir.ui.view">
<field name="name">res.company.form</field>
<field name="model">res.company</field>
@@ -216,19 +226,28 @@
<field name="state_id"/>
<field name="phone"/>
<field name="email"/>
<field name="fax"/>
<field name="website"/>
<field name="vat"/>
<field name="company_registry"/>
<separator string="Header/Footer of Reports" colspan="4"/>
<field name="rml_header1" colspan="4"/>
<field name="rml_footer1" colspan="4"/>
<field name="rml_footer2" colspan="4"/>
<group colspan="4" col="8">
<label string="" colspan="7"/>
<button name="%(preview_report)d" string="Preview Report" type="action" icon="gtk-print"/>
<group colspan="4" col="3">
<field name="rml_header1" colspan="3"/>
<newline/>
<field name="rml_footer1" colspan="2"/>
<button name="generate_header" string="Generate" type="object" icon="gtk-go-forward"/>
<newline/>
<field name="rml_footer2" colspan="2"/>
<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
<newline/>
<label string="" colspan="2"/>
<button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
</group>
</page>
<page string="Header/Footer" groups="base.group_extended">
<page string="External Template" groups="base.group_extended">
<field colspan="4" name="rml_header" nolabel="1"/>
</page>
<page string="Internal Header/Footer" groups="base.group_extended">
<page string="Internal Template" groups="base.group_extended">
<separator string="Portrait" colspan="2"/>
<separator string="Landscape" colspan="2"/>
<field colspan="2" name="rml_header2" nolabel="1"/>
openerp/addons/base/i18n/af.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:52+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/am.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:52+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/ar.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:52+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/bg.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/bs.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/ca.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/cs.po
+5 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-07-15 18:58+0000\n"
"Last-Translator: Chronos <robie@centrum.cz>\n"
"PO-Revision-Date: 2011-08-13 17:34+0000\n"
"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
"X-Poedit-Language: Czech\n"
#. module: base
@@ -2125,7 +2125,7 @@ msgstr "Koncept"
#: selection:res.config.view,view:0
#: selection:res.users,view:0
msgid "Extended"
msgstr "Rozšířený"
msgstr "Rozšířené"
#. module: base
#: model:ir.actions.act_window,help:base.action_partner_title_contact
openerp/addons/base/i18n/da.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/de.po
+2 -2
View File
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/el.po
+2 -2
View File
@@ -12,8 +12,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
openerp/addons/base/i18n/en_GB.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/es.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/es_CL.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/es_EC.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/et.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/eu.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/fa.po
+2 -2
View File
@@ -9,8 +9,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"
openerp/addons/base/i18n/fa_AF.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/fi.po
+9 -9
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
@@ -2950,7 +2950,7 @@ msgstr "Liipaisuobjekti"
#. module: base
#: view:res.users:0
msgid "Current Activity"
msgstr ""
msgstr "Nykyinen aktiviteetti"
#. module: base
#: view:workflow.activity:0
@@ -4259,7 +4259,7 @@ msgstr "Pankit"
#. module: base
#: view:res.log:0
msgid "Unread"
msgstr ""
msgstr "Lukemattomat"
#. module: base
#: field:ir.cron,doall:0
@@ -7286,7 +7286,7 @@ msgstr "Tunisia"
#. module: base
#: model:ir.ui.menu,name:base.menu_mrp_root
msgid "Manufacturing"
msgstr "Valmistava"
msgstr "Valmistus"
#. module: base
#: model:res.country,name:base.km
@@ -7668,7 +7668,7 @@ msgstr "Kategoria"
#: selection:ir.attachment,type:0
#: selection:ir.property,type:0
msgid "Binary"
msgstr ""
msgstr "Binäärinen"
#. module: base
#: field:ir.actions.server,sms:0
@@ -8079,7 +8079,7 @@ msgstr "Asetukset"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_consumers0
msgid "Consumers"
msgstr ""
msgstr "Kuluttajat"
#. module: base
#: view:res.config:0
@@ -8781,7 +8781,7 @@ msgstr "Virhe! Et voi luoda rekursiivista valikkoa."
#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
#: view:publisher_warranty.contract.wizard:0
msgid "Register a Contract"
msgstr "Rekisteröi kontakti"
msgstr "Rekisteröi sopimus"
#. module: base
#: view:ir.rule:0
@@ -9086,7 +9086,7 @@ msgstr "Bulgaria / български език"
#. module: base
#: model:ir.ui.menu,name:base.menu_aftersale
msgid "After-Sale Services"
msgstr "Jälkimarkkinointi"
msgstr "Jälkimarkkinapalvelut"
#. module: base
#: view:ir.actions.todo:0
openerp/addons/base/i18n/fr.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/gl.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/he.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/hr.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\n"
"Language: hr\n"
#. module: base
openerp/addons/base/i18n/hu.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/hy.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/id.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/is.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/it.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/ja.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/ko.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/lt.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/lv.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/mk.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/mn.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/nb.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/nl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/nl_BE.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/pl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/pt.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
@@ -580,7 +580,7 @@ msgstr ""
#. module: base
#: field:res.partner,title:0
msgid "Partner Form"
msgstr "Formulário de Parceiros"
msgstr "Tipo de Organização"
#. module: base
#: selection:base.language.install,lang:0
@@ -618,7 +618,7 @@ msgstr "Importar idioma"
#. module: base
#: model:ir.model,name:base.model_res_config_users
msgid "res.config.users"
msgstr ""
msgstr "res.config.users"
#. module: base
#: selection:base.language.install,lang:0
openerp/addons/base/i18n/pt_BR.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/ro.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/ru.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/sk.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/sl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/sq.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:52+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/sr.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/sr@latin.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/sv.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/th.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/tlh.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/tr.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/uk.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/ur.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/vi.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/i18n/zh_CN.po
+47 -46
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
@@ -33,7 +33,7 @@ msgstr "圣赫勒拿"
#. module: base
#: view:ir.actions.report.xml:0
msgid "Other Configuration"
msgstr "其他配置"
msgstr "其它设置"
#. module: base
#: selection:ir.property,type:0
@@ -296,7 +296,7 @@ msgstr "源对象"
#. module: base
#: view:ir.actions.todo:0
msgid "Config Wizard Steps"
msgstr "配置向导步骤"
msgstr "设置向导步骤"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view_sc
@@ -806,7 +806,7 @@ msgstr "关岛（美属）"
#. module: base
#: model:ir.ui.menu,name:base.menu_hr_project
msgid "Human Resources Dashboard"
msgstr "人事管理仪表盘"
msgstr "人力资源控制台"
#. module: base
#: code:addons/base/res/res_user.py:507
@@ -840,7 +840,7 @@ msgstr "韩国"
#: model:ir.ui.menu,name:base.menu_workflow_transition
#: view:workflow.activity:0
msgid "Transitions"
msgstr "转换"
msgstr "转移"
#. module: base
#: code:addons/orm.py:4020
@@ -996,7 +996,7 @@ msgstr "请求日期"
#. module: base
#: model:ir.ui.menu,name:base.menu_hr_dasboard
msgid "Dashboard"
msgstr "仪表盘"
msgstr "控制台"
#. module: base
#: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1041,7 +1041,7 @@ msgstr "不存在代码为“%s”的语言"
#: code:addons/base/publisher_warranty/publisher_warranty.py:163
#, python-format
msgid "Error during communication with the publisher warranty server."
msgstr "当与发布者保障服务器通信时发生错误。"
msgstr "当与保障服务器通信时发生错误。"
#. module: base
#: help:ir.actions.server,email:0
@@ -1996,7 +1996,7 @@ msgstr "亚美尼亚"
#: model:ir.actions.act_window,name:base.ir_property_form
#: model:ir.ui.menu,name:base.menu_ir_property_form_all
msgid "Configuration Parameters"
msgstr "配置参数"
msgstr "设置参数"
#. module: base
#: constraint:ir.cron:0
@@ -2046,7 +2046,7 @@ msgstr "图像"
#. module: base
#: view:ir.actions.server:0
msgid "Iteration Action Configuration"
msgstr "重复活动配置"
msgstr "重复活动设置"
#. module: base
#: selection:publisher_warranty.contract,state:0
@@ -2262,7 +2262,7 @@ msgstr "ID参照"
#: model:ir.actions.server,name:base.action_start_configurator
#: model:ir.ui.menu,name:base.menu_view_base_module_configuration
msgid "Start Configuration"
msgstr "开始配置"
msgstr "开始设置"
#. module: base
#: model:res.country,name:base.mt
@@ -2961,8 +2961,7 @@ msgid ""
"\n"
"Click 'Continue' and enjoy your OpenERP experience..."
msgstr ""
"您的帐套已经全部配置完毕。\n"
"\n"
"您的帐套已经全部设置完毕。\n"
"请单击“继续”按钮开始享受您的 OpenERP 体验..."
#. module: base
@@ -3103,7 +3102,7 @@ msgstr "Abkhazian / аҧсуа"
#. module: base
#: view:base.module.configuration:0
msgid "System Configuration Done"
msgstr "系统配置完成"
msgstr "系统设置完成"
#. module: base
#: code:addons/orm.py:929
@@ -3372,7 +3371,7 @@ msgstr ""
#: view:res.request:0
#: field:res.request,history:0
msgid "History"
msgstr "历史记录"
msgstr "日志"
#. module: base
#: field:ir.attachment,create_uid:0
@@ -3430,7 +3429,7 @@ msgstr "一般说明"
#: model:ir.actions.act_window,name:base.action_config_simple_view_form
#: view:res.config.view:0
msgid "Configure Your Interface"
msgstr "配置你的界面"
msgstr "设置你的界面"
#. module: base
#: field:ir.values,meta:0
@@ -3647,7 +3646,7 @@ msgstr "ir.actions.wizard"
#: view:ir.filters:0
#: view:res.request:0
msgid "Group By"
msgstr "分组方式"
msgstr "分组"
#. module: base
#: view:res.config:0
@@ -3903,7 +3902,7 @@ msgstr "ir.actions.url"
#. module: base
#: model:res.widget,title:base.currency_converter_widget
msgid "Currency Converter"
msgstr "货币转换器"
msgstr "币别兑换"
#. module: base
#: code:addons/orm.py:156
@@ -4113,7 +4112,7 @@ msgstr "未读"
#. module: base
#: field:ir.cron,doall:0
msgid "Repeat Missed"
msgstr "重复错过的"
msgstr "重做错过的动作"
#. module: base
#: help:ir.actions.server,state:0
@@ -4129,7 +4128,7 @@ msgstr "对象映射"
#: help:res.currency,rate:0
#: help:res.currency.rate,rate:0
msgid "The rate of the currency to the currency of rate 1"
msgstr "货币到货币的转换汇率为 1"
msgstr "币别到其他币别的汇率为 1"
#. module: base
#: model:res.country,name:base.uk
@@ -4203,7 +4202,7 @@ msgstr "ir.attachment"
msgid ""
"You cannot perform this operation. New Record Creation is not allowed for "
"this object as this object is for reporting purpose."
msgstr "您不能支持此操作。此对象不允许进行“创建新记录”操作，因为此对象是为报表准备的。"
msgstr "您不能执行此操作。此对象不允许进行“创建新记录”操作，因为此对象是为报告准备的。"
#. module: base
#: view:base.language.import:0
@@ -4507,7 +4506,9 @@ msgid ""
"The configuration wizards are used to help you configure a new instance of "
"OpenERP. They are launched during the installation of new modules, but you "
"can choose to restart some wizards manually from this menu."
msgstr "配置向导将帮助您配置一个新的 OpenERP 实例。向导将在安装新模块的时候启动，但是您也可以在此菜单中手工重新启动一些向导。"
msgstr ""
"设置向导将帮助您设置一个新的 OpenERP 实例。\r\n"
"向导将在安装新模块的时候启动，但是您也可以在此菜单中手工重新启动一些向导。"
#. module: base
#: code:addons/base/res/res_user.py:206
@@ -4625,7 +4626,7 @@ msgstr "此窗口"
#. module: base
#: view:publisher_warranty.contract:0
msgid "Publisher Warranty Contracts"
msgstr "发布者担保合约"
msgstr "担保合约"
#. module: base
#: help:res.log,name:0
@@ -5152,7 +5153,7 @@ msgstr "多米尼加"
#: sql_constraint:publisher_warranty.contract:0
msgid ""
"Your publisher warranty contract is already subscribed in the system !"
msgstr "您的发布者保障合约已经在系统中订阅。"
msgstr "您的保障合约已经在系统中订阅。"
#. module: base
#: help:ir.cron,nextcall:0
@@ -5525,7 +5526,7 @@ msgid ""
msgstr ""
"如果用户已提供电子邮件，将发送欢迎邮件给他们.\\n\n"
"\\n\n"
"警告:如果“email_from”和“smtp_server”（SMTP）没有配置，将无法发送邮件给新用户。"
"警告:如果“email_from”和“smtp_server”（SMTP）没有设置，将无法发送邮件给新用户。"
#. module: base
#: selection:base.language.install,lang:0
@@ -5803,7 +5804,7 @@ msgstr "视图类型：设为“tree”来使用树形控件显示层次数据
#: code:addons/base/res/res_config.py:421
#, python-format
msgid "Click 'Continue' to configure the next addon..."
msgstr "请单击“继续”按钮配置下一个模块..."
msgstr "请单击“继续”按钮设置下一个模块..."
#. module: base
#: field:ir.actions.server,record_id:0
@@ -5873,7 +5874,7 @@ msgstr "字段描述"
#: view:res.partner.address:0
#: view:workflow.activity:0
msgid "Group By..."
msgstr "分组于"
msgstr "分组..."
#. module: base
#: view:ir.model.fields:0
@@ -6008,7 +6009,7 @@ msgstr "Spanish (CO) / Español (CO)"
msgid ""
"All pending configuration wizards have been executed. You may restart "
"individual wizards via the list of configuration wizards."
msgstr "所有挂起的配置向导已被执行，您可以通过配置向导列表重启单个向导。"
msgstr "所有挂起的设置向导已被执行，您可以通过设置向导列表重启单个向导。"
#. module: base
#: wizard_button:server.action.create,step_1,create:0
@@ -6441,14 +6442,14 @@ msgid ""
"No rate found \n"
"for the currency: %s \n"
"at the date: %s"
msgstr "找不到货币 %s 日期 %s 的比率。"
msgstr "找不到币别 %s 日期 %s 的汇率。"
#. module: base
#: model:ir.actions.act_window,help:base.action_ui_view_custom
msgid ""
"Customized views are used when users reorganize the content of their "
"dashboard views (via web client)"
msgstr "自定义视图用于用户重新组织他们的仪表盘视图内容（经由 Web 客户端）"
msgstr "自定义视图用于用户重新组织他们的控制台视图内容（通过 Web 客户端）"
#. module: base
#: field:ir.model,name:0
@@ -6634,7 +6635,7 @@ msgstr ""
#: model:ir.ui.menu,name:base.next_id_73
#: model:ir.ui.menu,name:base.reporting_menu
msgid "Reporting"
msgstr "报表"
msgstr "报告"
#. module: base
#: model:res.country,name:base.tg
@@ -6718,7 +6719,7 @@ msgstr "州/省名称"
#. module: base
#: field:workflow.activity,join_mode:0
msgid "Join Mode"
msgstr "联合模式"
msgstr "合并模式"
#. module: base
#: field:res.config.users,context_tz:0
@@ -6760,7 +6761,7 @@ msgstr "OpenERP 业务伙伴"
#. module: base
#: model:ir.ui.menu,name:base.menu_hr_manager
msgid "HR Manager Dashboard"
msgstr "人事经理仪表盘"
msgstr "人力资源经理控制台"
#. module: base
#: code:addons/base/module/module.py:253
@@ -7539,7 +7540,7 @@ msgstr "爱沙尼亚"
#. module: base
#: model:ir.ui.menu,name:base.dashboard
msgid "Dashboards"
msgstr "仪表盘"
msgstr "控制台"
#. module: base
#: help:ir.attachment,type:0
@@ -7736,7 +7737,7 @@ msgstr "标识此对象模型是否仅存于内存，比如一个不需要持久
#: field:res.partner,child_ids:0
#: field:res.request,ref_partner_id:0
msgid "Partner Ref."
msgstr "业务伙伴参照"
msgstr "业务伙伴"
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_supplier_form
@@ -7753,12 +7754,12 @@ msgstr "注册"
#. module: base
#: field:res.request,ref_doc2:0
msgid "Document Ref 2"
msgstr "单据参照2"
msgstr "单据2"
#. module: base
#: field:res.request,ref_doc1:0
msgid "Document Ref 1"
msgstr "单据参照1"
msgstr "单据1"
#. module: base
#: model:res.country,name:base.ga
@@ -7921,7 +7922,7 @@ msgstr "保加利亚"
#. module: base
#: view:publisher_warranty.contract.wizard:0
msgid "Publisher warranty contract successfully registered!"
msgstr "发布者保障合同注册成功！"
msgstr "保障合同注册成功！"
#. module: base
#: model:res.country,name:base.ao
@@ -7941,7 +7942,7 @@ msgstr "法属南部领土"
#: field:res.currency,name:0
#: field:res.currency.rate,currency_id:0
msgid "Currency"
msgstr "货币"
msgstr "币别"
#. module: base
#: field:res.partner.canal,name:0
@@ -8036,7 +8037,7 @@ msgstr "伊拉克"
#. module: base
#: model:ir.ui.menu,name:base.menu_association
msgid "Association"
msgstr "关联"
msgstr "商会"
#. module: base
#: model:res.country,name:base.cl
@@ -8468,7 +8469,7 @@ msgstr "事件日志"
#: code:addons/base/module/wizard/base_module_configuration.py:37
#, python-format
msgid "System Configuration done"
msgstr "系统配置已完成"
msgstr "系统设置已完成"
#. module: base
#: field:workflow.triggers,instance_id:0
@@ -8536,7 +8537,7 @@ msgstr "3. 如果用户属于多个组，那么第2步的结果将使用“或
#: code:addons/base/publisher_warranty/publisher_warranty.py:145
#, python-format
msgid "Please check your publisher warranty contract name and validity."
msgstr "请检查您的发布者保障合同名称和有效性。"
msgstr "请检查您的保障合同名称和有效性。"
#. module: base
#: model:res.country,name:base.sv
@@ -8634,7 +8635,7 @@ msgstr "台湾"
#. module: base
#: model:ir.model,name:base.model_res_currency_rate
msgid "Currency Rate"
msgstr "兑换率"
msgstr "汇率"
#. module: base
#: model:ir.actions.act_window,help:base.grant_menu_access
@@ -8807,7 +8808,7 @@ msgstr "电子邮件与签名"
#. module: base
#: view:publisher_warranty.contract:0
msgid "Publisher Warranty Contract"
msgstr "发布者保障合同"
msgstr "保障合同"
#. module: base
#: selection:base.language.install,lang:0
@@ -9070,7 +9071,7 @@ msgstr "地区代码"
#. module: base
#: field:workflow.activity,split_mode:0
msgid "Split Mode"
msgstr "分割模式"
msgstr "拆分模式"
#. module: base
#: view:base.module.upgrade:0
@@ -9218,7 +9219,7 @@ msgstr "下一序号将以此数增加."
#: field:res.partner.address,function:0
#: selection:workflow.activity,kind:0
msgid "Function"
msgstr "职能"
msgstr "功能"
#. module: base
#: view:res.widget:0
openerp/addons/base/i18n/zh_TW.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
"X-Generator: Launchpad (build 13613)\n"
"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
"X-Generator: Launchpad (build 13697)\n"
#. module: base
#: view:ir.filters:0
openerp/addons/base/ir/ir.xml
+1 -1
View File
@@ -535,7 +535,7 @@
<field name="type" readonly="1"/>
<field name="src_model" select="2"/>
<field name="usage"/>
<field name="menus"/>
<field name="target"/>
</group>
<notebook colspan="4">
<page string="General Settings">
openerp/addons/base/ir/ir_actions.py
+17 -10
View File
@@ -33,6 +33,7 @@ from report.report_sxw import report_sxw, report_rml
from tools.config import config
from tools.safe_eval import safe_eval as eval
from tools.translate import _
from socket import gethostname
class actions(osv.osv):
_name = 'ir.actions.actions'
@@ -284,7 +285,6 @@ class act_window(osv.osv):
'filter': fields.boolean('Filter'),
'auto_search':fields.boolean('Auto Search'),
'search_view' : fields.function(_search_view, type='text', method=True, string='Search View'),
'menus': fields.char('Menus', size=4096),
'help': fields.text('Action description',
help='Optional help text for the users with a description of the target view, such as its usage and purpose.',
translate=True),
@@ -599,16 +599,18 @@ class actions_server(osv.osv):
logger = logging.getLogger(self._name)
if context is None:
context = {}
user = self.pool.get('res.users').browse(cr, uid, uid)
for action in self.browse(cr, uid, ids, context):
obj_pool = self.pool.get(action.model_id.model)
obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
cxt = {
'context': dict(context), # copy context to prevent side-effects of eval
'object': obj,
'time':time,
'time': time,
'cr': cr,
'pool' : self.pool,
'uid' : uid
'pool': self.pool,
'uid': uid,
'user': user
}
expr = eval(str(action.condition), cxt)
if not expr:
@@ -630,13 +632,14 @@ class actions_server(osv.osv):
'uid': uid,
'object':obj,
'obj': obj,
'user': user,
}
eval(action.code, localdict, mode="exec", nocopy=True) # nocopy allows to return 'action'
if 'action' in localdict:
return localdict['action']
if action.state == 'email':
user = config['email_from']
email_from = config['email_from']
address = str(action.email)
try:
address = eval(str(action.email), cxt)
@@ -644,16 +647,20 @@ class actions_server(osv.osv):
pass
if not address:
logger.info('Partner Email address not Specified!')
logger.info('No partner email address specified, not sending any email.')
continue
if not user:
logger.info('Email-From address not Specified at server!')
raise osv.except_osv(_('Error'), _("Please specify server option --email-from !"))
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
else:
email_from = "%s@%s" % (user.login, gethostname())
subject = self.merge_message(cr, uid, action.subject, action, context)
body = self.merge_message(cr, uid, action.message, action, context)
if tools.email_send(user, [address], subject, body, debug=False, subtype='html') == True:
if tools.email_send(email_from, [address], subject, body, debug=False, subtype='html') == True:
logger.info('Email successfully sent to: %s', address)
else:
logger.warning('Failed to send email to: %s', address)
openerp/addons/base/res/__init__.py
-1
View File
@@ -22,7 +22,6 @@
import tools
import country
import bank
import res_lang
import partner
import res_config
openerp/addons/base/res/bank.py
-58
View File
@@ -1,58 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
class Bank(osv.osv):
_description='Bank'
_name = 'res.bank'
_order = 'name'
_columns = {
'name': fields.char('Name', size=128, required=True),
'code': fields.char('Code', size=64),
'street': fields.char('Street', size=128),
'street2': fields.char('Street2', size=128),
'zip': fields.char('Zip', change_default=True, size=24),
'city': fields.char('City', size=128),
'state': fields.many2one("res.country.state", 'State',
domain="[('country_id', '=', country)]"),
'country': fields.many2one('res.country', 'Country'),
'email': fields.char('E-Mail', size=64),
'phone': fields.char('Phone', size=64),
'fax': fields.char('Fax', size=64),
'active': fields.boolean('Active'),
'bic': fields.char('BIC/Swift code', size=11,
help="Bank Identifier Code"),
}
_defaults = {
'active': lambda *a: 1,
}
def name_get(self, cr, uid, ids, context=None):
result = []
for bank in self.browse(cr, uid, ids, context):
result.append((bank.id, (bank.bic and (bank.bic + ' - ') or '') + bank.name))
return result
Bank()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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