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-20120912043551-p3i8s7vllmal237j
This commit is contained in:
Jigar Amin - OpenERP
2012-09-12 10:05:51 +05:30
parent cb2c7e3a63 554313efd7
commit 8bc99d3e73
109 changed files with 856 additions and 1812 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp-server
+1 -2
View File
@@ -30,7 +30,6 @@ GNU Public Licence.
(c) 2003-TODAY, Fabien Pinckaers - OpenERP SA
"""
import imp
import logging
import os
import signal
@@ -203,7 +202,7 @@ def quit_on_signals():
try:
while quit_signals_received == 0:
time.sleep(60)
except KeyboardInterrupt, e:
except KeyboardInterrupt:
pass
if config['pidfile']:
openerp/addons/base/base_data.xml
-1025
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/country_data.xml
+11 -10
View File
@@ -70,7 +70,7 @@
<record id="au" model="res.country">
<field name="name">Australia</field>
<field name="code">au</field>
<field name="address_format" eval="'%(street)s\n%(street2)s %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="currency_id" ref="AUD"/>
</record>
<record id="aw" model="res.country">
@@ -106,7 +106,7 @@
<record id="be" model="res.country">
<field name="name">Belgium</field>
<field name="code">be</field>
<field name="address_format" eval="'%(street)s\n%(zip)s, %(city)s\n%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR"/>
</record>
<record id="bf" model="res.country">
@@ -162,7 +162,7 @@
<record id="br" model="res.country">
<field name="name">Brazil</field>
<field name="code">br</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s\n%(zip)s\n%(country_name)s'" />
<field name="currency_id" ref="BRL"/>
</record>
<record id="bs" model="res.country">
@@ -198,7 +198,7 @@
<record id="ca" model="res.country">
<field name="name">Canada</field>
<field name="code">ca</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="currency_id" ref="CAD"/>
</record>
<record id="cc" model="res.country">
@@ -350,7 +350,7 @@
<record id="es" model="res.country">
<field name="name">Spain</field>
<field name="code">es</field>
<field name="address_format" eval="'%(street)s\n%(zip)s %(city)s,%(state_name)s\n%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR"/>
</record>
<record id="et" model="res.country">
@@ -386,7 +386,7 @@
<record id="fr" model="res.country">
<field name="name">France</field>
<field name="code">fr</field>
<field name="address_format" eval="'%(street)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR"/>
</record>
<record id="ga" model="res.country">
@@ -532,7 +532,7 @@
<record id="in" model="res.country">
<field name="name">India</field>
<field name="code">in</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(zip)s\n%(state_name)s%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />
<field name="currency_id" ref="INR"/>
</record>
<record id="io" model="res.country">
@@ -838,7 +838,7 @@
<record id="nl" model="res.country">
<field name="name">Netherlands</field>
<field name="code">nl</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR"/>
</record>
<record id="no" model="res.country">
@@ -1174,7 +1174,7 @@
</record>
<record id="uk" model="res.country">
<field name="name">United Kingdom</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(country_name)s\n%(zip)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />
<field name="code">gb</field>
<field name="currency_id" ref="GBP"/>
</record>
@@ -1186,7 +1186,7 @@
<record id="us" model="res.country">
<field name="name">United States</field>
<field name="code">us</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="currency_id" ref="USD"/>
</record>
<record id="uy" model="res.country">
@@ -1269,6 +1269,7 @@
<field name="code">zm</field>
<field name="currency_id" ref="ZMK"/>
</record>
<!-- DEPRECATED, New name of Zaire is Democratic Republic of the Congo ! -->
<record id="zr" model="res.country">
<field name="name">Zaire</field>
openerp/addons/base/i18n/af.po
+5 -5
View File
@@ -794,7 +794,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3701,7 +3701,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5480,7 +5480,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -11014,7 +11014,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11134,7 +11134,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/am.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/ar.po
+5 -5
View File
@@ -798,7 +798,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3769,7 +3769,7 @@ msgstr "GPL-2 أو إصدار أحدث"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5573,7 +5573,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "رمز الولاية (ثلاثة حروف).\n"
#. module: base
@@ -11138,7 +11138,7 @@ msgstr "المتواليات"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11261,7 +11261,7 @@ msgstr "مرشح الفرز"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "السيدة"
#. module: base
openerp/addons/base/i18n/base.pot
+36 -17
View File
@@ -727,7 +727,7 @@ msgstr ""
#: help:ir.actions.todo,type:0
msgid "Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets automatically to Done."
"Launch Manually Once: after having been launched manually, it sets automatically to Done."
msgstr ""
#. module: base
@@ -1317,11 +1317,6 @@ msgstr ""
msgid "Create _Menu"
msgstr ""
#. module: base
#: field:res.payterm,name:0
msgid "Payment Term (short name)"
msgstr ""
#. module: base
#: model:ir.model,name:base.model_res_bank
#: view:res.bank:0
@@ -2155,7 +2150,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Portugese (BR) / Português (BR)"
msgid "Portuguese (BR) / Português (BR)"
msgstr ""
#. module: base
@@ -3002,7 +2997,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Portugese / Português"
msgid "Portuguese / Português"
msgstr ""
#. module: base
@@ -3206,11 +3201,6 @@ msgstr ""
msgid "Error ! You cannot create recursive associated members."
msgstr ""
#. module: base
#: view:res.payterm:0
msgid "Payment Term"
msgstr ""
#. module: base
#: selection:res.lang,direction:0
msgid "Right-to-Left"
@@ -3430,7 +3420,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Sir"
msgstr ""
#. module: base
@@ -5037,7 +5027,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
""
msgstr ""
@@ -10134,7 +10124,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -10249,7 +10239,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
@@ -11306,6 +11296,35 @@ msgstr ""
msgid "Madam"
msgstr ""
#. module: base
#: model:res.partner.title,name:base.res_partner_title_mister
msgid "Mister"
msgstr ""
#. module: base
#: model:res.partner.title,name:base.res_partner_title_doctor
msgid "Doctor"
msgstr ""
#. module: base
#: model:res.partner.title,name:base.res_partner_title_prof
msgid "Professor"
msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_mister
msgid "Mr."
msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_doctor
msgid "Dr."
msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_prof
msgid "Prof."
msgstr ""
#. module: base
#: model:res.country,name:base.ee
msgid "Estonia"
openerp/addons/base/i18n/bg.po
+6 -6
View File
@@ -799,7 +799,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3753,8 +3753,8 @@ msgstr "GPL версия 2 или по-нова"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5554,7 +5554,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Кодът на държавата в три букви.\n"
#. module: base
@@ -11117,7 +11117,7 @@ msgstr "Последователност"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11237,7 +11237,7 @@ msgstr "Филтър"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Г-жа"
#. module: base
openerp/addons/base/i18n/bs.po
+5 -5
View File
@@ -783,7 +783,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3690,7 +3690,7 @@ msgstr "GPL-2 ili novija verzija"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5469,7 +5469,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -11003,7 +11003,7 @@ msgstr "Sekvence"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11123,7 +11123,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/ca.po
+5 -5
View File
@@ -807,7 +807,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3805,7 +3805,7 @@ msgstr "GPL-2 o versió posterior"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Sr."
#. module: base
@@ -5641,7 +5641,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "El codi de la província de 3 caràcters.\n"
#. module: base
@@ -11259,7 +11259,7 @@ msgstr "Seqüències"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Sra."
#. module: base
@@ -11385,7 +11385,7 @@ msgstr "Filtre"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Sra."
#. module: base
openerp/addons/base/i18n/cs.po
+6 -6
View File
@@ -805,7 +805,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3835,8 +3835,8 @@ msgstr "GPL-2 nebo pozdější verze"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5650,7 +5650,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Kód státu ve třech znacích.\n"
#. module: base
@@ -11276,7 +11276,7 @@ msgstr "Posloupnosti"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Paní"
#. module: base
@@ -11398,7 +11398,7 @@ msgstr "Filtr"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Pan"
#. module: base
openerp/addons/base/i18n/da.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr "Sekvenser"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/de.po
+5 -5
View File
@@ -869,7 +869,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr "Manuell: manuell gestartet"
@@ -4345,7 +4345,7 @@ msgstr "GPL-2 oder höher"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Hr."
#. module: base
@@ -6486,7 +6486,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Der 3 stellige Staatencode\n"
#. module: base
@@ -12558,7 +12558,7 @@ msgstr "Sequenzen"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Frau"
#. module: base
@@ -12683,7 +12683,7 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Frau"
#. module: base
openerp/addons/base/i18n/el.po
+5 -5
View File
@@ -795,7 +795,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3776,7 +3776,7 @@ msgstr "GPL-2 ή μεταγενέστερη έκδοση"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5589,7 +5589,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Ο κωδικός κατάστασης με 3 χαρακτήρες\n"
#. module: base
@@ -11159,7 +11159,7 @@ msgstr "Ιεραρχήσεις"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11281,7 +11281,7 @@ msgstr "Φίλτρο"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Κα/Δς"
#. module: base
openerp/addons/base/i18n/en_GB.po
+9 -9
View File
@@ -862,7 +862,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manual: Launched manually.\n"
@@ -4355,8 +4355,8 @@ msgstr "GPL-2 or later version"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -6310,8 +6310,8 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgstr "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "The state code in max. three chars."
#. module: base
#: model:res.country,name:base.sj
@@ -11913,8 +11913,8 @@ msgstr "Sequences"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgstr "Mss"
msgid "Miss"
msgstr "Miss"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -12038,8 +12038,8 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgstr "Ms."
msgid "Mrs."
msgstr "Mrs."
#. module: base
#: view:base.module.import:0
openerp/addons/base/i18n/es.po
+5 -5
View File
@@ -853,7 +853,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manual: Se lanza manualmente.\n"
@@ -4029,7 +4029,7 @@ msgstr "GPL-2 o versión posterior"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Sr."
#. module: base
@@ -5868,7 +5868,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "El código de la provincia de 3 caracteres.\n"
#. module: base
@@ -11486,7 +11486,7 @@ msgstr "Secuencias"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Sra."
#. module: base
@@ -11613,7 +11613,7 @@ msgstr "Filtro"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Sra."
#. module: base
openerp/addons/base/i18n/es_CL.po
+5 -5
View File
@@ -835,7 +835,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3843,7 +3843,7 @@ msgstr "GPL-2 o versión posterior"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Sr."
#. module: base
@@ -5682,7 +5682,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "El código de la provincia de 3 caracteres.\n"
#. module: base
@@ -11300,7 +11300,7 @@ msgstr "Secuencias"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Sra."
#. module: base
@@ -11427,7 +11427,7 @@ msgstr "Filtro"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Sra."
#. module: base
openerp/addons/base/i18n/es_CR.po
+5 -5
View File
@@ -879,7 +879,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manual: Lanzado manualmente.\n"
@@ -4442,7 +4442,7 @@ msgstr "GPL-2 o versión posterior"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Sr."
#. module: base
@@ -6736,7 +6736,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "El código de la provincia de 3 caracteres.\n"
#. module: base
@@ -13818,7 +13818,7 @@ msgstr "Secuencias"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Sra."
#. module: base
@@ -13945,7 +13945,7 @@ msgstr "Filtro"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Sra."
#. module: base
openerp/addons/base/i18n/es_EC.po
+7 -7
View File
@@ -847,7 +847,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manual: Se lanza manualmente.\n"
@@ -4019,8 +4019,8 @@ msgstr "GPL-2 o versión posterior"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5872,7 +5872,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "El código de la provincia de 3 caracteres.\n"
#. module: base
@@ -11535,8 +11535,8 @@ msgstr "Secuencias"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgstr "Mss"
msgid "Miss"
msgstr "Miss"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -11662,7 +11662,7 @@ msgstr "Filtro"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Sra."
#. module: base
openerp/addons/base/i18n/et.po
+5 -5
View File
@@ -788,7 +788,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3713,7 +3713,7 @@ msgstr "GPL-2 või hilisem versioon"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5499,7 +5499,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Maakonna kolmekohaline kood.\n"
#. module: base
@@ -11043,7 +11043,7 @@ msgstr "Jadad"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11163,7 +11163,7 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/eu.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/fa.po
+5 -5
View File
@@ -786,7 +786,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3715,7 +3715,7 @@ msgstr "مجوز GPL-2 یا نگارش بالاتر"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5502,7 +5502,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "کد استان در ۳ نویسه‌ای.\n"
#. module: base
@@ -11048,7 +11048,7 @@ msgstr "دنباله‌ها"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11168,7 +11168,7 @@ msgstr "پالایه"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/fa_AF.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/fi.po
+6 -6
View File
@@ -805,7 +805,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3799,7 +3799,7 @@ msgstr "GPL-2 tai myöhäisempi versio"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5630,7 +5630,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Osavaltion koodi kolmella kirjaimella.\n"
#. module: base
@@ -11278,7 +11278,7 @@ msgstr "Jaksot"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11404,8 +11404,8 @@ msgstr "Suodin"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgstr "Ms."
msgid "Mrs."
msgstr "Mrs."
#. module: base
#: view:base.module.import:0
openerp/addons/base/i18n/fr.po
+7 -7
View File
@@ -879,7 +879,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manuel : lancé manuellement.\n"
@@ -4422,7 +4422,7 @@ msgstr "GPL-2 ou version supérieure"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "M."
#. module: base
@@ -6659,7 +6659,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Le code état en trois caractères.\n"
#. module: base
@@ -13001,8 +13001,8 @@ msgstr "Séquences"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgstr "Mme"
msgid "Miss"
msgstr "Mlle"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -13129,8 +13129,8 @@ msgstr "Filtre"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgstr "Mlle"
msgid "Mrs."
msgstr "Mme"
#. module: base
#: view:base.module.import:0
openerp/addons/base/i18n/gl.po
+7 -7
View File
@@ -808,7 +808,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3805,8 +3805,8 @@ msgstr "GPL-2 ou versión posterior"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5635,7 +5635,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "O código de estado en tres caracteres.\n"
#. module: base
@@ -11245,8 +11245,8 @@ msgstr "Secuencias"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgstr "MSS"
msgid "Miss"
msgstr "Miss"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -11372,7 +11372,7 @@ msgstr "Filtro"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Ms"
#. module: base
openerp/addons/base/i18n/he.po
+5 -5
View File
@@ -785,7 +785,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3702,7 +3702,7 @@ msgstr "גרסא GPL-2 או מאוחרת יותר."
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5487,7 +5487,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "ביטוי הקוד בשלוש תוים.\n"
#. module: base
@@ -11030,7 +11030,7 @@ msgstr "רציפות"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11150,7 +11150,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/hr.po
+5 -5
View File
@@ -840,7 +840,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3835,7 +3835,7 @@ msgstr "GPL-2 ili novija verzija"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "g."
#. module: base
@@ -5646,7 +5646,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Troznamenkasta šifra države/pokrajine/županije.\n"
#. module: base
@@ -11218,7 +11218,7 @@ msgstr "Sekvence"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "gđica"
#. module: base
@@ -11344,7 +11344,7 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "gđa."
#. module: base
openerp/addons/base/i18n/hu.po
+7 -7
View File
@@ -804,7 +804,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3792,7 +3792,7 @@ msgstr "GPL-2 vagy korábbi verzió"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Úr"
#. module: base
@@ -5625,7 +5625,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Az állam kódja három karakterben.\n"
#. module: base
@@ -11243,8 +11243,8 @@ msgstr "Sorszámok"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgstr "Mss"
msgid "Miss"
msgstr "Miss"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -11372,8 +11372,8 @@ msgstr "Szűrő"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgstr "Ms."
msgid "Mrs."
msgstr "Mrs."
#. module: base
#: view:base.module.import:0
openerp/addons/base/i18n/hy.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/id.po
+5 -5
View File
@@ -779,7 +779,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3686,7 +3686,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5465,7 +5465,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10999,7 +10999,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11119,7 +11119,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/is.po
+5 -5
View File
@@ -793,7 +793,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Handvirkt: Keyrt handvirkt\n"
@@ -3716,7 +3716,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5495,7 +5495,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -11033,7 +11033,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11153,7 +11153,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/it.po
+7 -7
View File
@@ -847,7 +847,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manuale: Esegui manualmente\n"
@@ -3855,8 +3855,8 @@ msgstr "GPL-2 o successiva"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5690,7 +5690,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Il codice dello stato in 3 caratteri\n"
#. module: base
@@ -11312,8 +11312,8 @@ msgstr "Sequenze"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgstr "Mss"
msgid "Miss"
msgstr "Miss"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -11439,7 +11439,7 @@ msgstr "Filtro"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Sig.ra"
#. module: base
openerp/addons/base/i18n/kk.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr "Сүзгі"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "миссис"
#. module: base
openerp/addons/base/i18n/ko.po
+5 -5
View File
@@ -784,7 +784,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3729,7 +3729,7 @@ msgstr "GPL-2 또는 이후 버젼"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5518,7 +5518,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "3문자의 상태 코드\n"
#. module: base
@@ -11056,7 +11056,7 @@ msgstr "시퀀스"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11176,7 +11176,7 @@ msgstr "필터"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/lt.po
+5 -5
View File
@@ -778,7 +778,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3694,7 +3694,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5483,7 +5483,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Savivaldybės kodas iš trijų simbolių.\n"
#. module: base
@@ -11029,7 +11029,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11149,7 +11149,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Ponia"
#. module: base
openerp/addons/base/i18n/lt_LT.po
+1 -1
View File
@@ -5407,7 +5407,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
""
msgstr ""
openerp/addons/base/i18n/mk.po
+5 -5
View File
@@ -786,7 +786,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3693,7 +3693,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5472,7 +5472,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -11006,7 +11006,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11126,7 +11126,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/mn.po
+6 -6
View File
@@ -860,7 +860,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Гараар: Гараар ажилуулна.\n"
@@ -4217,8 +4217,8 @@ msgstr "GPL-2 болон дараагийн хувилбар"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -6338,7 +6338,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Мужийн код гурван тэмдэгтээр.\n"
#. module: base
@@ -13104,7 +13104,7 @@ msgstr "Дараалал"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Хатагтай"
#. module: base
@@ -13230,7 +13230,7 @@ msgstr "Шүүлт"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Хатагтай."
#. module: base
openerp/addons/base/i18n/nb.po
+6 -6
View File
@@ -807,7 +807,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3746,8 +3746,8 @@ msgstr "GPL-2 eller senere versjon"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5545,7 +5545,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Koden til staten med tre karakterer.\n"
#. module: base
@@ -11093,7 +11093,7 @@ msgstr "Sekvenser"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11213,7 +11213,7 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/nl.po
+5 -5
View File
@@ -836,7 +836,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Handmatig: Start handmatig.\n"
@@ -3940,7 +3940,7 @@ msgstr "GPL-2 of latere versie"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Hr."
#. module: base
@@ -5803,7 +5803,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "De provinciecode in drie karakters.\n"
#. module: base
@@ -11528,7 +11528,7 @@ msgstr "Reeksen"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Mej."
#. module: base
@@ -11655,7 +11655,7 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Mw."
#. module: base
openerp/addons/base/i18n/nl_BE.po
+5 -5
View File
@@ -790,7 +790,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3697,7 +3697,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5476,7 +5476,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -11010,7 +11010,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11130,7 +11130,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/nl_NL.po
+1 -1
View File
@@ -5598,7 +5598,7 @@ msgstr "STOCK_MEDIA_PAUSE"
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "De provinciecode in drie karakters.\n"
#. module: base
openerp/addons/base/i18n/pl.po
+5 -5
View File
@@ -797,7 +797,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3778,7 +3778,7 @@ msgstr "GPL-2 lub wersja późniejsza"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5599,7 +5599,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Trzyliterowy kod regionu\n"
#. module: base
@@ -11196,7 +11196,7 @@ msgstr "Numeracje"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11318,7 +11318,7 @@ msgstr "Filtr"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Pani"
#. module: base
openerp/addons/base/i18n/pt_BR.po
+6 -6
View File
@@ -877,7 +877,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manual: Iniciado manualmente\n"
@@ -4222,8 +4222,8 @@ msgstr "GPL-2 ou versão superior"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -6159,7 +6159,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "O código de situação com 3 caracteres.\n"
#. module: base
@@ -12111,7 +12111,7 @@ msgstr "Seqüências"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Sra"
#. module: base
@@ -12238,7 +12238,7 @@ msgstr "Filtro"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Sra."
#. module: base
openerp/addons/base/i18n/ro.po
+5 -5
View File
@@ -877,7 +877,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manual: Lansat manual.\n"
@@ -4414,7 +4414,7 @@ msgstr "GPL-2 sau o versiune mai noua"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Dl."
#. module: base
@@ -6695,7 +6695,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Codul statului, din trei caractere.\n"
#. module: base
@@ -13750,7 +13750,7 @@ msgstr "Secvente"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "D-ra"
#. module: base
@@ -13878,7 +13878,7 @@ msgstr "Filtru"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Dna."
#. module: base
openerp/addons/base/i18n/ru.po
+37 -31
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-08-20 15:45+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2012-09-10 14:37+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2012-09-05 04:43+0000\n"
"X-Generator: Launchpad (build 15901)\n"
"X-Launchpad-Export-Date: 2012-09-11 04:50+0000\n"
"X-Generator: Launchpad (build 15924)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -604,7 +604,7 @@ msgstr "Испанский (VE) / Español (VE)"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
msgid "Invoice on Timesheets"
msgstr ""
msgstr "Счет по затратам времени"
#. module: base
#: view:base.module.upgrade:0
@@ -830,7 +830,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -1269,7 +1269,7 @@ msgstr "Порт SMTP"
#. module: base
#: model:ir.module.module,shortdesc:base.module_import_sugarcrm
msgid "SugarCRM Import"
msgstr ""
msgstr "Импорт SugarCRM"
#. module: base
#: view:res.lang:0
@@ -1374,7 +1374,7 @@ msgstr "Система управления документами"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_claim
msgid "Claims Management"
msgstr ""
msgstr "Управление претензиями"
#. module: base
#: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1749,6 +1749,12 @@ msgid ""
" Apply Different Category for the product.\n"
" "
msgstr ""
"\n"
" Базовый модуль управления ланчами\n"
"\n"
" Отслеживание заказов, движения средств, кассы, продукции.\n"
" Возможность разнесения продукции по категориям.\n"
" "
#. module: base
#: model:res.country,name:base.kg
@@ -1862,7 +1868,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_html_view
msgid "Html View"
msgstr ""
msgstr "Просмотр HTML"
#. module: base
#: field:res.currency,position:0
@@ -2533,7 +2539,7 @@ msgstr "Идеи"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_crm
msgid "Opportunity to Quotation"
msgstr ""
msgstr "Предложение в Запрос цен"
#. module: base
#: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2767,7 +2773,7 @@ msgstr "Словения"
#. module: base
#: help:res.currency,name:0
msgid "Currency Code (ISO 4217)"
msgstr ""
msgstr "Код валюты (ISO 4217)"
#. module: base
#: model:ir.actions.act_window,name:base.res_log_act_window
@@ -3267,7 +3273,7 @@ msgstr "Режим SMTP-over-SSL недоступен"
#. module: base
#: model:ir.module.module,shortdesc:base.module_survey
msgid "Survey"
msgstr ""
msgstr "Опрос"
#. module: base
#: view:base.language.import:0
@@ -3315,7 +3321,7 @@ msgstr "Уругвай"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail_crm
msgid "eMail Gateway for Leads"
msgstr ""
msgstr "Шлюз эл.почты для кандидатов"
#. module: base
#: selection:base.language.install,lang:0
@@ -3530,7 +3536,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_report_webkit
msgid "Webkit Report Engine"
msgstr ""
msgstr "Инструмент создания отчетов Webkit"
#. module: base
#: selection:publisher_warranty.contract,state:0
@@ -3557,7 +3563,7 @@ msgstr "Майотта"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_todo
msgid "Tasks on CRM"
msgstr ""
msgstr "Задачи по CRM"
#. module: base
#: model:ir.module.category,name:base.module_category_generic_modules_accounting
@@ -3683,12 +3689,12 @@ msgstr "Обнаружена рекурсия."
#. module: base
#: model:ir.module.module,shortdesc:base.module_report_webkit_sample
msgid "Webkit Report Samples"
msgstr ""
msgstr "Примеры отчетов Webkit"
#. module: base
#: model:ir.module.module,shortdesc:base.module_point_of_sale
msgid "Point Of Sale"
msgstr ""
msgstr "Точка продажи"
#. module: base
#: code:addons/base/module/module.py:302
@@ -3812,7 +3818,7 @@ msgstr "Проверка кода Ean"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgstr "ИНН"
msgstr "НДС"
#. module: base
#: field:res.users,new_password:0
@@ -3859,7 +3865,7 @@ msgstr "GPL версии 2 или более поздней"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "Г-н"
#. module: base
@@ -3945,7 +3951,7 @@ msgstr "Поддержка iCal"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail
msgid "Email Gateway"
msgstr ""
msgstr "Шлюз эл.почты"
#. module: base
#: code:addons/base/ir/ir_mail_server.py:439
@@ -4069,7 +4075,7 @@ msgstr "Португалия"
#. module: base
#: model:ir.module.module,shortdesc:base.module_share
msgid "Share any Document"
msgstr ""
msgstr "Совместный доступ r любым документам"
#. module: base
#: field:ir.module.module,certificate:0
@@ -4407,7 +4413,7 @@ msgstr "Код должен быть уникальным"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_expense
msgid "Expenses Management"
msgstr ""
msgstr "Управление расходами"
#. module: base
#: view:workflow.activity:0
@@ -4418,7 +4424,7 @@ msgstr "Входящие переходы"
#. module: base
#: field:ir.values,value_unpickle:0
msgid "Default value or action reference"
msgstr ""
msgstr "Значение по умолчанию или ссылка на действие"
#. module: base
#: model:res.country,name:base.sr
@@ -4558,7 +4564,7 @@ msgstr "Экваториальная Гвинея"
#. module: base
#: model:ir.module.module,shortdesc:base.module_warning
msgid "Warning Messages and Alerts"
msgstr ""
msgstr "Предупреждающие сообщения и оповещения"
#. module: base
#: view:base.module.import:0
@@ -4870,7 +4876,7 @@ msgstr "Договор уже зарегистрирован в системе."
#: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
msgid "Bank Account Types"
msgstr ""
msgstr "Типы банковского счета"
#. module: base
#: help:ir.sequence,suffix:0
@@ -4880,7 +4886,7 @@ msgstr "Суффикс записи для нумерации"
#. module: base
#: help:ir.mail_server,smtp_user:0
msgid "Optional username for SMTP authentication"
msgstr ""
msgstr "Необязательное имя пользователя для аутентификации SMTP"
#. module: base
#: model:ir.model,name:base.model_ir_actions_actions
@@ -4935,7 +4941,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_chat
msgid "Web Chat"
msgstr ""
msgstr "Веб-чат"
#. module: base
#: field:res.company,rml_footer2:0
@@ -4966,7 +4972,7 @@ msgstr "Права доступа"
#: code:addons/base/ir/ir_model.py:311
#, python-format
msgid "Changing the storing system for field \"%s\" is not allowed."
msgstr ""
msgstr "Изменение системы хранения для поля \"%s\" не допускается."
#. module: base
#: help:res.partner.bank,company_id:0
@@ -5699,7 +5705,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Код области из трёх букв.\n"
#. module: base
@@ -11330,7 +11336,7 @@ msgstr "Нумерация"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Г-жа"
#. module: base
@@ -11456,7 +11462,7 @@ msgstr "Фильтр"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Г-жа"
#. module: base
openerp/addons/base/i18n/sk.po
+5 -5
View File
@@ -792,7 +792,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3760,7 +3760,7 @@ msgstr "GPL-2 alebo novšia verzia"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "pán"
#. module: base
@@ -5574,7 +5574,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Kód štátu na 3 znaky.\n"
#. module: base
@@ -11163,7 +11163,7 @@ msgstr "Postupnosti"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "slečna"
#. module: base
@@ -11290,7 +11290,7 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "pani"
#. module: base
openerp/addons/base/i18n/sl.po
+5 -5
View File
@@ -801,7 +801,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3789,7 +3789,7 @@ msgstr "GPL-2 ali naslednja verzija"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "G."
#. module: base
@@ -5617,7 +5617,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Koda zvezne države v treh znakih.\n"
#. module: base
@@ -11220,7 +11220,7 @@ msgstr "Zaporedja"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Gospodična"
#. module: base
@@ -11348,7 +11348,7 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Ga."
#. module: base
openerp/addons/base/i18n/sq.po
+5 -5
View File
@@ -774,7 +774,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3681,7 +3681,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5460,7 +5460,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10994,7 +10994,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11114,7 +11114,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/sr.po
+8 -8
View File
@@ -795,7 +795,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3758,8 +3758,8 @@ msgstr "GPL-2 ili novija verzija"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5561,7 +5561,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Šifra države u ti karaktera.\n"
#. module: base
@@ -11139,8 +11139,8 @@ msgstr "Sekvence"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgstr "Mss"
msgid "Miss"
msgstr "Miss"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -11259,8 +11259,8 @@ msgstr "Filter"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgstr "Ms."
msgid "Mrs."
msgstr "Mrs."
#. module: base
#: view:base.module.import:0
openerp/addons/base/i18n/sv.po
+6 -6
View File
@@ -842,7 +842,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manuell: Starta manuellt.\n"
@@ -4000,8 +4000,8 @@ msgstr "GPL-2 eller senare version"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5862,7 +5862,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Landskod, tre tecken\n"
#. module: base
@@ -11651,7 +11651,7 @@ msgstr "Nummerserier"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Fru"
#. module: base
@@ -11775,7 +11775,7 @@ msgstr "Filtrera"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Frk."
#. module: base
openerp/addons/base/i18n/th.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr "ลำดับ"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/tlh.po
+5 -5
View File
@@ -774,7 +774,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3681,7 +3681,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5460,7 +5460,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10994,7 +10994,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11114,7 +11114,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/tr.po
+6 -6
View File
@@ -806,7 +806,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3824,8 +3824,8 @@ msgstr "GPL-2 veya sonraki sürümü"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgstr "M."
msgid "Mr."
msgstr "Mr."
#. module: base
#: code:addons/base/module/module.py:519
@@ -5662,7 +5662,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Üç karakterden oluşan eyalet kodu.\n"
#. module: base
@@ -11280,7 +11280,7 @@ msgstr "Silsileler"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr "Bayan"
#. module: base
@@ -11404,7 +11404,7 @@ msgstr "Süzgeç"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "Bayan"
#. module: base
openerp/addons/base/i18n/uk.po
+5 -5
View File
@@ -796,7 +796,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3717,7 +3717,7 @@ msgstr "GPL-2 або пізніша версія"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5507,7 +5507,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "Код області довжиною в три букви.\n"
#. module: base
@@ -11046,7 +11046,7 @@ msgstr "Послідовності"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11166,7 +11166,7 @@ msgstr "Фільтр"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/uk_UA.po
+1 -1
View File
@@ -5424,7 +5424,7 @@ msgstr "STOCK_MEDIA_PAUSE"
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
""
msgstr ""
openerp/addons/base/i18n/ur.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/vi.po
+5 -5
View File
@@ -799,7 +799,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3709,7 +3709,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5490,7 +5490,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -11028,7 +11028,7 @@ msgstr "Sequences"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11150,7 +11150,7 @@ msgstr "Bộ lọc"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/zh_CN.po
+6 -6
View File
@@ -821,7 +821,7 @@ msgstr "OpenERP的翻译在Launchpad.net网站上进行，OpenERP项目本身也
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
"手动：手动执行\n"
@@ -4083,7 +4083,7 @@ msgstr "GPL-2 或更新版本"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr "先生"
#. module: base
@@ -5993,7 +5993,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "三个字符的省／州代码\n"
#. module: base
@@ -11847,8 +11847,8 @@ msgstr "序列"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgstr "Mss"
msgid "Miss"
msgstr "Miss"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -11967,7 +11967,7 @@ msgstr "过滤"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "女士"
#. module: base
openerp/addons/base/i18n/zh_HK.po
+5 -5
View File
@@ -775,7 +775,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5461,7 +5461,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr ""
#. module: base
@@ -10995,7 +10995,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11115,7 +11115,7 @@ msgstr ""
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr ""
#. module: base
openerp/addons/base/i18n/zh_TW.po
+5 -5
View File
@@ -779,7 +779,7 @@ msgstr ""
msgid ""
"Manual: Launched manually.\n"
"Automatic: Runs whenever the system is reconfigured.\n"
"Launch Manually Once: after hacing been launched manually, it sets "
"Launch Manually Once: after having been launched manually, it sets "
"automatically to Done."
msgstr ""
@@ -3687,7 +3687,7 @@ msgstr "GPL-2 或更新版本"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_sir
msgid "M."
msgid "Mr."
msgstr ""
#. module: base
@@ -5470,7 +5470,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgid "The state code in max. three chars."
msgstr "三個字元之省或州代碼\n"
#. module: base
@@ -11013,7 +11013,7 @@ msgstr "序列"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
msgid "Mss"
msgid "Miss"
msgstr ""
#. module: base
@@ -11133,7 +11133,7 @@ msgstr "過濾器"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_madam
msgid "Ms."
msgid "Mrs."
msgstr "女士"
#. module: base
openerp/addons/base/ir/ir_actions.py
+2 -2
View File
@@ -573,7 +573,7 @@ class actions_server(osv.osv):
# ids : original ids
# id : current id of the object
# OUT:
# False : Finnished correctly
# False : Finished correctly
# ACTION_ID : Action to launch
# FIXME: refactor all the eval() calls in run()!
@@ -770,7 +770,7 @@ class ir_actions_todo(osv.osv):
'type': fields.selection(TODO_TYPES, 'Type', required=True,
help="""Manual: Launched manually.
Automatic: Runs whenever the system is reconfigured.
Launch Manually Once: after hacing been launched manually, it sets automatically to Done."""),
Launch Manually Once: after having been launched manually, it sets automatically to Done."""),
'groups_id': fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
'note': fields.text('Text', translate=True),
}
openerp/addons/base/module/module_data.xml
+1 -1
View File
@@ -134,7 +134,7 @@
</record>
<record model="res.groups" id="group_multi_currency">
<field name="category_id" ref="module_category_usability"/>
<field name="category_id" ref="module_category_hidden"/>
</record>
<record model="res.groups" id="group_no_one">
openerp/addons/base/report/corporate_defaults.xml
+1 -2
View File
@@ -2,8 +2,7 @@
<corporate-header>
<corporation type="zoom" name="company_id">
<rml_header1 type="field" name="rml_header1"/>
<rml_footer1 type="field" name="rml_footer1"/>
<rml_footer2 type="field" name="rml_footer2"/>
<rml_footer type="field" name="rml_footer"/>
<title type="field" name="partner_id.title"/>
<name type="field" name="partner_id.name"/>
<street type="field" name="street"/>
openerp/addons/base/report/corporate_defaults.xsl
+2 -4
View File
@@ -39,8 +39,7 @@
<!--page bottom-->
<lines>1.5cm 2.2cm 19.9cm 2.2cm</lines>
<drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer1"/></drawCentredString>
<drawCentredString x="10.5cm" y="1.25cm"><xsl:value-of select="//corporate-header/corporation/rml_footer2"/></drawCentredString>
<drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer"/></drawCentredString>
<drawCentredString x="10.5cm" y="0.8cm">Your contact : <xsl:value-of select="//corporate-header/user/name"/></drawCentredString>
</xsl:template>
@@ -73,8 +72,7 @@
<!--page bottom-->
<lines>1.5cm 1.2cm 19.9cm 1.2cm</lines>
<drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer1"/></drawCentredString>
<drawCentredString x="10.5cm" y="1.25cm"><xsl:value-of select="//corporate-header/corporation/rml_footer2"/></drawCentredString>
<drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer"/></drawCentredString>
<!-- <drawCentredString x="10.5cm" y="0.8cm">Your contact : <xsl:value-of select="//corporate-header/user/name"/></drawCentredString>-->
</xsl:template>
openerp/addons/base/report/corporate_sxw_header.xml
+1 -2
View File
@@ -233,8 +233,7 @@
<table:table-column table:style-name="Table1.A"/>
<table:table-row>
<table:table-cell table:style-name="Table1.A1" table:value-type="string">
<text:p text:style-name="P7">[[ company.rml_footer1 ]]</text:p>
<text:p text:style-name="P7">[[ company.rml_footer2 ]]</text:p>
<text:p text:style-name="P7">[[ company.rml_footer ]]</text:p>
<text:p text:style-name="P7">Contact : [[ user.name ]]</text:p>
</table:table-cell>
</table:table-row>
openerp/addons/base/report/mako_footer.html
+2 -9
View File
@@ -7,15 +7,8 @@
</tr>
<tr>
<td>
% if company['rml_footer1']:
<p align = "center"><small><b>${company.rml_footer1}</b></small></br></p>
%endif
</td>
</tr>
<tr>
<td>
% if company['rml_footer2']:
<p align = "center"><small><b>${company.rml_footer2}</b></small></br></p>
% if company['rml_footer']:
<p align="center"><small><b>${company.rml_footer}</b></small></p>
%endif
</td>
</tr>
openerp/addons/base/res/res_bank.py
+3 -4
View File
@@ -109,7 +109,7 @@ class res_partner_bank(osv.osv):
if not context.get('address'):
return value
for address in self.pool.get('res.partner').resolve_o2m_commands_to_record_dicts(
for address in self.pool.get('res.partner').resolve_2many_commands(
cursor, user, 'address', context['address'], ['type', field], context=context):
if address.get('type') == 'default':
@@ -199,9 +199,8 @@ class res_partner_bank(osv.osv):
if not val._data[val.id]['bank_name']:
val._data[val.id]['bank_name'] = _('BANK')
result = self._prepare_name_get(cr, uid, t, val, context=context)
except:
result += ' [Formatting Error]'
raise
except Exception:
raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format."))
res.append((val.id, result))
return res
openerp/addons/base/res/res_bank_view.xml
+4 -3
View File
@@ -91,8 +91,9 @@
<group col="4">
<field name="state"/>
<field name="acc_number"/>
<field name="company_id" on_change="onchange_company_id(company_id)" invisible="context.get('company_hide', True)" widget="selection"/>
<field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
<field name="company_id" on_change="onchange_company_id(company_id)"
invisible="context.get('company_hide', True)" widget="selection"/>
<field name="footer" invisible="context.get('footer_hide', True)"/>
</group>
<group>
<group name="owner" string="Bank Account Owner">
@@ -128,7 +129,7 @@
<field name="acc_number"/>
<field name="bank_name"/>
<field name="company_id" invisible="context.get('company_hide', True)"/>
<field name="footer" invisible="context.get('company_hide', True)"/>
<field name="footer" invisible="context.get('footer_hide', True)"/>
<field name="partner_id"/>
</tree>
</field>
openerp/addons/base/res/res_company.py
+63 -27
View File
@@ -89,7 +89,6 @@ class res_company(osv.osv):
result[company.id][field] = address[field] or False
return result
def _set_address_data(self, cr, uid, company_id, name, value, arg, context=None):
""" Write the 'address' functional fields. """
company = self.browse(cr, uid, company_id, context=context)
@@ -103,18 +102,18 @@ class res_company(osv.osv):
part_obj.create(cr, uid, {name: value or False, 'parent_id': company.partner_id.id}, context=context)
return True
_columns = {
'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
'partner_id': fields.many2one('res.partner', 'Partner', required=True),
'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
'rml_footer1': fields.char('General Information Footer', size=200),
'rml_footer2': fields.char('Bank Accounts Footer', size=250, help="Write here your bank accounts for customer payments."),
'rml_header': fields.text('RML Header', required=True),
'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
'rml_header2': fields.text('RML Internal Header', required=True),
'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
'rml_footer': fields.text('Report Footer', help="Footer text displayed at the bottom of all reports. Automatically set based on company details, "\
"but may also be customized by directly editing it."),
'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually. Otherwise it will be filled in automatically."),
'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
@@ -138,15 +137,38 @@ class res_company(osv.osv):
_sql_constraints = [
('name_uniq', 'unique (name)', 'The company name must be unique !')
]
def on_change_header(self, cr, uid, ids, phone, email, fax, website, vat, reg=False, context=None):
val = []
if phone: val.append(_('Phone: ')+phone)
if fax: val.append(_('Fax: ')+fax)
if website: val.append(_('Website: ')+website)
if vat: val.append(_('TIN: ')+vat)
if reg: val.append(_('Reg: ')+reg)
return {'value': {'rml_footer1':' | '.join(val)}}
def onchange_footer(self, cr, uid, ids, context=None):
# when touched, the footer becomes custom
return {'value': {'custom_footer': True}}
def set_auto_footer(self, cr, uid, ids, context=None):
# unset the flag 'custom_footer'; this will automatically compute the footer
return self.write(cr, uid, ids, {'custom_footer': False}, context=context)
def compute_footer(self, cr, uid, ids, context=None):
res_partner_bank = self.pool.get('res.partner.bank')
for company in self.browse(cr, uid, ids, context):
if not company.custom_footer:
# first line (notice that missing elements are filtered out before the join)
res = ' | '.join(filter(bool, [
company.phone and '%s: %s' % (_('Phone'), company.phone),
company.fax and '%s: %s' % (_('Fax'), company.fax),
company.email and '%s: %s' % (_('Email'), company.email),
company.website and '%s: %s' % (_('Website'), company.website),
company.vat and '%s: %s' % (_('TIN'), company.vat),
company.company_registry and '%s: %s' % (_('Reg'), company.company_registry),
]))
# second line: bank accounts
account_ids = [acc.id for acc in company.bank_ids if acc.footer]
account_names = res_partner_bank.name_get(cr, uid, account_ids, context=context)
if account_names:
title = _('Bank Accounts') if len(account_names) > 1 else _('Bank Account')
res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names))
# update footer
self.write(cr, uid, [company.id], {'rml_footer': res}, context=context)
return True
def on_change_country(self, cr, uid, ids, country_id, context=None):
currency_id = self._get_euro(cr, uid, context=context)
if country_id:
@@ -226,11 +248,17 @@ class res_company(osv.osv):
self.cache_restart(cr)
company_id = super(res_company, self).create(cr, uid, vals, context=context)
obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context)
self.compute_footer(cr, uid, [company_id], context=context)
return company_id
def write(self, cr, *args, **argv):
def write(self, cr, uid, ids, values, context=None):
self.cache_restart(cr)
return super(res_company, self).write(cr, *args, **argv)
if isinstance(ids, (int, long)):
ids = [ids]
super(res_company, self).write(cr, uid, ids, values, context=context)
if 'rml_footer' not in values:
self.compute_footer(cr, uid, ids, context=context)
return True
def _get_euro(self, cr, uid, context=None):
rate_obj = self.pool.get('res.currency.rate')
@@ -272,20 +300,22 @@ class res_company(osv.osv):
return self._header_a4
_header_main = """
<header>
<header>
<pageTemplate>
<frame id="first" x1="1.3cm" y1="2.5cm" height="%s" width="19.0cm"/>
<frame id="first" x1="1.3cm" y1="3.0cm" height="%s" width="19.0cm"/>
<stylesheet>
<paraStyle name="main_footer" fontName="DejaVu Sans" fontSize="8.0" alignment="CENTER"/>
</stylesheet>
<pageGraphics>
<!-- You Logo - Change X,Y,Width and Height -->
<image x="1.3cm" y="%s" height="40.0" >[[ company.logo or removeParentNode('image') ]]</image>
<setFont name="DejaVu Sans" size="8"/>
<fill color="black"/>
<stroke color="black"/>
<!-- page header -->
<lines>1.3cm %s 20cm %s</lines>
<drawRightString x="20cm" y="%s">[[ company.rml_header1 ]]</drawRightString>
<drawString x="1.3cm" y="%s">[[ company.partner_id.name ]]</drawString>
<drawString x="1.3cm" y="%s">[[ company.partner_id.street or '' ]]</drawString>
<drawString x="1.3cm" y="%s">[[ company.partner_id.city or '' ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name or '']]</drawString>
@@ -295,13 +325,19 @@ class res_company(osv.osv):
<drawRightString x="7cm" y="%s">[[ company.partner_id.email or '' ]]</drawRightString>
<lines>1.3cm %s 7cm %s</lines>
<!-- left margin -->
<rotate degrees="90"/>
<fill color="grey"/>
<drawString x="2.65cm" y="-0.4cm">produced by OpenERP.com</drawString>
<fill color="black"/>
<rotate degrees="-90"/>
<!--page bottom-->
<lines>1.2cm 2.15cm 19.9cm 2.15cm</lines>
<drawCentredString x="10.5cm" y="1.7cm">[[ company.rml_footer1 ]]</drawCentredString>
<drawCentredString x="10.5cm" y="1.25cm">[[ company.rml_footer2 ]]</drawCentredString>
<drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
<lines>1.2cm 2.65cm 19.9cm 2.65cm</lines>
<place x="1.3cm" y="0cm" height="2.55cm" width="19.0cm">
<para style="main_footer">[[ company.rml_footer ]]</para>
<para style="main_footer">Contact : [[ user.name ]] - Page: <pageNumber/></para>
</place>
</pageGraphics>
</pageTemplate>
</header>"""
openerp/addons/base/res/res_company_view.xml
+22 -21
View File
@@ -31,19 +31,15 @@
<h1>
<field name="name" class="oe_inline"/>
</h1>
<label for="rml_header1" class="oe_edit_only"/>
<div>
<field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
</div>
</div>
<group col="4">
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
<field name="parent_id" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="General Information">
<group>
<group>
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
<label for="street" string="Address"/>
<div>
<field name="street" placeholder="Street..."/>
@@ -55,30 +51,36 @@
</div>
<field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}' on_change="on_change_country(country_id)"/>
</div>
<label for="rml_header1"/>
<div>
<field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
</div>
<field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
</group>
<group>
<field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="phone"/>
<field name="fax"/>
<field name="email"/>
<field name="vat"/>
<field name="company_registry"/>
</group>
</group>
<group string="Bank Accounts">
<field name="bank_ids" colspan="4" nolabel="1"/>
<label for="rml_footer2"/>
<div name="bank_acc">
<field name="rml_footer2"/>
<!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
<field name="bank_ids" nolabel="1"
context="{'default_company_id': active_id, 'footer_hide': False}"/>
</group>
<group string="Report Footer Configuration">
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
<field name="custom_footer" invisible="1"/>
<label for="rml_footer"/>
<div>
<field name="rml_footer" on_change="onchange_footer()"/>
<button string="Set Automatic Footer" type="object" name="set_auto_footer"
attrs="{'invisible': [('custom_footer','=',False)]}" class="oe_edit_only"/>
</div>
</group>
</page>
<page string="Header/Footer" groups="base.group_no_one">
<group>
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
<field name="rml_footer1"/>
</group>
<label for="rml_header"/>
<field name="rml_header"/>
<label for="rml_header2"/>
@@ -162,7 +164,7 @@
<field name="sequence"/>
</group>
</group>
</sheet>
</sheet>
</form>
</field>
</record>
@@ -190,4 +192,3 @@
</data>
</openerp>
openerp/addons/base/res/res_config.py
+17
View File
@@ -552,5 +552,22 @@ class res_config_settings(osv.osv_memory):
if action_ids:
return act_window.read(cr, uid, action_ids[0], [], context=context)
return {}
def name_get(self, cr, uid, ids, context=None):
""" Override name_get method to return an appropriate configuration wizard
name, and not the generated name."""
if not ids:
return []
# name_get may receive int id instead of an id list
if isinstance(ids, (int, long)):
ids = [ids]
act_window = self.pool.get('ir.actions.act_window')
action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)], context=context)
name = self._name
if action_ids:
name = act_window.read(cr, uid, action_ids[0], ['name'], context=context)['name']
return [(record.id, name) for record in self.browse(cr, uid , ids, context=context)]
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
openerp/addons/base/res/res_country.py
+4 -3
View File
@@ -64,7 +64,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
'The code of the country must be unique !')
]
_defaults = {
'address_format': "%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s\n%(country_name)s",
'address_format': "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s",
}
_order='name'
@@ -89,9 +89,10 @@ class CountryState(osv.osv):
_columns = {
'country_id': fields.many2one('res.country', 'Country',
required=True),
'name': fields.char('State Name', size=64, required=True),
'name': fields.char('State Name', size=64, required=True,
help='Administrative divisions of a country. E.g. Fed. State, Departement, Canton'),
'code': fields.char('State Code', size=3,
help='The state code in three chars.\n', required=True),
help='The state code in max. three chars.', required=True),
}
_order = 'code'
openerp/addons/base/res/res_partner.py
+42 -57
View File
@@ -21,7 +21,6 @@
import math
import openerp
import os
from osv import osv, fields
import re
import tools
@@ -33,14 +32,6 @@ import pytz
def _tz_get(self,cr,uid, context=None):
return [(x, x) for x in pytz.all_timezones]
class res_payterm(osv.osv):
_description = 'Payment term'
_name = 'res.payterm'
_order = 'name'
_columns = {
'name': fields.char('Payment Term (short name)', size=64),
}
class res_partner_category(osv.osv):
def name_get(self, cr, uid, ids, context=None):
@@ -58,20 +49,20 @@ class res_partner_category(osv.osv):
return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
if isinstance(ids, (int, long)):
ids = [ids]
reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
res = []
for record in reads:
name = record['name']
if record['parent_id']:
name = record['parent_id'][1]+' / '+name
name = record['parent_id'][1] + ' / ' + name
res.append((record['id'], name))
return res
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args=[]
args = []
if not context:
context={}
context = {}
if name:
# Be sure name_search is symetric to name_get
name = name.split(' / ')[-1]
@@ -85,23 +76,23 @@ class res_partner_category(osv.osv):
res = self.name_get(cr, uid, ids, context=context)
return dict(res)
_description='Partner Categories'
_description = 'Partner Categories'
_name = 'res.partner.category'
_columns = {
'name': fields.char('Category Name', required=True, size=64, translate=True),
'parent_id': fields.many2one('res.partner.category', 'Parent Category', select=True, ondelete='cascade'),
'complete_name': fields.function(_name_get_fnc, type="char", string='Full Name'),
'child_ids': fields.one2many('res.partner.category', 'parent_id', 'Child Categories'),
'active' : fields.boolean('Active', help="The active field allows you to hide the category without removing it."),
'parent_left' : fields.integer('Left parent', select=True),
'parent_right' : fields.integer('Right parent', select=True),
'active': fields.boolean('Active', help="The active field allows you to hide the category without removing it."),
'parent_left': fields.integer('Left parent', select=True),
'parent_right': fields.integer('Right parent', select=True),
'partner_ids': fields.many2many('res.partner', id1='category_id', id2='partner_id', string='Partners'),
}
_constraints = [
(osv.osv._check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
]
_defaults = {
'active' : lambda *a: 1,
'active': lambda *a: 1,
}
_parent_store = True
_parent_order = 'name'
@@ -113,7 +104,7 @@ class res_partner_title(osv.osv):
_columns = {
'name': fields.char('Title', required=True, size=46, translate=True),
'shortcut': fields.char('Abbreviation', size=16, translate=True),
'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
'domain': fields.selection([('partner', 'Partner'), ('contact', 'Contact')], 'Domain', required=True, size=24)
}
_defaults = {
'domain': 'contact',
@@ -129,13 +120,13 @@ POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'countr
ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
class res_partner(osv.osv):
_description='Partner'
_description = 'Partner'
_name = "res.partner"
def _address_display(self, cr, uid, ids, name, args, context=None):
res={}
res = {}
for partner in self.browse(cr, uid, ids, context=context):
res[partner.id] =self._display_address(cr, uid, partner, context=context)
res[partner.id] = self._display_address(cr, uid, partner, context=context)
return res
def _get_image(self, cr, uid, ids, name, args, context=None):
@@ -143,7 +134,7 @@ class res_partner(osv.osv):
for obj in self.browse(cr, uid, ids, context=context):
result[obj.id] = tools.image_get_resized_images(obj.image)
return result
def _set_image(self, cr, uid, id, name, value, args, context=None):
return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
@@ -151,7 +142,7 @@ class res_partner(osv.osv):
_columns = {
'name': fields.char('Name', size=128, required=True, select=True),
'date': fields.date('Date', select=1),
'title': fields.many2one('res.partner.title','Title'),
'title': fields.many2one('res.partner.title', 'Title'),
'parent_id': fields.many2one('res.partner', 'Owned by'),
'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
'ref': fields.char('Reference', size=64, select=1),
@@ -162,9 +153,9 @@ class res_partner(osv.osv):
"It is important to set a value for this field. You should use the same timezone "
"that is otherwise used to pick and render date and time values: your computer's timezone."),
'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
'vat': fields.char('TIN',size=32 ,help="Tax Identification Number. Check the box if the partner is subjected to taxes. Used by the some of the legal statements."),
'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if the partner is subjected to taxes. Used by the some of the legal statements."),
'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
'website': fields.char('Website',size=64, help="Website of Partner or Company"),
'website': fields.char('Website', size=64, help="Website of Partner or Company"),
'comment': fields.text('Notes'),
'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'), # should be removed in version 7, but kept until then for backward compatibility
'category_id': fields.many2many('res.partner.category', id1='partner_id', id2='category_id', string='Tags'),
@@ -175,8 +166,8 @@ class res_partner(osv.osv):
'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
'employee': fields.boolean('Employee', help="Check this box if the partner is an Employee."),
'function': fields.char('Job Position', size=128),
'type': fields.selection( [('default','Default'), ('invoice','Invoice'),
('delivery','Delivery'), ('contact','Contact'),
'type': fields.selection([('default', 'Default'), ('invoice', 'Invoice'),
('delivery', 'Delivery'), ('contact', 'Contact'),
('other', 'Other')], 'Address Type',
help="Used to select automatically the right address according to the context in sales and purchases documents."),
'street': fields.char('Street', size=128),
@@ -193,25 +184,24 @@ class res_partner(osv.osv):
'birthdate': fields.char('Birthdate', size=64),
'is_company': fields.boolean('Company', help="Check if the contact is a company, otherwise it is a person"),
'use_parent_address': fields.boolean('Use Company Address', help="Select this if you want to set company's address information for this contact"),
# image: all image fields are base64 encoded and PIL-supported
'image': fields.binary("Image",
help="This field holds the image used as avatar for the "\
"partner. The image is base64 encoded, and PIL-supported. "\
"It is limited to a 1024x1024 px image."),
help="This field holds the image used as avatar for the partner, limited to 1024x1024px"),
'image_medium': fields.function(_get_image, fnct_inv=_set_image,
string="Medium-sized image", type="binary", multi="_get_image",
store = {
store={
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
},
help="Medium-sized image of the partner. It is automatically "\
"resized as a 180x180 px image, with aspect ratio preserved. "\
"resized as a 128x128px image, with aspect ratio preserved. "\
"Use this field in form views or some kanban views."),
'image_small': fields.function(_get_image, fnct_inv=_set_image,
string="Small-sized image", type="binary", multi="_get_image",
store = {
store={
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
},
help="Small-sized image of the partner. It is automatically "\
"resized as a 50x50 px image, with aspect ratio preserved. "\
"resized as a 64x64px image, with aspect ratio preserved. "\
"Use this field anywhere a small image is required."),
'company_id': fields.many2one('res.company', 'Company', select=1),
'color': fields.integer('Color Index'),
@@ -230,40 +220,35 @@ class res_partner(osv.osv):
if is_company:
image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
else:
from PIL import Image
from StringIO import StringIO
color = (255,255,255)
if colorize:
from random import random
color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32))
face = Image.open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png'))
avatar = Image.new('RGB', face.size)
avatar.paste(color)
avatar.paste(face, mask=face)
buffer = StringIO()
avatar.save(buffer, 'PNG')
image = buffer.getvalue()
return image.encode('base64')
image = tools.image_colorize(open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read())
return tools.image_resize_image_big(image.encode('base64'))
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if (not view_id) and (view_type=='form') and context and context.get('force_email', False):
view_id = self.pool.get('ir.model.data').get_object_reference(cr, user, 'base', 'view_partner_simple_form')[1]
return super(res_partner, self).fields_view_get(cr, user, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
_defaults = {
'active': True,
'lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
'tz': lambda self, cr, uid, context: context.get('tz', False),
'lang': lambda self, cr, uid, ctx: ctx.get('lang', 'en_US'),
'tz': lambda self, cr, uid, ctx: ctx.get('tz', False),
'customer': True,
'category_id': _default_category,
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
'company_id': lambda self, cr, uid, ctx: self.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=ctx),
'color': 0,
'is_company': False,
'type': 'default',
'use_parent_address': True,
'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, context.get('default_is_company', False), context),
'image': lambda self, cr, uid, ctx: self._get_default_image(cr, uid, ctx.get('default_is_company', False), ctx),
}
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
name = self.read(cr, uid, [id], ['name'], context)[0]['name']
default.update({'name': _('%s (copy)')%(name)})
default.update({'name': _('%s (copy)') % (name)})
return super(res_partner, self).copy(cr, uid, id, default, context)
def onchange_type(self, cr, uid, ids, is_company, context=None):
@@ -512,7 +497,7 @@ class res_partner(osv.osv):
# get the information that will be injected into the display format
# get the address format
address_format = address.country_id and address.country_id.address_format or \
'%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s'
"%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s"
args = {
'state_code': address.state_id and address.state_id.code or '',
'state_name': address.state_id and address.state_id.name or '',
@@ -525,10 +510,10 @@ class res_partner(osv.osv):
args[field] = getattr(address, field) or ''
if without_company:
args['company_name'] = ''
elif address.parent_id:
address_format = '%(company_name)s\n' + address_format
return address_format % args
# res.partner.address is deprecated; it is still there for backward compability only and will be removed in next version
class res_partner_address(osv.osv):
_table = "res_partner"
openerp/addons/base/res/res_partner_data.xml
+18 -3
View File
@@ -20,17 +20,32 @@
<record id="res_partner_title_madam" model="res.partner.title">
<field name="domain">contact</field>
<field name="name">Madam</field>
<field name="shortcut">Ms.</field>
<field name="shortcut">Mrs.</field>
</record>
<record id="res_partner_title_miss" model="res.partner.title">
<field name="domain">contact</field>
<field name="name">Miss</field>
<field name="shortcut">Mss</field>
<field name="shortcut">Miss</field>
</record>
<record id="res_partner_title_sir" model="res.partner.title">
<field name="domain">contact</field>
<field name="name">Sir</field>
<field name="shortcut">M.</field>
<field name="shortcut">Sir</field>
</record>
<record id="res_partner_title_mister" model="res.partner.title">
<field name="domain">contact</field>
<field name="name">Mister</field>
<field name="shortcut">Mr.</field>
</record>
<record id="res_partner_title_doctor" model="res.partner.title">
<field name="domain">contact</field>
<field name="name">Doctor</field>
<field name="shortcut">Dr.</field>
</record>
<record id="res_partner_title_prof" model="res.partner.title">
<field name="domain">contact</field>
<field name="name">Professor</field>
<field name="shortcut">Prof.</field>
</record>
<!-- Default bank account description -->
openerp/addons/base/res/res_partner_view.xml
+20 -19
View File
@@ -89,6 +89,26 @@
</field>
</record>
<record id="view_partner_simple_form" model="ir.ui.view">
<field name="name">res.partner.simplified.form</field>
<field name="model">res.partner</field>
<field name="arch" type="xml">
<form string="Contact" version="7.0">
<field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
<div class="oe_title">
<group>
<field name="name"/>
<field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
<field name="function" placeholder="e.g. Sales Director"/>
<field name="email" required="context.get('force_email', False)"/>
<field name="phone"/>
<field name="mobile"/>
</group>
</div>
</form>
</field>
</record>
<record id="view_partner_form" model="ir.ui.view">
<field name="name">res.partner.form</field>
<field name="model">res.partner</field>
@@ -423,25 +443,6 @@
<field name="filter" eval="True"/>
</record>
<record id="view_payterm_form" model="ir.ui.view">
<field name="name">res.payterm</field>
<field name="model">res.payterm</field>
<field name="arch" type="xml">
<form string="Payment Term" version="7.0">
<group>
<field name="name"/>
</group>
</form>
</field>
</record>
<record id="action_payterm_form" model="ir.actions.act_window">
<field name="name">Payment term</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.payterm</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_payterm_form"/>
</record>
<!-- Categories -->
<record id="view_partner_category_form" model="ir.ui.view">
<field name="name">Partner Categories</field>
openerp/addons/base/res/res_users.py
+18 -6
View File
@@ -52,7 +52,19 @@ class groups(osv.osv):
else:
res[g.id] = g.name
return res
def _search_group(self, cr, uid, obj, name, args, context=None):
operand = args[0][2]
operator = args[0][1]
values = operand.split('/')
group_name = values[0]
where = [('name', operator, group_name)]
if len(values) > 1:
application_name = values[0]
group_name = values[1]
where = ['|',('category_id.name', operator, application_name)] + where
return where
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True),
'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
@@ -62,7 +74,7 @@ class groups(osv.osv):
'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
'comment' : fields.text('Comment', size=250, translate=True),
'category_id': fields.many2one('ir.module.category', 'Application', select=True),
'full_name': fields.function(_get_full_name, type='char', string='Group Name'),
'full_name': fields.function(_get_full_name, type='char', string='Group Name', fnct_search=_search_group),
}
_sql_constraints = [
@@ -244,14 +256,14 @@ class res_users(osv.osv):
return result
_defaults = {
'password' : '',
'active' : True,
'password': '',
'active': True,
'customer': False,
'menu_id': _get_menu,
'company_id': _get_company,
'company_ids': _get_companies,
'groups_id': _get_group,
'image': lambda self, cr, uid, context: self.pool.get('res.partner')._get_default_image(cr, uid, False, context, colorize=True),
'image': lambda self, cr, uid, ctx={}: self.pool.get('res.partner')._get_default_image(cr, uid, False, ctx, colorize=True),
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -806,7 +818,7 @@ class users_view(osv.osv):
for app, kind, gs in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
if kind == 'selection':
# selection group field
tips = ['%s: %s' % (g.name, g.comment or '') for g in gs]
tips = ['%s: %s' % (g.name, g.comment) for g in gs if g.comment]
res[name_selection_groups(map(int, gs))] = {
'type': 'selection',
'string': app and app.name or _('Other'),
openerp/addons/base/security/ir.model.access.csv
-1
View File
@@ -107,7 +107,6 @@
"access_ir_actions_server_all","ir_actions_server_all","model_ir_actions_server",,1,0,0,0
"access_ir_actions_server_group_system","ir_actions_server_group_system","model_ir_actions_server","group_system",1,1,1,1
"access_res_bank_group_system","res_bank_group_system","model_res_bank","group_system",1,1,1,1
"access_res_payterm_group_system","res_payterm_group_system","model_res_payterm","group_system",1,1,1,1
"access_res_bank_group_partner_manager","res_bank_group_partner_manager","model_res_bank","group_partner_manager",1,1,1,1
"access_res_bank_user","res_bank user","model_res_bank","group_user",1,0,0,0
"access_multi_company_default user","multi_company_default all","model_multi_company_default",,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
107 access_ir_actions_server_all ir_actions_server_all model_ir_actions_server 1 0 0 0
108 access_ir_actions_server_group_system ir_actions_server_group_system model_ir_actions_server group_system 1 1 1 1
109 access_res_bank_group_system res_bank_group_system model_res_bank group_system 1 1 1 1
access_res_payterm_group_system res_payterm_group_system model_res_payterm group_system 1 1 1 1
110 access_res_bank_group_partner_manager res_bank_group_partner_manager model_res_bank group_partner_manager 1 1 1 1
111 access_res_bank_user res_bank user model_res_bank group_user 1 0 0 0
112 access_multi_company_default user multi_company_default all model_multi_company_default 1 0 0 0
openerp/netsvc.py
+8 -8
View File
@@ -86,12 +86,12 @@ class Service(object):
cls._services.pop(name)
def LocalService(name):
# Special case for addons support, will be removed in a few days when addons
# are updated to directly use openerp.osv.osv.service.
if name == 'object_proxy':
return openerp.osv.osv.service
# Special case for addons support, will be removed in a few days when addons
# are updated to directly use openerp.osv.osv.service.
if name == 'object_proxy':
return openerp.osv.osv.service
return Service._services[name]
return Service._services[name]
class ExportService(object):
""" Proxy for exported services.
@@ -238,9 +238,9 @@ def init_logger():
# server intended to test it.
def init_alternative_logger():
class H(logging.Handler):
def emit(self, record):
if record.levelno > 20:
print record.levelno, record.pathname, record.msg
def emit(self, record):
if record.levelno > 20:
print record.levelno, record.pathname, record.msg
handler = H()
# Add the handler to the 'openerp' logger.
logger = logging.getLogger('openerp')
openerp/osv/orm.py
+49 -59
View File
@@ -892,8 +892,8 @@ class BaseModel(object):
for c in cls.__dict__.get(s, []):
exist = False
for c2 in range(len(new)):
#For _constraints, we should check field and methods as well
if new[c2][2]==c[2] and (new[c2][0] == c[0] \
#For _constraints, we should check field and methods as well
if new[c2][2]==c[2] and (new[c2][0] == c[0] \
or getattr(new[c2][0],'__name__', True) == \
getattr(c[0],'__name__', False)):
# If new class defines a constraint with
@@ -1308,7 +1308,7 @@ class BaseModel(object):
if not line[i]:
continue
if field[:len(prefix)] <> prefix:
if field[:len(prefix)] != prefix:
if line[i] and skip:
return False
continue
@@ -2709,7 +2709,7 @@ class BaseModel(object):
# if val is a many2one, just write the ID
if type(val) == tuple:
val = val[0]
if (val<>False) or (type(val)<>bool):
if val is not False:
cr.execute(update_query, (ss[1](val), key))
def _check_selection_field_value(self, cr, uid, field, value, context=None):
@@ -2733,7 +2733,7 @@ class BaseModel(object):
elif val in dict(self._columns[field].selection(self, cr, uid, context=context)):
return
raise except_orm(_('ValidateError'),
_('The value "%s" for the field "%s.%s" is not in the selection') % (value, self._table, field))
_('The value "%s" for the field "%s.%s" is not in the selection') % (value, self._table, field))
def _check_removed_columns(self, cr, log=False):
# iterate on the database columns to drop the NOT NULL constraints
@@ -5013,66 +5013,56 @@ class BaseModel(object):
return True
def resolve_o2m_commands_to_record_dicts(self, cr, uid, field_name, o2m_commands, fields=None, context=None):
""" Serializes o2m commands into record dictionaries (as if
all the o2m records came from the database via a read()), and
returns an iterable over these dictionaries.
def resolve_2many_commands(self, cr, uid, field_name, commands, fields=None, context=None):
""" Serializes one2many and many2many commands into record dictionaries
(as if all the records came from the database via a read()). This
method is aimed at onchange methods on one2many and many2many fields.
Because o2m commands might be creation commands, not all
record ids will contain an ``id`` field. Commands matching an
existing record (``UPDATE`` and ``LINK_TO``) will have an id.
Because commands might be creation commands, not all record dicts
will contain an ``id`` field. Commands matching an existing record
will have an ``id``.
.. note:: ``CREATE``, ``UPDATE`` and ``LINK_TO`` stand for the
o2m command codes ``0``, ``1`` and ``4``
respectively
:param field_name: name of the o2m field matching the commands
:type field_name: str
:param o2m_commands: one2many commands to execute on ``field_name``
:type o2m_commands: list((int|False, int|False, dict|False))
:param fields: list of fields to read from the database, when applicable
:type fields: list(str)
:raises AssertionError: if a command is not ``CREATE``, ``UPDATE`` or ``LINK_TO``
:returns: o2m records in a shape similar to that returned by
``read()`` (except records may be missing the ``id``
field if they don't exist in db)
:rtype: ``list(dict)``
:param field_name: name of the one2many or many2many field matching the commands
:type field_name: str
:param commands: one2many or many2many commands to execute on ``field_name``
:type commands: list((int|False, int|False, dict|False))
:param fields: list of fields to read from the database, when applicable
:type fields: list(str)
:returns: records in a shape similar to that returned by ``read()``
(except records may be missing the ``id`` field if they don't exist in db)
:rtype: list(dict)
"""
o2m_model = self._all_columns[field_name].column._obj
result = [] # result (list of dict)
record_ids = [] # ids of records to read
updates = {} # {id: dict} of updates on particular records
# convert single ids and pairs to tripled commands
commands = []
for o2m_command in o2m_commands:
if not isinstance(o2m_command, (list, tuple)):
command = 4
commands.append((command, o2m_command, False))
elif len(o2m_command) == 1:
(command,) = o2m_command
commands.append((command, False, False))
elif len(o2m_command) == 2:
command, id = o2m_command
commands.append((command, id, False))
else:
command = o2m_command[0]
commands.append(o2m_command)
assert command in (0, 1, 4), \
"Only CREATE, UPDATE and LINK_TO commands are supported in resolver"
for command in commands:
if not isinstance(command, (list, tuple)):
record_ids.append(command)
elif command[0] == 0:
result.append(command[2])
elif command[0] == 1:
record_ids.append(command[1])
updates.setdefault(command[1], {}).update(command[2])
elif command[0] in (2, 3):
record_ids = [id for id in record_ids if id != command[1]]
elif command[0] == 4:
record_ids.append(command[1])
elif command[0] == 5:
result, record_ids = [], []
elif command[0] == 6:
result, record_ids = [], list(command[2])
# extract records to read, by id, in a mapping dict
ids_to_read = [id for (command, id, _) in commands if command in (1, 4)]
records_by_id = dict(
(record['id'], record)
for record in self.pool.get(o2m_model).read(
cr, uid, ids_to_read, fields=fields, context=context))
# read the records and apply the updates
other_model = self.pool.get(self._all_columns[field_name].column._obj)
for record in other_model.read(cr, uid, record_ids, fields=fields, context=context):
record.update(updates.get(record['id'], {}))
result.append(record)
record_dicts = []
# merge record from db with record provided by command
for command, id, record in commands:
item = {}
if command in (1, 4): item.update(records_by_id[id])
if command in (0, 1): item.update(record)
record_dicts.append(item)
return record_dicts
return result
# for backward compatibility
resolve_o2m_commands_to_record_dicts = resolve_2many_commands
# keep this import here, at top it will cause dependency cycle errors
import expression
openerp/release.py
+1 -1
View File
@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
openerp/report/custom.py
+11 -16
View File
@@ -21,7 +21,6 @@
import os
import time
import openerp.netsvc as netsvc
import openerp.tools as tools
from openerp.tools.safe_eval import safe_eval as eval
@@ -67,7 +66,6 @@ class report_custom(report_int):
#
def _row_get(self, cr, uid, objs, fields, conditions, row_canvas=None, group_by=None):
result = []
tmp = []
for obj in objs:
tobreak = False
for cond in conditions:
@@ -108,7 +106,7 @@ class report_custom(report_int):
key = levels.keys()
for l in key:
objs = eval('obj.'+l,{'obj': obj})
if not isinstance(objs, browse_record_list) and type(objs) <> type([]):
if not isinstance(objs, (browse_record_list, list)):
objs = [objs]
field_new = []
cond_new = []
@@ -221,11 +219,9 @@ class report_custom(report_int):
res_dic[prev].append(line)
else:
prev = line[groupby]
if res_dic.has_key(line[groupby]):
res_dic[line[groupby]].append(line)
else:
res_dic[line[groupby]] = []
res_dic[line[groupby]].append(line)
res_dic.setdefault(line[groupby], [])
res_dic[line[groupby]].append(line)
#we use the keys in results since they are ordered, whereas in res_dic.heys() they aren't
for key in filter(None, [x[groupby] for x in results]):
row = []
@@ -267,7 +263,7 @@ class report_custom(report_int):
else:
try:
row.append(float(r[j]))
except:
except Exception:
row.append(r[j])
results2.append(row)
if report['type']=='pie':
@@ -365,7 +361,6 @@ class report_custom(report_int):
order_date['Y'] = lambda x : x
abscissa = []
tmp = {}
idx = 0
date_idx = None
@@ -389,7 +384,7 @@ class report_custom(report_int):
if date_idx != None:
for r in results:
key = process_date['Y'](r[date_idx])
if not data_by_year.has_key(key):
if key not in data_by_year:
data_by_year[key] = []
for i in range(len(r)):
r[i] = fct[i](r[i])
@@ -407,14 +402,14 @@ class report_custom(report_int):
for d in data_by_year[line]:
for idx in range(len(fields)-1):
fields_bar.append({})
if fields_bar[idx].has_key(d[0]):
if d[0] in fields_bar[idx]:
fields_bar[idx][d[0]] += d[idx+1]
else:
fields_bar[idx][d[0]] = d[idx+1]
for idx in range(len(fields)-1):
data = {}
for k in fields_bar[idx].keys():
if data.has_key(k):
if k in data:
data[k] += fields_bar[idx][k]
else:
data[k] = fields_bar[idx][k]
@@ -488,7 +483,7 @@ class report_custom(report_int):
if date_idx != None:
for r in results:
key = process_date['Y'](r[date_idx])
if not data_by_year.has_key(key):
if key not in data_by_year:
data_by_year[key] = []
for i in range(len(r)):
r[i] = fct[i](r[i])
@@ -507,14 +502,14 @@ class report_custom(report_int):
for d in data_by_year[line]:
for idx in range(len(fields)-1):
fields_bar.append({})
if fields_bar[idx].has_key(d[0]):
if d[0] in fields_bar[idx]:
fields_bar[idx][d[0]] += d[idx+1]
else:
fields_bar[idx][d[0]] = d[idx+1]
for idx in range(len(fields)-1):
data = {}
for k in fields_bar[idx].keys():
if data.has_key(k):
if k in data:
data[k] += fields_bar[idx][k]
else:
data[k] = fields_bar[idx][k]
openerp/report/interface.py
+3 -3
View File
@@ -44,8 +44,8 @@ class report_int(netsvc.Service):
def __init__(self, name):
assert not self.exists(name), 'The report "%s" already exists!' % name
super(report_int, self).__init__(name)
if name[0:7]<>'report.':
raise Exception, 'ConceptionError, bad report name, should start with "report."'
if not name.startswith('report.'):
raise Exception('ConceptionError, bad report name, should start with "report."')
self.name = name
self.id = 0
self.name2 = '.'.join(name.split('.')[1:])
@@ -181,7 +181,7 @@ class report_rml(report_int):
def create_pdf(self, rml, localcontext = None, logo=None, title=None):
if not localcontext:
localcontext={}
localcontext = {}
localcontext.update({'internal_header':self.internal_header})
if logo:
self.bin_datas['logo'] = logo
openerp/report/preprocess.py
+1 -1
View File
@@ -48,7 +48,7 @@ class report(object):
try:
while n.tag != txt.group(3):
n = n.getparent()
except:
except Exception:
n = node
else:
n = node.getparent()
openerp/report/print_xml.py
+3 -3
View File
@@ -200,7 +200,7 @@ class document(object):
else:
args = []
# get the object
if attrs.has_key('model'):
if 'model' in attrs:
obj = self.pool.get(attrs['model'])
else:
if isinstance(browser, list):
@@ -209,7 +209,7 @@ class document(object):
obj = browser._table
# get the ids
if attrs.has_key('ids'):
if 'ids' in attrs:
ids = self.eval(browser, attrs['ids'])
else:
if isinstance(browser, list):
@@ -228,7 +228,7 @@ class document(object):
if not isinstance(datas[atr['value']], (str, unicode)):
txt = str(datas[atr['value']])
else:
txt = datas[atr['value']]
txt = datas[atr['value']]
el.text = txt
else:
for el_cld in node:
openerp/report/printscreen/ps_form.py
+1 -1
View File
@@ -120,7 +120,7 @@ class report_printscreen_list(report_int):
line[f]=round(line[f],precision)
col = etree.SubElement(node_line, 'col', tree='no')
if line[f] != None:
col.text = tools.ustr(line[f] or '')
col.text = tools.ustr(line[f] or '')
else:
col.text = '/'
openerp/report/printscreen/ps_list.py
+1 -1
View File
@@ -56,7 +56,7 @@ class report_printscreen_list(report_int):
def _parse_string(self, view):
try:
dom = etree.XML(view.encode('utf-8'))
except:
except Exception:
dom = etree.XML(view)
return self._parse_node(dom)
openerp/report/render/html2html/html2html.py
-2
View File
@@ -20,9 +20,7 @@
##############################################################################
from openerp.report.render.rml2pdf import utils
from lxml import etree
import copy
import openerp.pooler as pooler
import base64
import cStringIO
import re
openerp/report/render/makohtml2html/makohtml2html.py
+3 -5
View File
@@ -23,8 +23,7 @@ import mako
from lxml import etree
from mako.template import Template
from mako.lookup import TemplateLookup
import openerp.netsvc as netsvc
import traceback, sys, os
import os
_logger = logging.getLogger(__name__)
@@ -126,9 +125,8 @@ class makohtml2html(object):
final_html += self.format_header(etree_obj)
final_html += self.format_body(etree_obj)
return final_html
except Exception,e:
tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
_logger.error('report :\n%s\n%s\n', tb_s, str(e))
except Exception:
_logger.exception('report :')
def parseNode(html, localcontext = {}):
r = makohtml2html(html, localcontext)
openerp/report/render/odt2odt/odt2odt.py
-1
View File
@@ -20,7 +20,6 @@
##############################################################################
from openerp.report.render.rml2pdf import utils
from lxml import etree
import copy
class odt2odt(object):
openerp/report/render/rml2html/rml2html.py
+10 -10
View File
@@ -39,7 +39,7 @@ import sys
import cStringIO
from lxml import etree
import copy
import utils
from openerp.report.render.rml2pdf import utils
class _flowable(object):
@@ -98,7 +98,7 @@ class _flowable(object):
try:
if new_child.get('style').find('terp_tblheader')!= -1:
new_node.tag = 'th'
except:
except Exception:
pass
process(node,new_node)
if new_node.get('colWidths',False):
@@ -232,7 +232,7 @@ class _rml_stylesheet(object):
attr = {}
attrs = ps.attrib
for key, val in attrs.items():
attr[key] = val
attr[key] = val
attrs = []
for a in attr:
if a in self._tags:
@@ -296,13 +296,13 @@ class _rml_template(object):
frames[(posy,posx,tmpl.get('id'))] = _rml_tmpl_frame(posx, utils.unit_get(tmpl.get('width')))
for tmpl in pt.findall('pageGraphics'):
for n in tmpl:
if n.tag == 'image':
self.data = rc + utils._process_text(self, n.text)
if n.tag in self._tags:
t = self._tags[n.tag](n, self.style,self.localcontext)
frames[(t.posy,t.posx,n.tag)] = t
else:
self.style.update(n)
if n.tag == 'image':
self.data = rc + utils._process_text(self, n.text)
if n.tag in self._tags:
t = self._tags[n.tag](n, self.style,self.localcontext)
frames[(t.posy,t.posx,n.tag)] = t
else:
self.style.update(n)
keys = frames.keys()
keys.sort()
keys.reverse()
openerp/report/render/rml2pdf/trml2pdf.py
+2 -2
View File
@@ -82,7 +82,7 @@ class NumberedCanvas(canvas.Canvas):
def showPage(self):
self._currentPage +=1
if not self._flag:
self._pageCount += 1
self._pageCount += 1
else:
self.pages.update({self._currentPage:self._pageCount})
self._codes.append({'code': self._code, 'stack': self._codeStack})
@@ -424,7 +424,7 @@ class _rml_canvas(object):
flow.drawOn(self.canvas,infos['x'],infos['y'])
infos['height']-=h
else:
raise ValueError, "Not enough space"
raise ValueError("Not enough space")
def _line_mode(self, node):
ljoin = {'round':1, 'mitered':0, 'bevelled':2}
openerp/report/render/rml2txt/rml2txt.py
+2 -4
View File
@@ -22,9 +22,7 @@
import sys
import StringIO
import copy
from lxml import etree
import base64
import utils
@@ -336,8 +334,8 @@ class _rml_stylesheet(object):
attr = {}
attrs = ps.attributes
for i in range(attrs.length):
name = attrs.item(i).localName
attr[name] = ps.get(name)
name = attrs.item(i).localName
attr[name] = ps.get(name)
attrs = []
for a in attr:
if a in self._tags:
openerp/report/render/rml2txt/utils.py
+6 -7
View File
@@ -23,7 +23,6 @@ import copy
import re
import reportlab
import reportlab.lib.units
from lxml import etree
from openerp.tools.safe_eval import safe_eval as eval
_regex = re.compile('\[\[(.+?)\]\]')
@@ -38,7 +37,7 @@ def _child_get(node, self=None, tagname=None):
if n.get('rml_except', False):
try:
eval(n.get('rml_except'), {}, self.localcontext)
except:
except Exception:
continue
if n.get('rml_tag'):
try:
@@ -47,7 +46,7 @@ def _child_get(node, self=None, tagname=None):
n2.tag = tag
n2.attrib.update(attr)
yield n2
except:
except Exception:
yield n
else:
yield n
@@ -56,7 +55,7 @@ def _child_get(node, self=None, tagname=None):
if self and self.localcontext and n.get('rml_except', False):
try:
eval(n.get('rml_except'), {}, self.localcontext)
except:
except Exception:
continue
if (tagname is None) or (n.tag==tagname):
yield n
@@ -74,11 +73,11 @@ def _process_text(self, txt):
if sps:
try:
txt2 = eval(sps.pop(0),self.localcontext)
except:
except Exception:
txt2 = ''
if type(txt2) == type(0) or type(txt2) == type(0.0):
if isinstance(txt2, (int, float)):
txt2 = str(txt2)
if type(txt2)==type('') or type(txt2)==type(u''):
if isinstance(txt2, basestring):
result += txt2
return result
openerp/report/render/simple.py
+1 -2
View File
@@ -66,7 +66,6 @@ class simple(render.render):
return self.result.getvalue()
if __name__=='__main__':
import time
s = simple()
s.xml = '''<test>
<author-list>
@@ -82,7 +81,7 @@ if __name__=='__main__':
</author-list>
</test>'''
if s.render():
print s.get()
print s.get()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
openerp/service/http_server.py
+2 -4
View File
@@ -5,10 +5,10 @@
#
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software
# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
@@ -44,10 +44,8 @@ import posixpath
import urllib
import os
import logging
from SimpleXMLRPCServer import SimpleXMLRPCDispatcher
from websrv_lib import *
import openerp.netsvc as netsvc
import openerp.tools as tools
try:
openerp/service/netrpc_server.py
+4 -4
View File
@@ -126,12 +126,12 @@ class TinySocketServerThread(threading.Thread,netsvc.Server):
ct.start()
lt = len(self.threads)
if (lt > 10) and (lt % 10 == 0):
# Not many threads should be serving at the same time, so log
# their abuse.
_logger.debug("Netrpc: %d threads", len(self.threads))
# Not many threads should be serving at the same time, so log
# their abuse.
_logger.debug("Netrpc: %d threads", len(self.threads))
self.socket.close()
except Exception, e:
_logger.warning("Netrpc: closing because of exception %s" % str(e))
_logger.warning("Netrpc: closing because of exception %s", e)
self.socket.close()
return False
openerp/service/web_services.py
+13 -14
View File
@@ -238,9 +238,9 @@ class db(netsvc.ExportService):
if not data or res:
_logger.error(
'DUMP DB: %s failed! Please verify the configuration of the database password on the server. '\
'It should be provided as a -w <PASSWD> command-line option, or as `db_password` in the '\
'server configuration file.\n %s' % (db_name, data))
'DUMP DB: %s failed! Please verify the configuration of the database password on the server. '
'It should be provided as a -w <PASSWD> command-line option, or as `db_password` in the '
'server configuration file.\n %s', db_name, data)
raise Exception, "Couldn't dump database"
_logger.info('DUMP DB successful: %s', db_name)
@@ -253,7 +253,7 @@ class db(netsvc.ExportService):
self._set_pg_psw_env_var()
if self.exp_db_exist(db_name):
_logger.warning('RESTORE DB: %s already exists' % (db_name,))
_logger.warning('RESTORE DB: %s already exists', db_name)
raise Exception, "Database already exists"
self._create_empty_database(db_name)
@@ -282,7 +282,7 @@ class db(netsvc.ExportService):
res = stdout.close()
if res:
raise Exception, "Couldn't restore database"
_logger.info('RESTORE DB: %s' % (db_name))
_logger.info('RESTORE DB: %s', db_name)
return True
finally:
@@ -465,8 +465,7 @@ GNU Public Licence.
backup_directory = os.path.join(tools.config['root_path'], 'backup', time.strftime('%Y-%m-%d-%H-%M'))
if zips and not os.path.isdir(backup_directory):
_logger.info('create a new backup directory to \
store the old modules: %s', backup_directory)
_logger.info('create a new backup directory to store the old modules: %s', backup_directory)
os.makedirs(backup_directory)
for module in zips:
@@ -526,11 +525,11 @@ GNU Public Licence.
'OS Name : %s\n' \
%(platform.platform(), platform.os.name)
if os.name == 'posix':
if platform.system() == 'Linux':
lsbinfo = os.popen('lsb_release -a').read()
environment += '%s'%(lsbinfo)
else:
environment += 'Your System is not lsb compliant\n'
if platform.system() == 'Linux':
lsbinfo = os.popen('lsb_release -a').read()
environment += '%s'%(lsbinfo)
else:
environment += 'Your System is not lsb compliant\n'
environment += 'Operating System Release : %s\n' \
'Operating System Version : %s\n' \
'Operating System Architecture : %s\n' \
@@ -695,7 +694,7 @@ class report_spool(netsvc.ExportService):
self._reports[id]['state'] = True
except Exception, exception:
_logger.exception('Exception: %s\n', str(exception))
_logger.exception('Exception: %s\n', exception)
if hasattr(exception, 'name') and hasattr(exception, 'value'):
self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
else:
@@ -732,7 +731,7 @@ class report_spool(netsvc.ExportService):
self._reports[id]['format'] = format
self._reports[id]['state'] = True
except Exception, exception:
_logger.exception('Exception: %s\n', str(exception))
_logger.exception('Exception: %s\n', exception)
if hasattr(exception, 'name') and hasattr(exception, 'value'):
self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
else:
openerp/service/websrv_lib.py
+2 -2
View File
@@ -3,10 +3,10 @@
# Copyright P. Christeas <p_christ@hol.gr> 2008-2010
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software
# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or

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