Merge lp:~credativ/openobject-server/7.0-fixes-syslog into lp:openobject-server/7.0

Proposed by mistotebe
Status: Rejected
Rejected by: Martin Trigaux (OpenERP)
Proposed branch: lp:~credativ/openobject-server/7.0-fixes-syslog
Merge into: lp:openobject-server/7.0
Diff against target: 196839 lines (+134996/-27844) (has conflicts)
229 files modified
MANIFEST.in (+1/-1)
debian/control (+2/-2)
debian/openerp.postrm (+2/-1)
doc/01_getting_started.rst (+0/-3)
doc/02_architecture.rst (+45/-2)
doc/03_module_dev.rst (+1/-0)
doc/adding-command.rst (+34/-0)
doc/changelog.rst (+23/-0)
doc/commands.rst (+40/-0)
doc/conf.py (+0/-1)
doc/deployment-gunicorn.rst (+11/-40)
doc/deployment-mod-wsgi.rst (+73/-0)
doc/form-view-guidelines.rst (+303/-0)
doc/index.rst (+23/-2)
doc/openerp-command.rst (+66/-0)
doc/orm-methods.rst (+61/-0)
doc/report-declaration.rst (+23/-0)
doc/routing.rst (+29/-0)
install/openerp-server.1 (+0/-11)
oe (+5/-0)
oe-bash-completion (+89/-0)
openerp/.apidoc (+0/-1)
openerp/PKG-INFO (+1/-1)
openerp/__init__.py (+13/-3)
openerp/addons/base/i18n/ab.po (+19/-129)
openerp/addons/base/i18n/af.po (+67/-132)
openerp/addons/base/i18n/am.po (+21/-131)
openerp/addons/base/i18n/ar.po (+1365/-136)
openerp/addons/base/i18n/base.pot (+154/-287)
openerp/addons/base/i18n/bg.po (+1216/-137)
openerp/addons/base/i18n/bs.po (+132/-137)
openerp/addons/base/i18n/ca.po (+1708/-137)
openerp/addons/base/i18n/cs.po (+2074/-145)
openerp/addons/base/i18n/da.po (+220/-135)
openerp/addons/base/i18n/de.po (+6951/-147)
openerp/addons/base/i18n/el.po (+1172/-137)
openerp/addons/base/i18n/en_GB.po (+3245/-132)
openerp/addons/base/i18n/es.po (+5581/-128)
openerp/addons/base/i18n/es_AR.po (+739/-129)
openerp/addons/base/i18n/es_CL.po (+1748/-137)
openerp/addons/base/i18n/es_CR.po (+8032/-121)
openerp/addons/base/i18n/es_DO.po (+103/-136)
openerp/addons/base/i18n/es_EC.po (+2647/-141)
openerp/addons/base/i18n/es_MX.po (+34/-130)
openerp/addons/base/i18n/es_VE.po (+23/-130)
openerp/addons/base/i18n/et.po (+786/-141)
openerp/addons/base/i18n/eu.po (+25/-132)
openerp/addons/base/i18n/fa.po (+846/-138)
openerp/addons/base/i18n/fa_AF.po (+21/-131)
openerp/addons/base/i18n/fi.po (+1989/-137)
openerp/addons/base/i18n/fr.po (+5716/-114)
openerp/addons/base/i18n/fr_CA.po (+0/-15423)
openerp/addons/base/i18n/gl.po (+1839/-161)
openerp/addons/base/i18n/gu.po (+382/-130)
openerp/addons/base/i18n/he.po (+627/-135)
openerp/addons/base/i18n/hi.po (+20/-130)
openerp/addons/base/i18n/hr.po (+1658/-144)
openerp/addons/base/i18n/hu.po (+3461/-145)
openerp/addons/base/i18n/hy.po (+412/-138)
openerp/addons/base/i18n/id.po (+73/-125)
openerp/addons/base/i18n/is.po (+312/-135)
openerp/addons/base/i18n/it.po (+1795/-144)
openerp/addons/base/i18n/ja.po (+7087/-132)
openerp/addons/base/i18n/ka.po (+4482/-130)
openerp/addons/base/i18n/kk.po (+217/-131)
openerp/addons/base/i18n/ko.po (+2572/-132)
openerp/addons/base/i18n/lt.po (+398/-129)
openerp/addons/base/i18n/lv.po (+1077/-135)
openerp/addons/base/i18n/mk.po (+199/-143)
openerp/addons/base/i18n/mn.po (+6818/-145)
openerp/addons/base/i18n/nb.po (+965/-132)
openerp/addons/base/i18n/nl.po (+3069/-144)
openerp/addons/base/i18n/nl_BE.po (+79/-131)
openerp/addons/base/i18n/pl.po (+1489/-131)
openerp/addons/base/i18n/pt.po (+2562/-144)
openerp/addons/base/i18n/pt_BR.po (+4391/-145)
openerp/addons/base/i18n/ro.po (+8563/-136)
openerp/addons/base/i18n/ru.po (+7736/-136)
openerp/addons/base/i18n/sk.po (+1422/-135)
openerp/addons/base/i18n/sl.po (+1727/-137)
openerp/addons/base/i18n/sq.po (+30/-137)
openerp/addons/base/i18n/sr.po (+1290/-135)
openerp/addons/base/i18n/sr@latin.po (+4603/-134)
openerp/addons/base/i18n/sv.po (+2885/-137)
openerp/addons/base/i18n/th.po (+28/-135)
openerp/addons/base/i18n/tlh.po (+26/-137)
openerp/addons/base/i18n/tr.po (+2157/-136)
openerp/addons/base/i18n/uk.po (+697/-137)
openerp/addons/base/i18n/ur.po (+21/-131)
openerp/addons/base/i18n/vi.po (+640/-136)
openerp/addons/base/i18n/zh_CN.po (+4553/-144)
openerp/addons/base/i18n/zh_HK.po (+82/-132)
openerp/addons/base/i18n/zh_TW.po (+997/-144)
openerp/addons/base/ir/ir_actions.py (+91/-39)
openerp/addons/base/ir/ir_actions.xml (+1/-0)
openerp/addons/base/ir/ir_attachment.py (+4/-4)
openerp/addons/base/ir/ir_cron.py (+25/-18)
openerp/addons/base/ir/ir_mail_server.py (+3/-1)
openerp/addons/base/ir/ir_model.py (+69/-52)
openerp/addons/base/ir/ir_rule.py (+3/-3)
openerp/addons/base/ir/ir_translation.py (+44/-5)
openerp/addons/base/ir/ir_translation_view.xml (+3/-3)
openerp/addons/base/ir/ir_ui_menu.py (+13/-11)
openerp/addons/base/ir/ir_ui_view.py (+5/-5)
openerp/addons/base/ir/ir_values.py (+2/-2)
openerp/addons/base/ir/workflow/workflow.py (+3/-5)
openerp/addons/base/module/module.py (+5/-4)
openerp/addons/base/module/report/ir_module_reference_print.py (+8/-8)
openerp/addons/base/module/wizard/base_module_scan.py (+0/-74)
openerp/addons/base/module/wizard/base_module_upgrade.py (+2/-2)
openerp/addons/base/res/ir_property.py (+3/-2)
openerp/addons/base/res/res_company.py (+9/-3)
openerp/addons/base/res/res_company_view.xml (+1/-1)
openerp/addons/base/res/res_config.py (+91/-9)
openerp/addons/base/res/res_country.py (+1/-1)
openerp/addons/base/res/res_currency.py (+4/-0)
openerp/addons/base/res/res_lang.py (+0/-87)
openerp/addons/base/res/res_partner.py (+28/-15)
openerp/addons/base/res/res_partner_view.xml (+7/-6)
openerp/addons/base/res/res_users.py (+32/-16)
openerp/addons/base/res/res_users_view.xml (+44/-49)
openerp/addons/base/rng/view.rng (+1/-0)
openerp/addons/base/test/__init__.py (+0/-27)
openerp/addons/base/test/base_test.yml (+8/-8)
openerp/addons/base/test/test_auth.yml (+2/-2)
openerp/addons/base/tests/__init__.py (+4/-0)
openerp/addons/base/tests/test_res_config.py (+80/-0)
openerp/addons/base/tests/test_res_lang.py (+41/-12)
openerp/cli/server.py (+25/-11)
openerp/conf/deprecation.py (+25/-1)
openerp/exceptions.py (+11/-0)
openerp/http.py (+37/-0)
openerp/import_xml.rng (+6/-12)
openerp/loglevels.py (+0/-66)
openerp/modules/graph.py (+0/-3)
openerp/modules/loading.py (+24/-35)
openerp/modules/migration.py (+18/-35)
openerp/modules/module.py (+5/-63)
openerp/modules/registry.py (+24/-11)
openerp/netsvc.py (+71/-124)
openerp/osv/__init__.py (+0/-1)
openerp/osv/expression.py (+2/-3)
openerp/osv/fields.py (+24/-23)
openerp/osv/orm.py (+176/-128)
openerp/osv/osv.py (+7/-213)
openerp/osv/query.py (+0/-1)
openerp/pooler.py (+9/-0)
openerp/release.py (+1/-1)
openerp/report/__init__.py (+9/-1)
openerp/report/custom.py (+14/-14)
openerp/report/interface.py (+26/-15)
openerp/report/print_xml.py (+6/-6)
openerp/report/printscreen/__init__.py (+0/-1)
openerp/report/printscreen/ps_form.py (+3/-4)
openerp/report/printscreen/ps_list.py (+8/-8)
openerp/report/pyPdf/__init__.py (+0/-1)
openerp/report/render/__init__.py (+0/-1)
openerp/report/render/html2html/__init__.py (+0/-1)
openerp/report/render/makohtml2html/__init__.py (+0/-1)
openerp/report/render/odt2odt/__init__.py (+0/-1)
openerp/report/render/rml2html/__init__.py (+0/-1)
openerp/report/render/rml2pdf/__init__.py (+0/-1)
openerp/report/render/rml2pdf/customfonts.py (+0/-1)
openerp/report/render/rml2pdf/utils.py (+5/-8)
openerp/report/render/rml2txt/__init__.py (+0/-1)
openerp/report/report_sxw.py (+29/-17)
openerp/service/__init__.py (+11/-15)
openerp/service/common.py (+69/-0)
openerp/service/cron.py (+1/-5)
openerp/service/db.py (+365/-0)
openerp/service/http_server.py (+0/-1)
openerp/service/model.py (+202/-0)
openerp/service/netrpc_server.py (+0/-245)
openerp/service/netrpc_socket.py (+0/-99)
openerp/service/report.py (+146/-0)
openerp/service/security.py (+6/-12)
openerp/service/web_services.py (+0/-774)
openerp/service/websrv_lib.py (+0/-1)
openerp/service/workers.py (+44/-3)
openerp/service/wsgi_server.py (+53/-22)
openerp/sql_db.py (+0/-5)
openerp/tests/__init__.py (+2/-0)
openerp/tests/addons/test_exceptions/models.py (+36/-1)
openerp/tests/addons/test_exceptions/view.xml (+44/-2)
openerp/tests/addons/test_impex/tests/test_load.py (+2/-6)
openerp/tests/common.py (+1/-0)
openerp/tests/test_uninstall.py (+4/-4)
openerp/tests/test_xmlrpc.py (+8/-0)
openerp/tools/__init__.py (+0/-1)
openerp/tools/config.py (+27/-22)
openerp/tools/convert.py (+57/-63)
openerp/tools/image.py (+9/-7)
openerp/tools/mail.py (+9/-11)
openerp/tools/misc.py (+0/-16)
openerp/tools/parse_version.py (+1/-1)
openerp/tools/safe_eval.py (+25/-9)
openerp/tools/test_reports.py (+15/-13)
openerp/tools/translate.py (+24/-67)
openerp/tools/yaml_import.py (+34/-31)
openerp/workflow/__init__.py (+118/-5)
openerp/workflow/common.py (+0/-28)
openerp/workflow/wkf_expr.py (+5/-5)
openerp/workflow/wkf_logs.py (+0/-39)
openerp/workflow/wkf_service.py (+0/-156)
openerp/workflow/workitem.py (+14/-18)
openerpcommand/__init__.py (+63/-0)
openerpcommand/addons/bench_sale_mrp/__init__.py (+3/-0)
openerpcommand/addons/bench_sale_mrp/__openerp__.py (+15/-0)
openerpcommand/addons/bench_sale_mrp/data.yml (+41/-0)
openerpcommand/bench_sale_mrp.py (+68/-0)
openerpcommand/benchmarks.py (+166/-0)
openerpcommand/call.py (+44/-0)
openerpcommand/client.py (+137/-0)
openerpcommand/common.py (+109/-0)
openerpcommand/conf.py (+25/-0)
openerpcommand/cron.py (+46/-0)
openerpcommand/drop.py (+50/-0)
openerpcommand/initialize.py (+116/-0)
openerpcommand/main.py (+7/-0)
openerpcommand/model.py (+61/-0)
openerpcommand/module.py (+68/-0)
openerpcommand/read.py (+64/-0)
openerpcommand/run_tests.py (+201/-0)
openerpcommand/scaffold.py (+77/-0)
openerpcommand/uninstall.py (+66/-0)
openerpcommand/update.py (+19/-0)
openerpcommand/web.py (+93/-0)
scripts/run_all_with_tests.sh (+0/-1)
setup.py (+3/-0)
Text conflict in openerp/addons/base/i18n/es.po
Text conflict in openerp/addons/base/i18n/es_CR.po
Text conflict in openerp/addons/base/i18n/fr.po
Text conflict in openerp/addons/base/i18n/id.po
Text conflict in openerp/addons/base/i18n/ko.po
Text conflict in openerp/addons/base/i18n/lt.po
Text conflict in openerp/addons/base/i18n/pl.po
Text conflict in openerp/addons/base/i18n/ro.po
Text conflict in openerp/addons/base/i18n/ru.po
Text conflict in openerp/addons/base/i18n/sl.po
Text conflict in openerp/addons/base/i18n/tr.po
Contents conflict in openerp/addons/base_quality_interrogation.py
To merge this branch: bzr merge lp:~credativ/openobject-server/7.0-fixes-syslog
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+166994@code.launchpad.net

This proposal supersedes a proposal from 2013-05-31.

This proposal has been superseded by a proposal from 2013-06-03.

Description of the change

When setting up multiple servers on a single machine, or just setting up cron workers to run in a separate process, one might want to keep the log streams separate. This has not been possible when logging through syslog. This proposal adds a configuration option to change the syslog facility.

To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote : Posted in a previous version of this proposal

Oh I guess you wanted to merge into 7, not trunk (lp:openobject-server/7.0 and not lp:openobject-server).
I reject then this merge propsal so you can resubmit it in the correct branch

Revision history for this message
mistotebe (mistotebe) wrote : Posted in a previous version of this proposal

On 03/06/13 10:18, Martin Trigaux (OpenERP) wrote:
> Oh I guess you wanted to merge into 7, not trunk (lp:openobject-server/7.0 and not lp:openobject-server).
> I reject then this merge propsal so you can resubmit it in the correct branch

Actually, I wanted this to land in both 7.0 and trunk (so that it's not
forgotten in the next version), but I must have specified the wrong one
for this (and I guess they have diverged so that there's a load of
unrelated changes.

This request has been superseded by
https://code.launchpad.net/~credativ/openobject-server/7.0-fixes-syslog/+merge/166994

The way you process merge requests, should I have requested for trunk
first, then a backport to 7.0 or what is the way to get this kind of
code merged to both stable and next?

Thanks,
Ondrej

Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Ok my bad, I hadn't seen that you had made other merge proposal afterward, please discard the previous comments.

So first of all thanks for your merge proposal.
However this is a wishlist for a new feature and we can not accept new features in the stable version (even low risk like this one). This should definitely be made in trunk version.
Could you port your code to trunk ?

Regarding the feature it self, I don't see any reason why not doing so.
Regarding the code, why put a default value to user while it's already LOG_USER in SysLogHandler call ?
Except that looks good to me.

Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

And to reply to your previous comment, in stable version we only do bug fixes, everything new is for trunk.
After we have a forward porting procedure. So if you have a bug introduced in 7.0, you fix it in a 7.0 branch and we will ported to trunk afterward.
The only time it is usefull to do two merge proposal 7+trunk, is when the fix is different (eg: monkey patching in 7 to avoid needing to restarting the db, clean fix in trunk).

4879. By mistotebe

[IMP] Allow syslog facility configuration

When setting up multiple servers on a single machine, or just setting up cron
workers to run in a separate process, one might want to keep the log streams
separate. This has not been possible when logging through syslog. This commit
adds a configuration option to change the syslog facility.

Unmerged revisions

4879. By mistotebe

[IMP] Allow syslog facility configuration

When setting up multiple servers on a single machine, or just setting up cron
workers to run in a separate process, one might want to keep the log streams
separate. This has not been possible when logging through syslog. This commit
adds a configuration option to change the syslog facility.

4878. By Martin Trigaux (OpenERP)

[MERGE] [IMP] company: add onchange on state to match country

4877. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4876. By Christophe Simonis (OpenERP)

[REVERT] release.pu don't need to be forward ported

4875. By Thibault Delavallée (OpenERP)

[MERGE] [FORWARD] Forward-port of saas-1 branch until revision 4875

Revision ID: <email address hidden>

4874. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4873. By Raphael Collet (OpenERP)

[FIX] res_config tests: isinstance(x, long) is False when x is an int!

4872. By Vo Minh Thu

[FIX] oe: better filter of potential modules in addons paths.

4871. By Vo Minh Thu

[FIX] setup.py: added gevent and gevent-psycopg2 dependencies.

4870. By Vo Minh Thu

[FIX] long-polling: use start()/stop() instead of serve_forever().

This is done so detecting a possible PPID change works.
(So that the worker dies when its parent dies.)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2011-10-03 17:52:06 +0000
3+++ MANIFEST.in 2013-06-03 11:35:34 +0000
4@@ -7,7 +7,7 @@
5 include README
6 include LICENSE
7 include MANIFEST.in
8-include gunicorn.conf.py
9+include openerp-wsgi.py
10 include openerp-server
11 include setup*
12 global-exclude *pyc *~ # Exclude possible garbage from previous graft.
13
14=== modified file 'debian/control'
15--- debian/control 2013-02-14 10:48:33 +0000
16+++ debian/control 2013-06-03 11:35:34 +0000
17@@ -53,6 +53,6 @@
18 features are accounting (analytic and financial), stock management, sales and
19 purchases management, tasks automation, marketing campaigns, help desk, POS,
20 etc. Technical features include a distributed server, flexible workflows, an
21- object database, a dynamic GUI, customizable reports, and NET-RPC and XML-RPC
22- interfaces.
23+ object database, a dynamic GUI, customizable reports, and an XML-RPC
24+ interface.
25
26
27=== modified file 'debian/openerp.postrm'
28--- debian/openerp.postrm 2011-10-06 00:18:10 +0000
29+++ debian/openerp.postrm 2013-06-03 11:35:34 +0000
30@@ -6,10 +6,11 @@
31 remove)
32 deluser --quiet --system "openerp" || true
33 delgroup --quiet --system --only-if-empty "openerp" || true
34+ find /var/lib/openerp -path '/var/lib/openerp/*' ! -path '/var/lib/openerp/filestore*' -delete
35 ;;
36
37 purge)
38- rm -rf /var/lib/openerp-server
39+ rm -rf /var/lib/openerp
40 ;;
41
42 upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
43
44=== modified file 'doc/01_getting_started.rst'
45--- doc/01_getting_started.rst 2012-11-16 12:20:27 +0000
46+++ doc/01_getting_started.rst 2013-06-03 11:35:34 +0000
47@@ -103,9 +103,6 @@
48 --logfile=LOGFILE file where the server log will be stored
49 -n INTERFACE, --interface=INTERFACE specify the TCP IP address
50 -p PORT, --port=PORT specify the TCP port
51- --net_interface=NETINTERFACE specify the TCP IP address for netrpc
52- --net_port=NETPORT specify the TCP port for netrpc
53- --no-netrpc disable netrpc
54 --no-xmlrpc disable xmlrpc
55 -i INIT, --init=INIT init a module (use "all" for all modules)
56 --without-demo=WITHOUT_DEMO load demo data for a module (use "all" for all modules)
57
58=== modified file 'doc/02_architecture.rst'
59--- doc/02_architecture.rst 2012-11-13 01:00:59 +0000
60+++ doc/02_architecture.rst 2013-06-03 11:35:34 +0000
61@@ -1,6 +1,6 @@
62-========================================
63+============
64 Architecture
65-========================================
66+============
67
68 OpenERP as a multitenant three-tiers architecture
69 =================================================
70@@ -180,6 +180,7 @@
71
72 Network communications and WSGI
73 ===============================
74+
75 OpenERP is an HTTP web server and may also be deployed as an WSGI-compliant
76 application.
77
78@@ -207,3 +208,45 @@
79 The HTTP namespaces /openerp/ /object/ /common/ are reserved for the XML-RPC
80 layer, every module restrict it's HTTP namespace to /<name_of_the_module>/
81
82+Process model
83+=============
84+
85+In the past, the OpenERP server was using threads to handle HTTP requests
86+concurrently or to process cron jobs. Using threads is still the default
87+behavior when running the ``openerp-server`` script but not the recommended
88+one: it is in fact recommended to use the ``--workers`` option.
89+
90+By using the ``--workers`` option, the OpenERP server will spawn a fixed number
91+of processes instead of spawning a new thread for each incoming request.
92+
93+This has a number of advantages:
94+
95+ - Processes do not suffer from CPython's Global Interpreter Lock.
96+ - Processes can be gracefully recycled while requests are still handled by the
97+ server.
98+ - Resources such as CPU time and memory made available to a process can be
99+ monitored on a per-process basis.
100+
101+When using the ``--workers`` options, two types of processes may be spawned:
102+web process, and cron process.
103+
104+.. versionadded:: 7.1
105+
106+.. _longpolling-worker:
107+
108+When using the ``--workers`` options, three types of processes may be spawned:
109+web process, and cron process, just as previsouly, but also an evented (using
110+gevent) web process is started. It is used for long-polling as needed by the
111+upcoming Instant Messaging feature. As for now, that process is listening on a
112+different port than the main web processes. A reverse proxy (e.g. Nginx) to
113+listen on a unique port, mapping all requests to the normal port, but mapping
114+the ``/longpolling`` route to the evented process is necessary (the web
115+interface cannot issue requests to different ports).
116+
117+(It is possible to make the threaded server evented by passing the ``--gevent``
118+flag.)
119+
120+The goal is to drop support for the threaded model, and also make all web
121+processes evented; there would be no more distinction between "normal" and
122+"longpolling" processes. For this to happen, further testing is needed.
123+
124
125=== modified file 'doc/03_module_dev.rst'
126--- doc/03_module_dev.rst 2012-11-19 14:39:12 +0000
127+++ doc/03_module_dev.rst 2013-06-03 11:35:34 +0000
128@@ -13,3 +13,4 @@
129 03_module_dev_04
130 03_module_dev_05
131 03_module_dev_06
132+ report-declaration
133
134=== added file 'doc/adding-command.rst'
135--- doc/adding-command.rst 1970-01-01 00:00:00 +0000
136+++ doc/adding-command.rst 2013-06-03 11:35:34 +0000
137@@ -0,0 +1,34 @@
138+.. _adding-command:
139+
140+Adding a new command
141+====================
142+
143+``oe`` uses the argparse_ library to implement commands. Each
144+command lives in its own ``openerpcommand/<command>.py`` file.
145+
146+.. _argparse: http://docs.python.org/2.7/library/argparse.html
147+
148+To create a new command, probably the most simple way to get started is to
149+copy/paste an existing command, say ``openerpcommand/initialize.py`` to
150+``openerpcommand/foo.py``. In the newly created file, the important bits
151+are the ``run(args)`` and ``add_parser(subparsers)`` functions.
152+
153+``add_parser``'s responsability is to create a (sub-)parser for the command,
154+i.e. describe the different options and flags. The last thing it does is to set
155+``run`` as the function to call when the command is invoked.
156+
157+.. code-block:: python
158+
159+ > def add_parser(subparsers):
160+ > parser = subparsers.add_parser('<command-name>',
161+ > description='...')
162+ > parser.add_argument(...)
163+ > ...
164+ > parser.set_defaults(run=run)
165+
166+``run(args)`` actually implements the command. It should be kept as simple as
167+possible and delegate most of its work to small functions (probably placed at
168+the top of the new file). In other words, its responsability is mainly to
169+deal with the presence/absence/pre-processing of ``argparse``'s arguments.
170+
171+Finally, the module must be added to ``openerpcommand/__init__.py``.
172
173=== added file 'doc/changelog.rst'
174--- doc/changelog.rst 1970-01-01 00:00:00 +0000
175+++ doc/changelog.rst 2013-06-03 11:35:34 +0000
176@@ -0,0 +1,23 @@
177+.. _changelog:
178+
179+Changelog
180+=========
181+
182+`trunk`
183+-------
184+
185+- Almost removed ``LocalService()``. For reports,
186+ ``openerp.osv.orm.Model.print_report()`` can be used. For workflows, see
187+ :ref:`orm-workflows`.
188+- Removed support for the ``NET-RPC`` protocol.
189+- Added the :ref:`Long polling <longpolling-worker>` worker type.
190+- Added :ref:`orm-workflows` to the ORM.
191+- Added :ref:`routing-decorators` to the RPC and WSGI stack.
192+- Removed support for ``__terp__.py`` descriptor files.
193+- Removed support for ``<terp>`` root element in XML files.
194+- Removed support for the non-openerp namespace (e.g. importing ``tools``
195+ instead of ``openerp.tools`` in an addons).
196+- Add a new type of exception that allows redirections:
197+ ``openerp.exceptions.RedirectWarning``.
198+- Give a pair of new methods to ``res.config.settings`` and a helper to make
199+ them easier to use: ``get_config_warning()``.
200
201=== added file 'doc/commands.rst'
202--- doc/commands.rst 1970-01-01 00:00:00 +0000
203+++ doc/commands.rst 2013-06-03 11:35:34 +0000
204@@ -0,0 +1,40 @@
205+.. _commands:
206+
207+Available commands
208+==================
209+
210+This page explain some of the available ``oe`` commands. For an overview about
211+``oe``, see :doc:`openerp-command`.
212+
213+Keep in mind that ``oe --help`` and ``oe <command> --help`` already give a lot
214+of information about the commands and their options and flags.
215+
216+``web``
217+-------
218+
219+The ``web`` command is used to create a single OpenERP server process to handle
220+regular HTTP requests and XML-RPC requests. It is possible to execute such
221+process multiple times, possibly on different machines.
222+
223+It is possible to chose the ``--threaded`` or ``--gevent`` flags. It is
224+recommanded to use ``--threaded`` only when running a single process.
225+``--gevent`` is experimental; it is planned to use it for the embedded chat
226+feature.
227+
228+Example invocation::
229+
230+ > oe web --addons ../../addons/trunk:../../web/trunk/addons --threaded
231+
232+``cron``
233+--------
234+
235+The ``cron`` command is used to create a single OpenERP process to execute
236+so-called cron jobs, also called scheduled tasks in the OpenERP interface. As
237+for the ``web`` command, multiple cron processes can be run side by side.
238+
239+It is necessary to specify on the command-line which database need to be
240+watched by the cron process with the ``--database`` option.
241+
242+Example invocation::
243+
244+ > oe cron --addons ../../addons/trunk:../../web/trunk/addons --database production
245
246=== modified file 'doc/conf.py'
247--- doc/conf.py 2012-09-28 06:56:54 +0000
248+++ doc/conf.py 2013-06-03 11:35:34 +0000
249@@ -253,5 +253,4 @@
250 intersphinx_mapping = {
251 'python': ('http://docs.python.org/', None),
252 'openerpweb': ('http://doc.openerp.com/trunk/developers/web', None),
253- 'openerpdev': ('http://doc.openerp.com/trunk/developers', None),
254 }
255
256=== renamed file 'doc/09_deployment.rst' => 'doc/deployment-gunicorn.rst'
257--- doc/09_deployment.rst 2012-11-11 02:39:03 +0000
258+++ doc/deployment-gunicorn.rst 2013-06-03 11:35:34 +0000
259@@ -16,20 +16,20 @@
260
261 Configuring and starting an OpenERP server with Gunicorn is straightfoward. The
262 different sections below give more details but the following steps are all it
263-takes::
264+takes:
265
266- 1. Use a configuration file, passing it to ``gunicorn`` using the ``-c``
267- option.
268- 2. Within the same configuration file, also configure OpenERP.
269- 3. Run ``gunicorn openerp:wsgi.core.application -c gunicorn.conf.py``.
270+1. Use a configuration file, passing it to ``gunicorn`` using the ``-c``
271+ option.
272+2. Within the same configuration file, also configure OpenERP.
273+3. Run ``gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py``.
274
275 Sample configuration file
276 -------------------------
277
278-A sample ``gunicorn.conf.py`` configuration file for Gunicorn can be found in
279-the OpenERP server source tree. It is fairly well commented and easily
280+A sample ``openerp-wsgi.py`` configuration file for WSGI servers can be found
281+in the OpenERP server source tree. It is fairly well commented and easily
282 customizable for your own usage. While reading the remaining of this page, it
283-is advised you take a look at the sample ``gunicorn.conf.py`` file as it makes
284+is advised you take a look at the sample ``openerp-wsgi.py`` file as it makes
285 things easier to follow.
286
287 Configuration
288@@ -37,7 +37,7 @@
289
290 Gunicorn can be configured by a configuration file and/or command-line
291 arguments. For a list of available options, you can refer to the official
292-Gunicorn documentation http://gunicorn.org/configure.html.
293+Gunicorn documentation http://docs.gunicorn.org/en/latest/configure.html.
294
295 When the OpenERP server is started on its own, by using the ``openerp-server``
296 script, it can also be configured by a configuration file or its command-line
297@@ -46,7 +46,7 @@
298 ``import openerp`` in it and configure directly the server.
299
300 The principle can be summarized with this three lines (although they are spread
301-across the whole sample ``gunicorn.conf.py`` file)::
302+across the whole sample ``openerp-wsgi.py`` file)::
303
304 import openerp
305 conf = openerp.tools.config
306@@ -57,45 +57,16 @@
307 shorten repeated usage of the same variable. The third one sets a parameter, in
308 this case the equivalent of the ``--addons-path`` command-line option.
309
310-Finally, Gunicorn offers a few hooks so we can call our own code at some points
311-in its execution. The most important one is the ``on_starting`` hook. It lets
312-us properly initialize the ``openerp`` library before Gunicorn starts handling
313-requests. ``pre_request`` and ``post_request`` are called before and after
314-requests are handled. We provide functions in ``openerp.wsgi.core`` that can be
315-used to define those hooks: a typical Gunicorn configuration for OpenERP will
316-thus contains::
317-
318- on_starting = openerp.wsgi.core.on_starting
319- pre_request = openerp.wsgi.core.pre_request
320- post_request = openerp.wsgi.core.post_request
321-
322 Running
323 -------
324
325 Once a proper configuration file is available, running the OpenERP server with
326 Gunicorn can be done with the following command::
327
328- > gunicorn openerp:wsgi.core.application -c gunicorn.conf.py
329+ > gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py
330
331 ``openerp`` must be importable by Python. The simplest way is to run the above
332 command from the server source directory (i.e. the directory containing the
333 ``openerp`` module). Alternatively, the module can be installed on your machine
334 as a regular Python library or added to your ``PYTHONPATH``.
335
336-Running behind a reverse proxy
337-------------------------------
338-
339-If you intend to run Gunicorn behind a reverse proxy (nginx_ is recommended),
340-an alternative entry point is available in ``openerp.wsgi.proxied``. That entry
341-point uses werkzeug's ProxyFix_ class to set a few headers. You first have to
342-explicitely import that sub-module if you want to use it. So add this line in
343-the configuration file::
344-
345- import openerp.wsgi.proxied
346-
347-and then adapt the command-line::
348-
349- > gunicorn openerp:wsgi.proxied.application -c gunicorn.conf.py
350-
351-.. _nginx: http://nginx.org/en/
352-.. _ProxyFix: http://werkzeug.pocoo.org/docs/contrib/fixers/#werkzeug.contrib.fixers.ProxyFix
353
354=== added file 'doc/deployment-mod-wsgi.rst'
355--- doc/deployment-mod-wsgi.rst 1970-01-01 00:00:00 +0000
356+++ doc/deployment-mod-wsgi.rst 2013-06-03 11:35:34 +0000
357@@ -0,0 +1,73 @@
358+.. _using-mod-wsgi:
359+
360+Deploying with ``mod_wsgi``
361+===========================
362+
363+``mod_wsgi`` makes it possible to run a WSGI_ application (such as OpenERP)
364+under the Apache_ HTTP server.
365+
366+.. _WSGI: http://en.wikipedia.org/wiki/Web_Server_Gateway_Interface
367+.. _Apache: https://httpd.apache.org/
368+
369+Summary
370+-------
371+
372+Similarly to :doc:`deployment-gunicorn`, running OpenERP behind Apache with
373+``mod_wsgi`` requires to modify the sample ``openerp-wsgi.py`` script. Then
374+that Python script can be set in the Apache configuration.
375+
376+Python (WSGI) application
377+-------------------------
378+
379+Apache needs a Python script providing the WSGI application. By default the
380+symbol looked up by Apache is ``application`` but it can be overidden with the
381+``WSGICallableObject`` directive if necessary. A sample script
382+``openerp-wsgi.py`` is provided with OpenERP and you can adapt it to your
383+needs. For instance, make sure to correctly set the ``addons_path``
384+configuration (using absolute paths).
385+
386+.. note ::
387+ The script provided to Apache has often the extension ``.wsgi`` but the
388+ ``openerp-wsgi.py`` script will do just as fine.
389+
390+Apache Configuration
391+--------------------
392+
393+In Apache's configuration, add the following line to activate ``mod_wsgi``::
394+
395+ LoadModule wsgi_module modules/mod_wsgi.so
396+
397+Then a possible (straightforward, with e.g. no virtual server) configuration is
398+as follow::
399+
400+ WSGIScriptAlias / /home/thu/repos/server/trunk/openerp-wsgi.py
401+ WSGIDaemonProcess oe user=thu group=users processes=2 python-path=/home/thu/repos/server/trunk/ display-name=apache-openerp
402+ WSGIProcessGroup oe
403+
404+ <Directory /home/thu/repos/server/trunk>
405+ Order allow,deny
406+ Allow from all
407+ </Directory>
408+
409+The ``WSGIScriptAlias`` directive indicates that any URL matching ``/`` will
410+run the application defined in the ``openerp-wsgi.py`` script.
411+
412+The ``WSGIDaemonProcess`` and ``WSGIProcessGroup`` directives create a process
413+configuration. The configuration makes it possible for isntance to specify
414+which user runs the OpenERP process. The ``display-name`` option will make the
415+processes appear as ``apache-openerp`` in ``ps`` (instead of the normal
416+``httpd``).
417+
418+Finally, it is necessary to make sure the source directory where the script can
419+be found is allowed by Apache with the ``Directory`` block.
420+
421+``mod_wsgi`` supports a lot of directives, please see this ``mod_wsgi`` wiki
422+page for more details:
423+http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives.
424+
425+Running
426+-------
427+
428+When the Apache configuration changes, it is necessary to restart Apache, e.g. with::
429+
430+ /etc/init.d/httpd restart
431
432=== added directory 'doc/form-view-guidelines'
433=== added file 'doc/form-view-guidelines.rst'
434--- doc/form-view-guidelines.rst 1970-01-01 00:00:00 +0000
435+++ doc/form-view-guidelines.rst 2013-06-03 11:35:34 +0000
436@@ -0,0 +1,303 @@
437+.. _form-view-guidelines:
438+
439+Form Views Guidelines
440+=====================
441+
442+Authors: Aline Preillon, Raphael Collet
443+
444+
445+This document presents functional and technical guidelines for
446+creating/organizing form views in OpenERP version 7.0. For each item, both the
447+functional and technical aspects are explained. The goal of the new style of
448+forms is to make OpenERP easier to use, and to guide users through the system.
449+
450+Business Views
451+--------------
452+
453+Business views are targeted at regular users, not advanced users. Examples
454+are: Opportunities, Products, Partners, Tasks, Projects, etc.
455+
456+.. image:: /form-view-guidelines/oppreadonly.png
457+
458+In general, a business view is composed of
459+
460+1. a status bar on top (with technical or business flow),
461+2. a sheet in the middle (the form itself),
462+3. a bottom part with History and Comments.
463+
464+Technically, the new form views are structured as follows in XML::
465+
466+ <form version=”7.0”>
467+ <header> ... content of the status bar ... </header>
468+ <sheet> ... content of the sheet ... </sheet>
469+ <div class=”oe_chatter”> ... content of the bottom part ... </div>
470+ </form>
471+
472+The Status Bar
473+''''''''''''''
474+
475+The purpose of the status bar is to show the status of the record and the
476+action buttons, which were formerly at the bottom of form views.
477+
478+.. image:: /form-view-guidelines/status.png
479+
480+The Buttons
481+...........
482+
483+The order of buttons follows the business flow. For instance, in a sale order,
484+the logical steps are:
485+
486+1. Send the quotation
487+2. Confirm the quotation
488+3. Create the final invoice
489+4. Send the goods
490+
491+Highlighted buttons (in red) emphasize the logical next step, to help the user.
492+It is usually the first active button. On the other end, cancel buttons must
493+remain grey (normal). For instance, in Invoice, the button “Refund” must never
494+be red.
495+
496+Technically, buttons are highlighted by adding the class “oe_highlight”::
497+
498+ <button class=”oe_highlight” name=”...” type=”...” states=”...”/>
499+
500+The Status
501+..........
502+
503+We use the widget “statusbar”, and the current value of the state is shown in
504+red. One should make visible the states that are common to all flows (for
505+instance, a sale order begins as a quotation, then we send it, then it becomes
506+a full sale order, and finally it is done.) Exceptions or states depending on
507+particular flow are only visible if it is the current one.
508+
509+.. image:: /form-view-guidelines/status1.png
510+
511+.. image:: /form-view-guidelines/status2.png
512+
513+The states are shown following the order used in the field (the list in a
514+selection field, etc). States that are always visible are indicated by the
515+attribute statusbar_visible. One can also show some states in a specific color
516+with statusbar_colors.
517+
518+::
519+
520+ <field name="state" widget="statusbar"
521+ statusbar_visible="draft,sent,progress,invoiced,done"
522+ statusbar_colors="{‘shipping_except’:’red’,’waiting_date’:’blue’}"/>
523+
524+The Sheet
525+'''''''''
526+
527+All business views should look like a printed sheet:
528+
529+.. image:: /form-view-guidelines/sheet.png
530+
531+Technically, the layout of forms version 7.0 is different than former versions.
532+There is no longer a default “grid” layout; instead the layout is more based on
533+HTML and CSS. The following conventions are now used:
534+
535+1. The elements <form> and <page> no longer define groups; the elements inside
536+ are laid out inline. One should use explicit <div> or <group> to create
537+ blocks.
538+2. By default, the element <group> now defines two columns inside, unless an
539+ attribute col=”n” is used. The columns have the same width (1/n th of the
540+ group’s width). Use a <group> element to produce a column of fields.
541+3. The element <separator string=”XXX”/> on top of a group can be replaced
542+ putting string=”XXX” inside the <group> element.
543+4. The element <field name=”XXX”/> does not produce a label, except when they
544+ are directly below a <group> element. Use <label for=”XXX”/> to produce
545+ the label of the field.
546+
547+Sheet Headers
548+.............
549+
550+Some sheets have headers with one or more fields, and the labels of those
551+fields are only shown in edit mode.
552+
553++---------------------------------------------+----------------------------------------------+
554+| View mode | Edit mode |
555++---------------------------------------------+----------------------------------------------+
556+| .. image:: /form-view-guidelines/header.png | .. image:: /form-view-guidelines/header2.png |
557++---------------------------------------------+----------------------------------------------+
558+
559+Use HTML text, <div>, <h1>, <h2>… to produce nice headers, and <label> with the
560+CSS class “oe_edit_only” to produce the field’s label in edit mode. Use the
561+CSS class “oe_inline” to produce inline fields (not blocks). The form above is
562+produced by the following XML.
563+
564+::
565+
566+ <label for="name" class="oe_edit_only"/>
567+ <h1><field name="name"/></h1>
568+
569+ <label for="planned_revenue" class="oe_edit_only"/>
570+ <h2>
571+ <field name="planned_revenue" class="oe_inline"/>
572+ <field name="company_currency" class="oe_inline oe_edit_only"/> at
573+ <field name="probability" class="oe_inline"/> % success rate
574+ </h2>
575+
576+Button Box
577+..........
578+
579+Many relevant actions or links can be directly displayed in the form. For
580+example, in Opportunity form, the actions “Schedule a Call” and “Schedule a
581+Meeting” take an important place in the use of the CRM. Instead of placing
582+them in the “More” menu of the sidebar, put them directly in the sheet as
583+buttons (on the top right).
584+
585+.. image:: /form-view-guidelines/header3.png
586+
587+Technically, the buttons are placed inside a <div> to group them as a block on
588+the right-hand side of the sheet.
589+
590+::
591+
592+ <div class="oe_button_box oe_right">
593+ <button string="Schedule/Log Call" name="..." type="action"/>
594+ <button string="Schedule Meeting" name="action_makeMeeting" type="object"/>
595+ </div>
596+
597+Groups and Titles
598+.................
599+
600+A column of fields is now produced with a <group> element, with an optional
601+title. The title has the same effect as placing an explicit <separator>
602+element inside the group.
603+
604+.. image:: /form-view-guidelines/screenshot-03.png
605+
606+::
607+
608+ <group string="Payment Options">
609+ <field name="writeoff_amount"/>
610+ <field name="payment_option"/>
611+ </group>
612+
613+It is recommended to have two columns of fields on the form. For this, simply
614+put the <group> elements that contain the fields inside a <group> element.
615+
616+To ease view inheritance, it is recommended to put a name=”...” in <group>
617+elements. Adding fields inside such a group is trivial.
618+
619+Special Case: Subtotals
620+~~~~~~~~~~~~~~~~~~~~~~~
621+
622+Some CSS classes are defined to render subtotals like in invoice forms:
623+
624+.. image:: /form-view-guidelines/screenshot-00.png
625+
626+::
627+
628+ <group class="oe_subtotal_footer">
629+ <field name="amount_untaxed"/>
630+ <field name="amount_tax"/>
631+ <field name="amount_total" class="oe_subtotal_footer_separator"/>
632+ <field name="residual" style="margin-top: 10px"/>
633+ </group>
634+
635+Placeholders and Inline Fields
636+..............................
637+
638+Sometimes field labels make the form too complex. One can omit field labels,
639+and instead put a placeholder inside the field. The placeholder text is
640+visible only when the field is empty. The placeholder should tell what to
641+place inside the field, and not be an example.
642+
643+One can also group fields together by rendering them “inline” inside an
644+explicit block element like <div>. This allows to group several elements in
645+place of a field (without its label).
646+
647+The following example, taken from the Leads form, shows both placeholders and
648+inline fields (zip and city).
649+
650++--------------------------------------------------+----------------------------------------------------+
651+| Edit mode | View mode |
652++--------------------------------------------------+----------------------------------------------------+
653+| .. image:: /form-view-guidelines/placeholder.png | .. image:: /form-view-guidelines/screenshot-01.png |
654++--------------------------------------------------+----------------------------------------------------+
655+
656+::
657+
658+ <group>
659+ <label for="street" string="Address"/>
660+ <div>
661+ <field name="street" placeholder="Street..."/>
662+ <field name="street2"/>
663+ <div>
664+ <field name="zip" class="oe_inline" placeholder="ZIP"/>
665+ <field name="city" class="oe_inline" placeholder="City"/>
666+ </div>
667+ <field name="state_id" placeholder="State"/>
668+ <field name="country_id" placeholder="Country"/>
669+ </div>
670+ </group>
671+
672+Images
673+......
674+
675+Images, like avatars, should be displayed on the right of the sheet. The
676+product form looks like:
677+
678+.. image:: /form-view-guidelines/screenshot-02.png
679+
680+The form above contains a <sheet> element that starts with::
681+
682+ <field name="product_image" widget="image" class="oe_avatar oe_right"/>
683+
684+Tags
685+....
686+
687+Many2many fields, like categories, are better rendered as a list of tags. Use
688+the widget “many2many_tags”:
689+
690+.. image:: /form-view-guidelines/screenshot-04.png
691+
692+::
693+
694+ <field name="category_id"
695+ widget="many2many_tags"/>
696+
697+Configuration Forms and Wizards
698+-------------------------------
699+
700+Configuration Forms
701+'''''''''''''''''''
702+
703+Examples of configuration forms: Stages, Leave Type, etc. This concerns all
704+menu items under Configuration of each application (like Sales/Configuration).
705+
706+.. image:: /form-view-guidelines/nosheet.png
707+
708+For those views, the guidelines are:
709+
710+1. no header (because no state, no workflow, no button)
711+2. no sheet
712+
713+Regular Wizards (Popup)
714+'''''''''''''''''''''''
715+
716+Example: “Schedule a Call” from an opportunity.
717+
718+.. image:: /form-view-guidelines/wizard-popup.png
719+
720+The guidelines are:
721+
722+1. avoid separators (the title is already in the popup title bar, so another
723+ separator is not relevant);
724+2. avoid cancel buttons (user generally close the popup window to get the same
725+ effect);
726+3. action buttons must be highlighted (red);
727+4. when there is a text area, use a placeholder instead of a label or a
728+ separator;
729+5. like in regular form views, put buttons in the <header> element.
730+
731+Configuration Wizard
732+''''''''''''''''''''
733+
734+Example: Settings / Configuration / Sales. The guidelines are:
735+
736+1. always in line (no popup);
737+2. no sheet;
738+3. keep the cancel button (users cannot close the window);
739+4. the button “Apply” must be red.
740
741=== added file 'doc/form-view-guidelines/header.png'
742Binary files doc/form-view-guidelines/header.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/header.png 2013-06-03 11:35:34 +0000 differ
743=== added file 'doc/form-view-guidelines/header2.png'
744Binary files doc/form-view-guidelines/header2.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/header2.png 2013-06-03 11:35:34 +0000 differ
745=== added file 'doc/form-view-guidelines/header3.png'
746Binary files doc/form-view-guidelines/header3.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/header3.png 2013-06-03 11:35:34 +0000 differ
747=== added file 'doc/form-view-guidelines/nosheet.png'
748Binary files doc/form-view-guidelines/nosheet.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/nosheet.png 2013-06-03 11:35:34 +0000 differ
749=== added file 'doc/form-view-guidelines/oppreadonly.png'
750Binary files doc/form-view-guidelines/oppreadonly.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/oppreadonly.png 2013-06-03 11:35:34 +0000 differ
751=== added file 'doc/form-view-guidelines/placeholder.png'
752Binary files doc/form-view-guidelines/placeholder.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/placeholder.png 2013-06-03 11:35:34 +0000 differ
753=== added file 'doc/form-view-guidelines/screenshot-00.png'
754Binary files doc/form-view-guidelines/screenshot-00.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/screenshot-00.png 2013-06-03 11:35:34 +0000 differ
755=== added file 'doc/form-view-guidelines/screenshot-01.png'
756Binary files doc/form-view-guidelines/screenshot-01.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/screenshot-01.png 2013-06-03 11:35:34 +0000 differ
757=== added file 'doc/form-view-guidelines/screenshot-02.png'
758Binary files doc/form-view-guidelines/screenshot-02.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/screenshot-02.png 2013-06-03 11:35:34 +0000 differ
759=== added file 'doc/form-view-guidelines/screenshot-03.png'
760Binary files doc/form-view-guidelines/screenshot-03.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/screenshot-03.png 2013-06-03 11:35:34 +0000 differ
761=== added file 'doc/form-view-guidelines/screenshot-04.png'
762Binary files doc/form-view-guidelines/screenshot-04.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/screenshot-04.png 2013-06-03 11:35:34 +0000 differ
763=== added file 'doc/form-view-guidelines/sheet.png'
764Binary files doc/form-view-guidelines/sheet.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/sheet.png 2013-06-03 11:35:34 +0000 differ
765=== added file 'doc/form-view-guidelines/status.png'
766Binary files doc/form-view-guidelines/status.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/status.png 2013-06-03 11:35:34 +0000 differ
767=== added file 'doc/form-view-guidelines/status1.png'
768Binary files doc/form-view-guidelines/status1.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/status1.png 2013-06-03 11:35:34 +0000 differ
769=== added file 'doc/form-view-guidelines/status2.png'
770Binary files doc/form-view-guidelines/status2.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/status2.png 2013-06-03 11:35:34 +0000 differ
771=== added file 'doc/form-view-guidelines/wizard-popup.png'
772Binary files doc/form-view-guidelines/wizard-popup.png 1970-01-01 00:00:00 +0000 and doc/form-view-guidelines/wizard-popup.png 2013-06-03 11:35:34 +0000 differ
773=== modified file 'doc/index.rst'
774--- doc/index.rst 2012-12-12 16:17:00 +0000
775+++ doc/index.rst 2013-06-03 11:35:34 +0000
776@@ -16,7 +16,19 @@
777 04_security
778 05_test_framework
779 06_misc
780- 09_deployment
781+ deployment-gunicorn
782+ deployment-mod-wsgi
783+ form-view-guidelines
784+
785+OpenERP Command
786+'''''''''''''''
787+
788+.. toctree::
789+ :maxdepth: 1
790+
791+ openerp-command.rst
792+ commands.rst
793+ adding-command.rst
794
795 OpenERP Server API
796 ''''''''''''''''''
797@@ -24,8 +36,17 @@
798 .. toctree::
799 :maxdepth: 1
800
801- api_core.rst
802+ orm-methods.rst
803 api_models.rst
804+ routing.rst
805+
806+Changelog
807+'''''''''
808+
809+.. toctree::
810+ :maxdepth: 1
811+
812+ changelog.rst
813
814 Concepts
815 ''''''''
816
817=== added file 'doc/openerp-command.rst'
818--- doc/openerp-command.rst 1970-01-01 00:00:00 +0000
819+++ doc/openerp-command.rst 2013-06-03 11:35:34 +0000
820@@ -0,0 +1,66 @@
821+.. _openerp-command:
822+
823+The ``oe`` script
824+=================
825+
826+The ``oe`` script provides a set of command-line tools around the OpenERP
827+framework. It is meant to replace the older ``openerp-server`` script (which
828+is still available).
829+
830+Using ``oe``
831+------------
832+
833+In contrast to the previous ``openerp-server`` script, ``oe`` defines a few
834+commands, each with its own set of flags and options. You can get some
835+information for any of them with
836+
837+::
838+
839+ > oe <command> --help
840+
841+For instance::
842+
843+ > oe run-tests --help
844+
845+Some ``oe`` options can be provided via environment variables. For instance::
846+
847+ > export OPENERP_DATABASE=trunk
848+ > export OPENERP_HOST=127.0.0.1
849+ > export OPENERP_PORT=8069
850+
851+Depending on your needs, you can group all of the above in one single script;
852+for instance here is a, say, ``test-trunk-view-validation.sh`` file::
853+
854+ COMMAND_REPO=/home/thu/repos/command/trunk/
855+ SERVER_REPO=/home/thu/repos/server/trunk
856+
857+ export PYTHONPATH=$SERVER_REPO:$COMMAND_REPO
858+ export PATH=$SERVER_REPO:$COMMAND_REPO:$PATH
859+ export OPENERP_DATABASE=trunk
860+ export OPENERP_HOST=127.0.0.1
861+ export OPENERP_PORT=8069
862+
863+ # The -d ignored is actually needed by `oe` even though `test_view_validation`
864+ # itself does not need it.
865+ oe run-tests -d ignored -m openerp.test_view_validation
866+
867+Available commands
868+-------------------
869+
870+See the :doc:`commands` page.
871+
872+Adding new commands
873+-------------------
874+
875+See the :doc:`adding-command` page.
876+
877+Bash completion
878+---------------
879+
880+A preliminary ``oe-bash-completion`` file is provided. After sourcing it,
881+
882+::
883+
884+ > . oe-bash-completion
885+
886+completion (using the TAB character) in Bash should work.
887
888=== added file 'doc/orm-methods.rst'
889--- doc/orm-methods.rst 1970-01-01 00:00:00 +0000
890+++ doc/orm-methods.rst 2013-06-03 11:35:34 +0000
891@@ -0,0 +1,61 @@
892+.. _orm-methods:
893+
894+ORM methods
895+===========
896+
897+.. _orm-workflows:
898+
899+Workflow-related methods
900+------------------------
901+
902+.. versionadded:: 7.1
903+
904+Creating, deleting, or otherwise manipulating workflow instances is possible
905+right from a Model instance. (Previously, workflows were handled throught a
906+call to ``LocalService('workflow')``. Using the ORM methods is now the preferred
907+way.)
908+
909+.. currentmodule:: openerp.osv.orm
910+
911+.. automethod:: BaseModel.create_workflow
912+ :noindex:
913+
914+ This is used instead of ``LocalService('workflow').trg_create()``.
915+
916+.. automethod:: BaseModel.delete_workflow
917+ :noindex:
918+
919+ This is used instead of ``LocalService('workflow').trg_delete()``.
920+
921+.. automethod:: BaseModel.step_workflow
922+ :noindex:
923+
924+ This is used instead of ``LocalService('workflow').trg_write()``.
925+
926+.. automethod:: BaseModel.redirect_workflow
927+ :noindex:
928+
929+.. automethod:: BaseModel.signal_workflow
930+ :noindex:
931+
932+ This is used instead of ``LocalService('workflow').trg_validate()``.
933+
934+.. method:: BaseModel.signal_xxx(cr, uid, ids)
935+ :noindex:
936+
937+ Sends a signal ``xxx`` to the workflow instances bound to the given record
938+ IDs. (This is implemented using ``__getattr__`` so no source link is
939+ rendered on the right.)
940+
941+ This is used instead of ``LocalService('workflow').trg_validate()``.
942+
943+
944+.. note::
945+ Low-level access to the workflows is still possible by using the
946+ ``openerp.workflow`` module, that is, in a similar way to what was possible
947+ with the previous ``LocalService('workflow')`` access. This may be useful
948+ when looking-up a model in the registry and/or its records is not necessary.
949+ For instance when working with raw model names and record IDs is preferred (to
950+ avoid hitting unnecessarily the database). But this is something that should be
951+ carefully considered as it would bypass the ORM methods (and thus any inherited
952+ behaviors).
953
954=== added file 'doc/report-declaration.rst'
955--- doc/report-declaration.rst 1970-01-01 00:00:00 +0000
956+++ doc/report-declaration.rst 2013-06-03 11:35:34 +0000
957@@ -0,0 +1,23 @@
958+.. _report-declaration:
959+
960+Report declaration
961+==================
962+
963+.. versionadded:: 7.1
964+
965+Before version 7.1, report declaration could be done in two different ways:
966+either via a ``<report>`` tag in XML, or via such a tag and a class
967+instanciation in a Python module. Instanciating a class in a Python module was
968+necessary when a custom parser was used.
969+
970+In version 7.1, the recommended way to register a report is to use only the
971+``<report>`` XML tag. The tag can now support an additional ``parser``
972+attribute. The value for that attibute must be a fully-qualified class name,
973+without the leading ``openerp.addons.`` namespace.
974+
975+.. note::
976+ The rational to deprecate the manual class instanciation is to make all
977+ reports visible in the database, have a unique way to declare reports
978+ instead of two, and remove the need to maintain a registry of reports in
979+ memory.
980+
981
982=== added file 'doc/routing.rst'
983--- doc/routing.rst 1970-01-01 00:00:00 +0000
984+++ doc/routing.rst 2013-06-03 11:35:34 +0000
985@@ -0,0 +1,29 @@
986+.. _routing:
987+
988+Routing
989+=======
990+
991+.. versionchanged:: 7.1
992+
993+The OpenERP framework, as an HTTP server, serves a few hard-coded URLs
994+(``models``, ``db``, ...) to expose RPC endpoints. When running the web addons
995+(which is almost always the case), it also serves URLs without them being RPC
996+endpoints.
997+
998+In older version of OpenERP, adding RPC endpoints was done by subclassing the
999+``openerp.netsvc.ExportService`` class. Adding WSGI handlers was done by
1000+registering them with the :py:func:`openerp.wsgi.register_wsgi_handler`
1001+function.
1002+
1003+Starting with OpenERP 7.1, exposing a new arbitrary WSGI handler is done with
1004+the :py:func:`openerp.http.handler` decorator while adding an RPC endpoint is
1005+done with the :py:func:`openerp.http.rpc` decorator.
1006+
1007+.. _routing-decorators:
1008+
1009+Routing decorators
1010+------------------
1011+
1012+.. automodule:: openerp.http
1013+ :members:
1014+ :undoc-members:
1015
1016=== modified file 'install/openerp-server.1'
1017--- install/openerp-server.1 2011-09-26 00:54:44 +0000
1018+++ install/openerp-server.1 2013-06-03 11:35:34 +0000
1019@@ -80,17 +80,6 @@
1020 \fB\-\-pkey\-file\fR=\fISECURE_PKEY_FILE\fR
1021 specify the private key file for the SSL connection
1022 .IP
1023-NET\-RPC Configuration:
1024-.TP
1025-\fB\-\-netrpc\-interface\fR=\fINETRPC_INTERFACE\fR
1026-specify the TCP IP address for the NETRPC protocol
1027-.TP
1028-\fB\-\-netrpc\-port\fR=\fINETRPC_PORT\fR
1029-specify the TCP port for the NETRPC protocol
1030-.TP
1031-\fB\-\-no\-netrpc\fR
1032-disable the NETRPC protocol
1033-.IP
1034 Static HTTP service:
1035 .TP
1036 \fB\-\-static\-http\-enable\fR
1037
1038=== added file 'oe'
1039--- oe 1970-01-01 00:00:00 +0000
1040+++ oe 2013-06-03 11:35:34 +0000
1041@@ -0,0 +1,5 @@
1042+#! /usr/bin/env python2
1043+
1044+if __name__ == '__main__':
1045+ import openerpcommand.main
1046+ openerpcommand.main.run()
1047
1048=== added file 'oe-bash-completion'
1049--- oe-bash-completion 1970-01-01 00:00:00 +0000
1050+++ oe-bash-completion 2013-06-03 11:35:34 +0000
1051@@ -0,0 +1,89 @@
1052+_oe()
1053+{
1054+ local cur prev opts
1055+ COMPREPLY=()
1056+ cur="${COMP_WORDS[COMP_CWORD]}"
1057+ prev="${COMP_WORDS[COMP_CWORD-1]}"
1058+
1059+ cmd="${COMP_WORDS[0]}"
1060+ subcmd=""
1061+ if [[ ${COMP_CWORD} > 0 ]] ; then
1062+ subcmd="${COMP_WORDS[1]}"
1063+ fi
1064+
1065+ # oe
1066+
1067+ opts="initialize model read run-tests scaffold update \
1068+ call open show consume-nothing consume-memory leak-memory \
1069+ consume-cpu bench-read bench-fields-view-get bench-dummy bench-login \
1070+ bench-sale-mrp --help"
1071+
1072+ if [[ ${prev} == oe && ${cur} != -* ]] ; then
1073+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
1074+ return 0
1075+ fi
1076+
1077+ # oe call
1078+
1079+ opts="--database --user --password --host --port --help"
1080+
1081+ if [[ ${subcmd} == call ]] ; then
1082+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
1083+ return 0
1084+ fi
1085+
1086+ # oe initialize
1087+
1088+ opts="--database --addons --all-modules --exclude --no-create --help"
1089+
1090+ if [[ ${subcmd} == initialize ]] ; then
1091+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
1092+ return 0
1093+ fi
1094+
1095+ # oe model
1096+
1097+ opts="--database --model --field --verbose --help"
1098+
1099+ if [[ ${subcmd} == model ]] ; then
1100+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
1101+ return 0
1102+ fi
1103+
1104+ # oe read
1105+
1106+ opts="--database --model --id --field --verbose --short --help"
1107+
1108+ if [[ ${subcmd} == read ]] ; then
1109+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
1110+ return 0
1111+ fi
1112+
1113+ # oe run-tests
1114+
1115+ opts="--database --addons --module --dry-run --help"
1116+
1117+ if [[ ${subcmd} == run-tests ]] ; then
1118+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
1119+ return 0
1120+ fi
1121+
1122+ # oe scaffold
1123+
1124+ opts="--help"
1125+
1126+ if [[ ${subcmd} == scaffold ]] ; then
1127+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
1128+ return 0
1129+ fi
1130+
1131+ # fallback for unimplemented completion
1132+
1133+ opts="--help"
1134+
1135+ if [[ true ]] ; then
1136+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
1137+ return 0
1138+ fi
1139+}
1140+complete -F _oe oe
1141
1142=== removed file 'openerp/.apidoc'
1143--- openerp/.apidoc 2011-06-23 09:08:07 +0000
1144+++ openerp/.apidoc 1970-01-01 00:00:00 +0000
1145@@ -1,1 +0,0 @@
1146-excludes: pychart release openerp-server test run_tests addons/base_quality_interrogation
1147\ No newline at end of file
1148
1149=== modified file 'openerp/PKG-INFO'
1150--- openerp/PKG-INFO 2011-02-03 23:00:23 +0000
1151+++ openerp/PKG-INFO 2013-06-03 11:35:34 +0000
1152@@ -13,6 +13,6 @@
1153 and financial), stock management, sales and purchases management, tasks
1154 automation, marketing campaigns, help desk, POS, etc. Technical features include
1155 a distributed server, flexible workflows, an object database, a dynamic GUI,
1156- customizable reports, and NET-RPC and XML-RPC interfaces.
1157+ customizable reports, and an XML-RPC interface.
1158 Keywords: ERP, Accounting, Stock, CRM, Enterprise, Logistics, Management, Sales, Purchases
1159 Platform: Linux, Win32
1160
1161=== modified file 'openerp/__init__.py'
1162--- openerp/__init__.py 2013-03-07 12:16:37 +0000
1163+++ openerp/__init__.py 2013-06-03 11:35:34 +0000
1164@@ -1,6 +1,6 @@
1165 # -*- coding: utf-8 -*-
1166 ##############################################################################
1167-#
1168+#
1169 # OpenERP, Open Source Management Solution
1170 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
1171 #
1172@@ -15,11 +15,11 @@
1173 # GNU Affero General Public License for more details.
1174 #
1175 # You should have received a copy of the GNU Affero General Public License
1176-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1177+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1178 #
1179 ##############################################################################
1180
1181-""" OpenERP core library.
1182+""" OpenERP core library..
1183
1184 """
1185
1186@@ -39,6 +39,7 @@
1187 import addons
1188 import cli
1189 import conf
1190+import http
1191 import loglevels
1192 import modules
1193 import netsvc
1194@@ -60,6 +61,15 @@
1195 # its own copy of the data structure and we don't need to care about
1196 # locks between threads.
1197 multi_process = False
1198+# Is the server running with gevent.
1199+evented = False
1200+
1201+def registry(database_name):
1202+ """
1203+ Return the model registry for the given database. If the registry does not
1204+ exist yet, it is created on the fly.
1205+ """
1206+ return modules.registry.RegistryManager.get(database_name)
1207
1208 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1209
1210
1211=== modified file 'openerp/addons/base/i18n/ab.po'
1212--- openerp/addons/base/i18n/ab.po 2013-03-08 05:23:54 +0000
1213+++ openerp/addons/base/i18n/ab.po 2013-06-03 11:35:34 +0000
1214@@ -7,15 +7,15 @@
1215 msgstr ""
1216 "Project-Id-Version: openobject-server\n"
1217 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1218-"POT-Creation-Date: 2013-03-07 08:36+0000\n"
1219-"PO-Revision-Date: 2012-12-21 23:09+0000\n"
1220+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
1221+"PO-Revision-Date: 2012-02-27 08:03+0000\n"
1222 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1223 "Language-Team: Abkhazian <ab@li.org>\n"
1224 "MIME-Version: 1.0\n"
1225 "Content-Type: text/plain; charset=UTF-8\n"
1226 "Content-Transfer-Encoding: 8bit\n"
1227-"X-Launchpad-Export-Date: 2013-03-08 05:15+0000\n"
1228-"X-Generator: Launchpad (build 16523)\n"
1229+"X-Launchpad-Export-Date: 2013-05-30 05:34+0000\n"
1230+"X-Generator: Launchpad (build 16652)\n"
1231
1232 #. module: base
1233 #: model:ir.module.module,description:base.module_account_check_writing
1234@@ -27,11 +27,6 @@
1235 msgstr ""
1236
1237 #. module: base
1238-#: view:res.partner.bank:0
1239-msgid "e.g. GEBABEBB"
1240-msgstr ""
1241-
1242-#. module: base
1243 #: model:res.country,name:base.sh
1244 msgid "Saint Helena"
1245 msgstr ""
1246@@ -648,11 +643,6 @@
1247 msgstr ""
1248
1249 #. module: base
1250-#: view:res.partner:0
1251-msgid "Put an internal note..."
1252-msgstr ""
1253-
1254-#. module: base
1255 #: view:ir.translation:0
1256 msgid "Untranslated"
1257 msgstr ""
1258@@ -981,15 +971,6 @@
1259 msgstr ""
1260
1261 #. module: base
1262-#: view:res.bank:0
1263-#: view:res.company:0
1264-#: view:res.partner:0
1265-#: view:res.partner.bank:0
1266-#: view:res.users:0
1267-msgid "ZIP"
1268-msgstr ""
1269-
1270-#. module: base
1271 #: selection:base.language.install,lang:0
1272 msgid "Spanish (UY) / Español (UY)"
1273 msgstr ""
1274@@ -2723,6 +2704,11 @@
1275 msgstr ""
1276
1277 #. module: base
1278+#: view:ir.filters:0
1279+msgid "My Filters"
1280+msgstr ""
1281+
1282+#. module: base
1283 #: field:ir.actions.server,email:0
1284 msgid "Email Address"
1285 msgstr ""
1286@@ -3080,11 +3066,6 @@
1287 msgstr ""
1288
1289 #. module: base
1290-#: model:ir.module.module,shortdesc:base.module_hr_expense
1291-msgid "Expense Management"
1292-msgstr ""
1293-
1294-#. module: base
1295 #: field:ir.actions.server,action_id:0
1296 #: selection:ir.actions.server,state:0
1297 #: view:ir.values:0
1298@@ -3111,11 +3092,6 @@
1299 msgstr ""
1300
1301 #. module: base
1302-#: view:res.company:0
1303-msgid "e.g. Global Business Solutions"
1304-msgstr ""
1305-
1306-#. module: base
1307 #: field:res.company,rml_header1:0
1308 msgid "Company Tagline"
1309 msgstr ""
1310@@ -3519,6 +3495,11 @@
1311 msgstr ""
1312
1313 #. module: base
1314+#: view:ir.filters:0
1315+msgid "Personal"
1316+msgstr ""
1317+
1318+#. module: base
1319 #: field:base.language.export,modules:0
1320 msgid "Modules To Export"
1321 msgstr ""
1322@@ -5985,11 +5966,6 @@
1323 msgstr ""
1324
1325 #. module: base
1326-#: view:base.language.import:0
1327-msgid "e.g. English"
1328-msgstr ""
1329-
1330-#. module: base
1331 #: help:ir.cron,numbercall:0
1332 msgid ""
1333 "How many times the method is called,\n"
1334@@ -6073,13 +6049,6 @@
1335 msgstr ""
1336
1337 #. module: base
1338-#: view:res.company:0
1339-#: view:res.partner:0
1340-#: view:res.users:0
1341-msgid "e.g. www.openerp.com"
1342-msgstr ""
1343-
1344-#. module: base
1345 #: selection:ir.cron,interval_type:0
1346 msgid "Hours"
1347 msgstr ""
1348@@ -6505,11 +6474,6 @@
1349 msgstr ""
1350
1351 #. module: base
1352-#: model:ir.ui.menu,name:base.menu_sales_followup
1353-msgid "Payment Follow-up"
1354-msgstr ""
1355-
1356-#. module: base
1357 #: model:res.country,name:base.cw
1358 msgid "Curaçao"
1359 msgstr ""
1360@@ -7299,11 +7263,6 @@
1361 msgstr ""
1362
1363 #. module: base
1364-#: view:ir.filters:0
1365-msgid "Filters created by myself"
1366-msgstr ""
1367-
1368-#. module: base
1369 #: model:ir.module.module,shortdesc:base.module_l10n_hn
1370 msgid "Honduras - Accounting"
1371 msgstr ""
1372@@ -7520,12 +7479,6 @@
1373
1374 #. module: base
1375 #: view:res.partner:0
1376-#: view:res.users:0
1377-msgid "Tags..."
1378-msgstr ""
1379-
1380-#. module: base
1381-#: view:res.partner:0
1382 msgid "at"
1383 msgstr ""
1384
1385@@ -7550,11 +7503,6 @@
1386 msgstr ""
1387
1388 #. module: base
1389-#: view:ir.filters:0
1390-msgid "My filters"
1391-msgstr ""
1392-
1393-#. module: base
1394 #: field:res.lang,iso_code:0
1395 msgid "ISO code"
1396 msgstr ""
1397@@ -8262,12 +8210,6 @@
1398 msgstr ""
1399
1400 #. module: base
1401-#: code:addons/orm.py:5334
1402-#, python-format
1403-msgid "The value for the field '%s' already exists."
1404-msgstr ""
1405-
1406-#. module: base
1407 #: field:workflow.workitem,inst_id:0
1408 msgid "Instance"
1409 msgstr ""
1410@@ -9289,10 +9231,8 @@
1411 msgstr ""
1412
1413 #. module: base
1414-#. openerp-web
1415-#: code:addons/base/static/src/js/apps.js:103
1416-#, python-format
1417-msgid "OpenERP Apps Unreachable"
1418+#: model:ir.module.module,shortdesc:base.module_hr_expense
1419+msgid "Expense Management"
1420 msgstr ""
1421
1422 #. module: base
1423@@ -9790,14 +9730,6 @@
1424 msgstr ""
1425
1426 #. module: base
1427-#: code:addons/base/module/module.py:670
1428-#, python-format
1429-msgid ""
1430-"The `%s` module appears to be unavailable at the moment, please try again "
1431-"later."
1432-msgstr ""
1433-
1434-#. module: base
1435 #: view:ir.attachment:0
1436 #: view:ir.cron:0
1437 #: view:ir.filters:0
1438@@ -10172,14 +10104,6 @@
1439 msgstr ""
1440
1441 #. module: base
1442-#: view:res.bank:0
1443-#: view:res.company:0
1444-#: view:res.partner:0
1445-#: view:res.users:0
1446-msgid "Street..."
1447-msgstr ""
1448-
1449-#. module: base
1450 #: constraint:res.users:0
1451 msgid "The chosen company is not in the allowed companies for this user"
1452 msgstr ""
1453@@ -11465,12 +11389,6 @@
1454 msgstr ""
1455
1456 #. module: base
1457-#: view:res.partner:0
1458-#: view:res.users:0
1459-msgid "e.g. +32.81.81.37.00"
1460-msgstr ""
1461-
1462-#. module: base
1463 #: selection:base.language.install,lang:0
1464 msgid "Spanish (NI) / Español (NI)"
1465 msgstr ""
1466@@ -11521,12 +11439,6 @@
1467 msgstr ""
1468
1469 #. module: base
1470-#: model:ir.actions.client,name:base.modules_updates_act_cl
1471-#: model:ir.ui.menu,name:base.menu_module_updates
1472-msgid "Updates"
1473-msgstr ""
1474-
1475-#. module: base
1476 #: field:ir.actions.act_window.view,sequence:0
1477 #: field:ir.actions.server,sequence:0
1478 #: field:ir.actions.todo,sequence:0
1479@@ -12399,13 +12311,6 @@
1480 msgstr ""
1481
1482 #. module: base
1483-#. openerp-web
1484-#: code:addons/base/static/src/js/apps.js:103
1485-#, python-format
1486-msgid "Showing locally available modules"
1487-msgstr ""
1488-
1489-#. module: base
1490 #: selection:base.language.install,lang:0
1491 msgid "Malayalam / മലയാളം"
1492 msgstr ""
1493@@ -14195,11 +14100,6 @@
1494 msgstr ""
1495
1496 #. module: base
1497-#: view:res.country:0
1498-msgid "Address format..."
1499-msgstr ""
1500-
1501-#. module: base
1502 #: model:ir.module.module,description:base.module_l10n_et
1503 msgid ""
1504 "\n"
1505@@ -14642,11 +14542,6 @@
1506 msgstr ""
1507
1508 #. module: base
1509-#: view:res.partner:0
1510-msgid "e.g. Sales Director"
1511-msgstr ""
1512-
1513-#. module: base
1514 #: selection:base.language.install,lang:0
1515 msgid "Czech / Čeština"
1516 msgstr ""
1517@@ -14820,11 +14715,6 @@
1518 msgstr ""
1519
1520 #. module: base
1521-#: view:base.language.import:0
1522-msgid "e.g. en_US"
1523-msgstr ""
1524-
1525-#. module: base
1526 #: model:ir.module.module,description:base.module_l10n_hn
1527 msgid ""
1528 "\n"
1529@@ -15000,9 +14890,9 @@
1530 msgstr ""
1531
1532 #. module: base
1533-#: code:addons/base/module/module.py:669
1534-#, python-format
1535-msgid "Module not found"
1536+#: model:ir.actions.client,name:base.modules_updates_act_cl
1537+#: model:ir.ui.menu,name:base.menu_module_updates
1538+msgid "Updates"
1539 msgstr ""
1540
1541 #. module: base
1542
1543=== modified file 'openerp/addons/base/i18n/af.po'
1544--- openerp/addons/base/i18n/af.po 2013-03-08 05:23:54 +0000
1545+++ openerp/addons/base/i18n/af.po 2013-06-03 11:35:34 +0000
1546@@ -1,21 +1,21 @@
1547 # Afrikaans translation for openobject-server
1548-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
1549+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
1550 # This file is distributed under the same license as the openobject-server package.
1551-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
1552+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
1553 #
1554 msgid ""
1555 msgstr ""
1556 "Project-Id-Version: openobject-server\n"
1557 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1558-"POT-Creation-Date: 2013-03-07 08:36+0000\n"
1559-"PO-Revision-Date: 2012-12-21 23:09+0000\n"
1560-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1561+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
1562+"PO-Revision-Date: 2010-11-21 07:32+0000\n"
1563+"Last-Translator: Jacobus Erasmus <jacobus@kewlconcepts.co.za>\n"
1564 "Language-Team: Afrikaans <af@li.org>\n"
1565 "MIME-Version: 1.0\n"
1566 "Content-Type: text/plain; charset=UTF-8\n"
1567 "Content-Transfer-Encoding: 8bit\n"
1568-"X-Launchpad-Export-Date: 2013-03-08 05:15+0000\n"
1569-"X-Generator: Launchpad (build 16523)\n"
1570+"X-Launchpad-Export-Date: 2013-05-30 05:34+0000\n"
1571+"X-Generator: Launchpad (build 16652)\n"
1572
1573 #. module: base
1574 #: model:ir.module.module,description:base.module_account_check_writing
1575@@ -27,11 +27,6 @@
1576 msgstr ""
1577
1578 #. module: base
1579-#: view:res.partner.bank:0
1580-msgid "e.g. GEBABEBB"
1581-msgstr ""
1582-
1583-#. module: base
1584 #: model:res.country,name:base.sh
1585 msgid "Saint Helena"
1586 msgstr "St. Helena"
1587@@ -652,11 +647,6 @@
1588 msgstr ""
1589
1590 #. module: base
1591-#: view:res.partner:0
1592-msgid "Put an internal note..."
1593-msgstr ""
1594-
1595-#. module: base
1596 #: view:ir.translation:0
1597 msgid "Untranslated"
1598 msgstr ""
1599@@ -985,15 +975,6 @@
1600 msgstr ""
1601
1602 #. module: base
1603-#: view:res.bank:0
1604-#: view:res.company:0
1605-#: view:res.partner:0
1606-#: view:res.partner.bank:0
1607-#: view:res.users:0
1608-msgid "ZIP"
1609-msgstr ""
1610-
1611-#. module: base
1612 #: selection:base.language.install,lang:0
1613 msgid "Spanish (UY) / Español (UY)"
1614 msgstr ""
1615@@ -2727,6 +2708,11 @@
1616 msgstr ""
1617
1618 #. module: base
1619+#: view:ir.filters:0
1620+msgid "My Filters"
1621+msgstr ""
1622+
1623+#. module: base
1624 #: field:ir.actions.server,email:0
1625 msgid "Email Address"
1626 msgstr ""
1627@@ -3084,11 +3070,6 @@
1628 msgstr ""
1629
1630 #. module: base
1631-#: model:ir.module.module,shortdesc:base.module_hr_expense
1632-msgid "Expense Management"
1633-msgstr ""
1634-
1635-#. module: base
1636 #: field:ir.actions.server,action_id:0
1637 #: selection:ir.actions.server,state:0
1638 #: view:ir.values:0
1639@@ -3115,11 +3096,6 @@
1640 msgstr ""
1641
1642 #. module: base
1643-#: view:res.company:0
1644-msgid "e.g. Global Business Solutions"
1645-msgstr ""
1646-
1647-#. module: base
1648 #: field:res.company,rml_header1:0
1649 msgid "Company Tagline"
1650 msgstr ""
1651@@ -3523,6 +3499,11 @@
1652 msgstr ""
1653
1654 #. module: base
1655+#: view:ir.filters:0
1656+msgid "Personal"
1657+msgstr ""
1658+
1659+#. module: base
1660 #: field:base.language.export,modules:0
1661 msgid "Modules To Export"
1662 msgstr ""
1663@@ -5989,11 +5970,6 @@
1664 msgstr ""
1665
1666 #. module: base
1667-#: view:base.language.import:0
1668-msgid "e.g. English"
1669-msgstr ""
1670-
1671-#. module: base
1672 #: help:ir.cron,numbercall:0
1673 msgid ""
1674 "How many times the method is called,\n"
1675@@ -6077,13 +6053,6 @@
1676 msgstr ""
1677
1678 #. module: base
1679-#: view:res.company:0
1680-#: view:res.partner:0
1681-#: view:res.users:0
1682-msgid "e.g. www.openerp.com"
1683-msgstr ""
1684-
1685-#. module: base
1686 #: selection:ir.cron,interval_type:0
1687 msgid "Hours"
1688 msgstr ""
1689@@ -6509,11 +6478,6 @@
1690 msgstr ""
1691
1692 #. module: base
1693-#: model:ir.ui.menu,name:base.menu_sales_followup
1694-msgid "Payment Follow-up"
1695-msgstr ""
1696-
1697-#. module: base
1698 #: model:res.country,name:base.cw
1699 msgid "Curaçao"
1700 msgstr ""
1701@@ -7303,11 +7267,6 @@
1702 msgstr ""
1703
1704 #. module: base
1705-#: view:ir.filters:0
1706-msgid "Filters created by myself"
1707-msgstr ""
1708-
1709-#. module: base
1710 #: model:ir.module.module,shortdesc:base.module_l10n_hn
1711 msgid "Honduras - Accounting"
1712 msgstr ""
1713@@ -7524,12 +7483,6 @@
1714
1715 #. module: base
1716 #: view:res.partner:0
1717-#: view:res.users:0
1718-msgid "Tags..."
1719-msgstr ""
1720-
1721-#. module: base
1722-#: view:res.partner:0
1723 msgid "at"
1724 msgstr ""
1725
1726@@ -7554,11 +7507,6 @@
1727 msgstr ""
1728
1729 #. module: base
1730-#: view:ir.filters:0
1731-msgid "My filters"
1732-msgstr ""
1733-
1734-#. module: base
1735 #: field:res.lang,iso_code:0
1736 msgid "ISO code"
1737 msgstr ""
1738@@ -8266,12 +8214,6 @@
1739 msgstr ""
1740
1741 #. module: base
1742-#: code:addons/orm.py:5334
1743-#, python-format
1744-msgid "The value for the field '%s' already exists."
1745-msgstr ""
1746-
1747-#. module: base
1748 #: field:workflow.workitem,inst_id:0
1749 msgid "Instance"
1750 msgstr ""
1751@@ -9293,10 +9235,8 @@
1752 msgstr ""
1753
1754 #. module: base
1755-#. openerp-web
1756-#: code:addons/base/static/src/js/apps.js:103
1757-#, python-format
1758-msgid "OpenERP Apps Unreachable"
1759+#: model:ir.module.module,shortdesc:base.module_hr_expense
1760+msgid "Expense Management"
1761 msgstr ""
1762
1763 #. module: base
1764@@ -9794,14 +9734,6 @@
1765 msgstr ""
1766
1767 #. module: base
1768-#: code:addons/base/module/module.py:670
1769-#, python-format
1770-msgid ""
1771-"The `%s` module appears to be unavailable at the moment, please try again "
1772-"later."
1773-msgstr ""
1774-
1775-#. module: base
1776 #: view:ir.attachment:0
1777 #: view:ir.cron:0
1778 #: view:ir.filters:0
1779@@ -10176,14 +10108,6 @@
1780 msgstr ""
1781
1782 #. module: base
1783-#: view:res.bank:0
1784-#: view:res.company:0
1785-#: view:res.partner:0
1786-#: view:res.users:0
1787-msgid "Street..."
1788-msgstr ""
1789-
1790-#. module: base
1791 #: constraint:res.users:0
1792 msgid "The chosen company is not in the allowed companies for this user"
1793 msgstr ""
1794@@ -11469,12 +11393,6 @@
1795 msgstr ""
1796
1797 #. module: base
1798-#: view:res.partner:0
1799-#: view:res.users:0
1800-msgid "e.g. +32.81.81.37.00"
1801-msgstr ""
1802-
1803-#. module: base
1804 #: selection:base.language.install,lang:0
1805 msgid "Spanish (NI) / Español (NI)"
1806 msgstr ""
1807@@ -11525,12 +11443,6 @@
1808 msgstr ""
1809
1810 #. module: base
1811-#: model:ir.actions.client,name:base.modules_updates_act_cl
1812-#: model:ir.ui.menu,name:base.menu_module_updates
1813-msgid "Updates"
1814-msgstr ""
1815-
1816-#. module: base
1817 #: field:ir.actions.act_window.view,sequence:0
1818 #: field:ir.actions.server,sequence:0
1819 #: field:ir.actions.todo,sequence:0
1820@@ -12403,13 +12315,6 @@
1821 msgstr ""
1822
1823 #. module: base
1824-#. openerp-web
1825-#: code:addons/base/static/src/js/apps.js:103
1826-#, python-format
1827-msgid "Showing locally available modules"
1828-msgstr ""
1829-
1830-#. module: base
1831 #: selection:base.language.install,lang:0
1832 msgid "Malayalam / മലയാളം"
1833 msgstr ""
1834@@ -14199,11 +14104,6 @@
1835 msgstr ""
1836
1837 #. module: base
1838-#: view:res.country:0
1839-msgid "Address format..."
1840-msgstr ""
1841-
1842-#. module: base
1843 #: model:ir.module.module,description:base.module_l10n_et
1844 msgid ""
1845 "\n"
1846@@ -14646,11 +14546,6 @@
1847 msgstr ""
1848
1849 #. module: base
1850-#: view:res.partner:0
1851-msgid "e.g. Sales Director"
1852-msgstr ""
1853-
1854-#. module: base
1855 #: selection:base.language.install,lang:0
1856 msgid "Czech / Čeština"
1857 msgstr ""
1858@@ -14824,11 +14719,6 @@
1859 msgstr ""
1860
1861 #. module: base
1862-#: view:base.language.import:0
1863-msgid "e.g. en_US"
1864-msgstr ""
1865-
1866-#. module: base
1867 #: model:ir.module.module,description:base.module_l10n_hn
1868 msgid ""
1869 "\n"
1870@@ -15004,9 +14894,9 @@
1871 msgstr ""
1872
1873 #. module: base
1874-#: code:addons/base/module/module.py:669
1875-#, python-format
1876-msgid "Module not found"
1877+#: model:ir.actions.client,name:base.modules_updates_act_cl
1878+#: model:ir.ui.menu,name:base.menu_module_updates
1879+msgid "Updates"
1880 msgstr ""
1881
1882 #. module: base
1883@@ -15424,3 +15314,48 @@
1884 #: model:ir.module.module,shortdesc:base.module_auth_signup
1885 msgid "Signup"
1886 msgstr ""
1887+
1888+#~ msgid "Metadata"
1889+#~ msgstr "Metadata"
1890+
1891+#~ msgid "Code (eg:en__US)"
1892+#~ msgstr "Kode (bv.: en__US)"
1893+
1894+#~ msgid ""
1895+#~ "\n"
1896+#~ "Project management module tracks multi-level projects, tasks, work done on "
1897+#~ "tasks, eso.\n"
1898+#~ "============================================================================="
1899+#~ "=========\n"
1900+#~ "\n"
1901+#~ "It is able to render planning, order tasks, eso.\n"
1902+#~ "\n"
1903+#~ "Dashboard for project members that includes:\n"
1904+#~ "--------------------------------------------\n"
1905+#~ " * List of my open tasks\n"
1906+#~ " * List of my delegated tasks\n"
1907+#~ " * Graph of My Projects: Planned vs Total Hours\n"
1908+#~ " * Graph of My Remaining Hours by Project\n"
1909+#~ " "
1910+#~ msgstr ""
1911+#~ "\n"
1912+#~ "Projek bestuur module volg multi-vlak projekte, take, werk wat gedoen is aan "
1913+#~ "take, esm.\n"
1914+#~ "================================================== "
1915+#~ "====================================\n"
1916+#~ "\n"
1917+#~ "Dit is in staat om beplanning te lewer, take te sorteer, . eso\n"
1918+#~ "\n"
1919+#~ "Bedieningspaneel vir die projek lede wat insluit:\n"
1920+#~ "--------------------------------------------\n"
1921+#~ "* Lys van my oop take\n"
1922+#~ "* Lys van my gedelegeerde take\n"
1923+#~ "* Grafiek van my projekte: Beplande vs Totale ure\n"
1924+#~ "* Grafiek van my Oorblywende ure per Projek\n"
1925+#~ " "
1926+
1927+#~ msgid "Tasks-Mail Integration"
1928+#~ msgstr "Take - Vonkpos Integrasie"
1929+
1930+#~ msgid "Display Menu Tips"
1931+#~ msgstr "Vertoon Kieslys Wenke"
1932
1933=== modified file 'openerp/addons/base/i18n/am.po'
1934--- openerp/addons/base/i18n/am.po 2013-03-08 05:23:54 +0000
1935+++ openerp/addons/base/i18n/am.po 2013-06-03 11:35:34 +0000
1936@@ -1,21 +1,21 @@
1937 # Amharic translation for openobject-server
1938-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
1939+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
1940 # This file is distributed under the same license as the openobject-server package.
1941-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
1942+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
1943 #
1944 msgid ""
1945 msgstr ""
1946 "Project-Id-Version: openobject-server\n"
1947 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1948-"POT-Creation-Date: 2013-03-07 08:36+0000\n"
1949-"PO-Revision-Date: 2012-12-28 14:30+0000\n"
1950+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
1951+"PO-Revision-Date: 2012-12-21 16:53+0000\n"
1952 "Last-Translator: Michael Telahun Makonnen <Unknown>\n"
1953 "Language-Team: Amharic <am@li.org>\n"
1954 "MIME-Version: 1.0\n"
1955 "Content-Type: text/plain; charset=UTF-8\n"
1956 "Content-Transfer-Encoding: 8bit\n"
1957-"X-Launchpad-Export-Date: 2013-03-08 05:16+0000\n"
1958-"X-Generator: Launchpad (build 16523)\n"
1959+"X-Launchpad-Export-Date: 2013-05-30 05:35+0000\n"
1960+"X-Generator: Launchpad (build 16652)\n"
1961
1962 #. module: base
1963 #: model:ir.module.module,description:base.module_account_check_writing
1964@@ -31,11 +31,6 @@
1965 " "
1966
1967 #. module: base
1968-#: view:res.partner.bank:0
1969-msgid "e.g. GEBABEBB"
1970-msgstr ""
1971-
1972-#. module: base
1973 #: model:res.country,name:base.sh
1974 msgid "Saint Helena"
1975 msgstr "ቅድስት ህሊና"
1976@@ -716,11 +711,6 @@
1977 msgstr "ሽያጮችና ግዢዎች"
1978
1979 #. module: base
1980-#: view:res.partner:0
1981-msgid "Put an internal note..."
1982-msgstr ""
1983-
1984-#. module: base
1985 #: view:ir.translation:0
1986 msgid "Untranslated"
1987 msgstr "ያልተተረጎመ"
1988@@ -1049,15 +1039,6 @@
1989 msgstr ""
1990
1991 #. module: base
1992-#: view:res.bank:0
1993-#: view:res.company:0
1994-#: view:res.partner:0
1995-#: view:res.partner.bank:0
1996-#: view:res.users:0
1997-msgid "ZIP"
1998-msgstr ""
1999-
2000-#. module: base
2001 #: selection:base.language.install,lang:0
2002 msgid "Spanish (UY) / Español (UY)"
2003 msgstr ""
2004@@ -2791,6 +2772,11 @@
2005 msgstr ""
2006
2007 #. module: base
2008+#: view:ir.filters:0
2009+msgid "My Filters"
2010+msgstr ""
2011+
2012+#. module: base
2013 #: field:ir.actions.server,email:0
2014 msgid "Email Address"
2015 msgstr ""
2016@@ -3148,11 +3134,6 @@
2017 msgstr ""
2018
2019 #. module: base
2020-#: model:ir.module.module,shortdesc:base.module_hr_expense
2021-msgid "Expense Management"
2022-msgstr ""
2023-
2024-#. module: base
2025 #: field:ir.actions.server,action_id:0
2026 #: selection:ir.actions.server,state:0
2027 #: view:ir.values:0
2028@@ -3179,11 +3160,6 @@
2029 msgstr ""
2030
2031 #. module: base
2032-#: view:res.company:0
2033-msgid "e.g. Global Business Solutions"
2034-msgstr ""
2035-
2036-#. module: base
2037 #: field:res.company,rml_header1:0
2038 msgid "Company Tagline"
2039 msgstr ""
2040@@ -3587,6 +3563,11 @@
2041 msgstr ""
2042
2043 #. module: base
2044+#: view:ir.filters:0
2045+msgid "Personal"
2046+msgstr ""
2047+
2048+#. module: base
2049 #: field:base.language.export,modules:0
2050 msgid "Modules To Export"
2051 msgstr ""
2052@@ -6053,11 +6034,6 @@
2053 msgstr ""
2054
2055 #. module: base
2056-#: view:base.language.import:0
2057-msgid "e.g. English"
2058-msgstr ""
2059-
2060-#. module: base
2061 #: help:ir.cron,numbercall:0
2062 msgid ""
2063 "How many times the method is called,\n"
2064@@ -6141,13 +6117,6 @@
2065 msgstr ""
2066
2067 #. module: base
2068-#: view:res.company:0
2069-#: view:res.partner:0
2070-#: view:res.users:0
2071-msgid "e.g. www.openerp.com"
2072-msgstr ""
2073-
2074-#. module: base
2075 #: selection:ir.cron,interval_type:0
2076 msgid "Hours"
2077 msgstr ""
2078@@ -6573,11 +6542,6 @@
2079 msgstr ""
2080
2081 #. module: base
2082-#: model:ir.ui.menu,name:base.menu_sales_followup
2083-msgid "Payment Follow-up"
2084-msgstr ""
2085-
2086-#. module: base
2087 #: model:res.country,name:base.cw
2088 msgid "Curaçao"
2089 msgstr ""
2090@@ -7367,11 +7331,6 @@
2091 msgstr ""
2092
2093 #. module: base
2094-#: view:ir.filters:0
2095-msgid "Filters created by myself"
2096-msgstr ""
2097-
2098-#. module: base
2099 #: model:ir.module.module,shortdesc:base.module_l10n_hn
2100 msgid "Honduras - Accounting"
2101 msgstr ""
2102@@ -7588,12 +7547,6 @@
2103
2104 #. module: base
2105 #: view:res.partner:0
2106-#: view:res.users:0
2107-msgid "Tags..."
2108-msgstr ""
2109-
2110-#. module: base
2111-#: view:res.partner:0
2112 msgid "at"
2113 msgstr ""
2114
2115@@ -7618,11 +7571,6 @@
2116 msgstr ""
2117
2118 #. module: base
2119-#: view:ir.filters:0
2120-msgid "My filters"
2121-msgstr ""
2122-
2123-#. module: base
2124 #: field:res.lang,iso_code:0
2125 msgid "ISO code"
2126 msgstr ""
2127@@ -8330,12 +8278,6 @@
2128 msgstr ""
2129
2130 #. module: base
2131-#: code:addons/orm.py:5334
2132-#, python-format
2133-msgid "The value for the field '%s' already exists."
2134-msgstr ""
2135-
2136-#. module: base
2137 #: field:workflow.workitem,inst_id:0
2138 msgid "Instance"
2139 msgstr ""
2140@@ -9357,10 +9299,8 @@
2141 msgstr ""
2142
2143 #. module: base
2144-#. openerp-web
2145-#: code:addons/base/static/src/js/apps.js:103
2146-#, python-format
2147-msgid "OpenERP Apps Unreachable"
2148+#: model:ir.module.module,shortdesc:base.module_hr_expense
2149+msgid "Expense Management"
2150 msgstr ""
2151
2152 #. module: base
2153@@ -9858,14 +9798,6 @@
2154 msgstr ""
2155
2156 #. module: base
2157-#: code:addons/base/module/module.py:670
2158-#, python-format
2159-msgid ""
2160-"The `%s` module appears to be unavailable at the moment, please try again "
2161-"later."
2162-msgstr ""
2163-
2164-#. module: base
2165 #: view:ir.attachment:0
2166 #: view:ir.cron:0
2167 #: view:ir.filters:0
2168@@ -10240,14 +10172,6 @@
2169 msgstr ""
2170
2171 #. module: base
2172-#: view:res.bank:0
2173-#: view:res.company:0
2174-#: view:res.partner:0
2175-#: view:res.users:0
2176-msgid "Street..."
2177-msgstr ""
2178-
2179-#. module: base
2180 #: constraint:res.users:0
2181 msgid "The chosen company is not in the allowed companies for this user"
2182 msgstr ""
2183@@ -11533,12 +11457,6 @@
2184 msgstr ""
2185
2186 #. module: base
2187-#: view:res.partner:0
2188-#: view:res.users:0
2189-msgid "e.g. +32.81.81.37.00"
2190-msgstr ""
2191-
2192-#. module: base
2193 #: selection:base.language.install,lang:0
2194 msgid "Spanish (NI) / Español (NI)"
2195 msgstr ""
2196@@ -11589,12 +11507,6 @@
2197 msgstr ""
2198
2199 #. module: base
2200-#: model:ir.actions.client,name:base.modules_updates_act_cl
2201-#: model:ir.ui.menu,name:base.menu_module_updates
2202-msgid "Updates"
2203-msgstr ""
2204-
2205-#. module: base
2206 #: field:ir.actions.act_window.view,sequence:0
2207 #: field:ir.actions.server,sequence:0
2208 #: field:ir.actions.todo,sequence:0
2209@@ -12467,13 +12379,6 @@
2210 msgstr ""
2211
2212 #. module: base
2213-#. openerp-web
2214-#: code:addons/base/static/src/js/apps.js:103
2215-#, python-format
2216-msgid "Showing locally available modules"
2217-msgstr ""
2218-
2219-#. module: base
2220 #: selection:base.language.install,lang:0
2221 msgid "Malayalam / മലയാളം"
2222 msgstr ""
2223@@ -14263,11 +14168,6 @@
2224 msgstr ""
2225
2226 #. module: base
2227-#: view:res.country:0
2228-msgid "Address format..."
2229-msgstr ""
2230-
2231-#. module: base
2232 #: model:ir.module.module,description:base.module_l10n_et
2233 msgid ""
2234 "\n"
2235@@ -14710,11 +14610,6 @@
2236 msgstr ""
2237
2238 #. module: base
2239-#: view:res.partner:0
2240-msgid "e.g. Sales Director"
2241-msgstr ""
2242-
2243-#. module: base
2244 #: selection:base.language.install,lang:0
2245 msgid "Czech / Čeština"
2246 msgstr ""
2247@@ -14888,11 +14783,6 @@
2248 msgstr ""
2249
2250 #. module: base
2251-#: view:base.language.import:0
2252-msgid "e.g. en_US"
2253-msgstr ""
2254-
2255-#. module: base
2256 #: model:ir.module.module,description:base.module_l10n_hn
2257 msgid ""
2258 "\n"
2259@@ -15068,9 +14958,9 @@
2260 msgstr ""
2261
2262 #. module: base
2263-#: code:addons/base/module/module.py:669
2264-#, python-format
2265-msgid "Module not found"
2266+#: model:ir.actions.client,name:base.modules_updates_act_cl
2267+#: model:ir.ui.menu,name:base.menu_module_updates
2268+msgid "Updates"
2269 msgstr ""
2270
2271 #. module: base
2272
2273=== modified file 'openerp/addons/base/i18n/ar.po'
2274--- openerp/addons/base/i18n/ar.po 2013-03-08 05:23:54 +0000
2275+++ openerp/addons/base/i18n/ar.po 2013-06-03 11:35:34 +0000
2276@@ -1,21 +1,20 @@
2277-# Arabic translation for openobject-server
2278-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
2279-# This file is distributed under the same license as the openobject-server package.
2280-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
2281+# Translation of OpenERP Server.
2282+# This file contains the translation of the following modules:
2283+# * base
2284 #
2285 msgid ""
2286 msgstr ""
2287-"Project-Id-Version: openobject-server\n"
2288-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2289-"POT-Creation-Date: 2013-03-07 08:36+0000\n"
2290-"PO-Revision-Date: 2013-02-16 08:47+0000\n"
2291+"Project-Id-Version: OpenERP Server 5.0.4\n"
2292+"Report-Msgid-Bugs-To: support@openerp.com\n"
2293+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
2294+"PO-Revision-Date: 2013-02-16 09:04+0000\n"
2295 "Last-Translator: Ahmad Khayyat <Unknown>\n"
2296-"Language-Team: Arabic <ar@li.org>\n"
2297+"Language-Team: \n"
2298 "MIME-Version: 1.0\n"
2299 "Content-Type: text/plain; charset=UTF-8\n"
2300 "Content-Transfer-Encoding: 8bit\n"
2301-"X-Launchpad-Export-Date: 2013-03-08 05:16+0000\n"
2302-"X-Generator: Launchpad (build 16523)\n"
2303+"X-Launchpad-Export-Date: 2013-05-30 05:35+0000\n"
2304+"X-Generator: Launchpad (build 16652)\n"
2305
2306 #. module: base
2307 #: model:ir.module.module,description:base.module_account_check_writing
2308@@ -31,11 +30,6 @@
2309 " "
2310
2311 #. module: base
2312-#: view:res.partner.bank:0
2313-msgid "e.g. GEBABEBB"
2314-msgstr ""
2315-
2316-#. module: base
2317 #: model:res.country,name:base.sh
2318 msgid "Saint Helena"
2319 msgstr "سانت هيلينا"
2320@@ -676,11 +670,6 @@
2321 msgstr "المبيعات و المشتريات"
2322
2323 #. module: base
2324-#: view:res.partner:0
2325-msgid "Put an internal note..."
2326-msgstr ""
2327-
2328-#. module: base
2329 #: view:ir.translation:0
2330 msgid "Untranslated"
2331 msgstr "غير مترجم"
2332@@ -1010,15 +999,6 @@
2333 msgstr "ترقية وحدة برمجية"
2334
2335 #. module: base
2336-#: view:res.bank:0
2337-#: view:res.company:0
2338-#: view:res.partner:0
2339-#: view:res.partner.bank:0
2340-#: view:res.users:0
2341-msgid "ZIP"
2342-msgstr ""
2343-
2344-#. module: base
2345 #: selection:base.language.install,lang:0
2346 msgid "Spanish (UY) / Español (UY)"
2347 msgstr "الأسبانية / Español (UY)"
2348@@ -2777,6 +2757,11 @@
2349 msgstr "تسجيل الهوية"
2350
2351 #. module: base
2352+#: view:ir.filters:0
2353+msgid "My Filters"
2354+msgstr ""
2355+
2356+#. module: base
2357 #: field:ir.actions.server,email:0
2358 msgid "Email Address"
2359 msgstr "عنوان البريد الإلكتروني"
2360@@ -3136,11 +3121,6 @@
2361 msgstr "الاسم التقني للنموذج الذي يحتوي هذا الحقل"
2362
2363 #. module: base
2364-#: model:ir.module.module,shortdesc:base.module_hr_expense
2365-msgid "Expense Management"
2366-msgstr ""
2367-
2368-#. module: base
2369 #: field:ir.actions.server,action_id:0
2370 #: selection:ir.actions.server,state:0
2371 #: view:ir.values:0
2372@@ -3167,11 +3147,6 @@
2373 msgstr ""
2374
2375 #. module: base
2376-#: view:res.company:0
2377-msgid "e.g. Global Business Solutions"
2378-msgstr ""
2379-
2380-#. module: base
2381 #: field:res.company,rml_header1:0
2382 msgid "Company Tagline"
2383 msgstr ""
2384@@ -3575,6 +3550,11 @@
2385 msgstr ""
2386
2387 #. module: base
2388+#: view:ir.filters:0
2389+msgid "Personal"
2390+msgstr ""
2391+
2392+#. module: base
2393 #: field:base.language.export,modules:0
2394 msgid "Modules To Export"
2395 msgstr ""
2396@@ -6053,11 +6033,6 @@
2397 msgstr ""
2398
2399 #. module: base
2400-#: view:base.language.import:0
2401-msgid "e.g. English"
2402-msgstr ""
2403-
2404-#. module: base
2405 #: help:ir.cron,numbercall:0
2406 msgid ""
2407 "How many times the method is called,\n"
2408@@ -6142,13 +6117,6 @@
2409 msgstr ""
2410
2411 #. module: base
2412-#: view:res.company:0
2413-#: view:res.partner:0
2414-#: view:res.users:0
2415-msgid "e.g. www.openerp.com"
2416-msgstr ""
2417-
2418-#. module: base
2419 #: selection:ir.cron,interval_type:0
2420 msgid "Hours"
2421 msgstr "الساعات"
2422@@ -6574,11 +6542,6 @@
2423 msgstr "ir.cron"
2424
2425 #. module: base
2426-#: model:ir.ui.menu,name:base.menu_sales_followup
2427-msgid "Payment Follow-up"
2428-msgstr ""
2429-
2430-#. module: base
2431 #: model:res.country,name:base.cw
2432 msgid "Curaçao"
2433 msgstr ""
2434@@ -7370,11 +7333,6 @@
2435 msgstr ""
2436
2437 #. module: base
2438-#: view:ir.filters:0
2439-msgid "Filters created by myself"
2440-msgstr ""
2441-
2442-#. module: base
2443 #: model:ir.module.module,shortdesc:base.module_l10n_hn
2444 msgid "Honduras - Accounting"
2445 msgstr ""
2446@@ -7593,12 +7551,6 @@
2447
2448 #. module: base
2449 #: view:res.partner:0
2450-#: view:res.users:0
2451-msgid "Tags..."
2452-msgstr ""
2453-
2454-#. module: base
2455-#: view:res.partner:0
2456 msgid "at"
2457 msgstr ""
2458
2459@@ -7623,11 +7575,6 @@
2460 msgstr "صيغة الملف"
2461
2462 #. module: base
2463-#: view:ir.filters:0
2464-msgid "My filters"
2465-msgstr ""
2466-
2467-#. module: base
2468 #: field:res.lang,iso_code:0
2469 msgid "ISO code"
2470 msgstr ""
2471@@ -8342,12 +8289,6 @@
2472 msgstr ""
2473
2474 #. module: base
2475-#: code:addons/orm.py:5334
2476-#, python-format
2477-msgid "The value for the field '%s' already exists."
2478-msgstr ""
2479-
2480-#. module: base
2481 #: field:workflow.workitem,inst_id:0
2482 msgid "Instance"
2483 msgstr ""
2484@@ -9369,10 +9310,8 @@
2485 msgstr ""
2486
2487 #. module: base
2488-#. openerp-web
2489-#: code:addons/base/static/src/js/apps.js:103
2490-#, python-format
2491-msgid "OpenERP Apps Unreachable"
2492+#: model:ir.module.module,shortdesc:base.module_hr_expense
2493+msgid "Expense Management"
2494 msgstr ""
2495
2496 #. module: base
2497@@ -9870,14 +9809,6 @@
2498 msgstr ""
2499
2500 #. module: base
2501-#: code:addons/base/module/module.py:670
2502-#, python-format
2503-msgid ""
2504-"The `%s` module appears to be unavailable at the moment, please try again "
2505-"later."
2506-msgstr ""
2507-
2508-#. module: base
2509 #: view:ir.attachment:0
2510 #: view:ir.cron:0
2511 #: view:ir.filters:0
2512@@ -10254,14 +10185,6 @@
2513 msgstr ""
2514
2515 #. module: base
2516-#: view:res.bank:0
2517-#: view:res.company:0
2518-#: view:res.partner:0
2519-#: view:res.users:0
2520-msgid "Street..."
2521-msgstr ""
2522-
2523-#. module: base
2524 #: constraint:res.users:0
2525 msgid "The chosen company is not in the allowed companies for this user"
2526 msgstr ""
2527@@ -11561,12 +11484,6 @@
2528 msgstr "العميل"
2529
2530 #. module: base
2531-#: view:res.partner:0
2532-#: view:res.users:0
2533-msgid "e.g. +32.81.81.37.00"
2534-msgstr ""
2535-
2536-#. module: base
2537 #: selection:base.language.install,lang:0
2538 msgid "Spanish (NI) / Español (NI)"
2539 msgstr ""
2540@@ -11617,12 +11534,6 @@
2541 msgstr "الشهر: %(month)s"
2542
2543 #. module: base
2544-#: model:ir.actions.client,name:base.modules_updates_act_cl
2545-#: model:ir.ui.menu,name:base.menu_module_updates
2546-msgid "Updates"
2547-msgstr ""
2548-
2549-#. module: base
2550 #: field:ir.actions.act_window.view,sequence:0
2551 #: field:ir.actions.server,sequence:0
2552 #: field:ir.actions.todo,sequence:0
2553@@ -12497,13 +12408,6 @@
2554 msgstr ""
2555
2556 #. module: base
2557-#. openerp-web
2558-#: code:addons/base/static/src/js/apps.js:103
2559-#, python-format
2560-msgid "Showing locally available modules"
2561-msgstr ""
2562-
2563-#. module: base
2564 #: selection:base.language.install,lang:0
2565 msgid "Malayalam / മലയാളം"
2566 msgstr ""
2567@@ -14302,11 +14206,6 @@
2568 msgstr "عرض التحميل التلقائي"
2569
2570 #. module: base
2571-#: view:res.country:0
2572-msgid "Address format..."
2573-msgstr ""
2574-
2575-#. module: base
2576 #: model:ir.module.module,description:base.module_l10n_et
2577 msgid ""
2578 "\n"
2579@@ -14749,11 +14648,6 @@
2580 msgstr "المحددات"
2581
2582 #. module: base
2583-#: view:res.partner:0
2584-msgid "e.g. Sales Director"
2585-msgstr ""
2586-
2587-#. module: base
2588 #: selection:base.language.install,lang:0
2589 msgid "Czech / Čeština"
2590 msgstr "التشيكية / Čeština"
2591@@ -14929,11 +14823,6 @@
2592 msgstr "تحميل تلقائي"
2593
2594 #. module: base
2595-#: view:base.language.import:0
2596-msgid "e.g. en_US"
2597-msgstr ""
2598-
2599-#. module: base
2600 #: model:ir.module.module,description:base.module_l10n_hn
2601 msgid ""
2602 "\n"
2603@@ -15109,9 +14998,9 @@
2604 msgstr "شرط"
2605
2606 #. module: base
2607-#: code:addons/base/module/module.py:669
2608-#, python-format
2609-msgid "Module not found"
2610+#: model:ir.actions.client,name:base.modules_updates_act_cl
2611+#: model:ir.ui.menu,name:base.menu_module_updates
2612+msgid "Updates"
2613 msgstr ""
2614
2615 #. module: base
2616@@ -15532,3 +15421,1343 @@
2617 #: model:ir.module.module,shortdesc:base.module_auth_signup
2618 msgid "Signup"
2619 msgstr ""
2620+
2621+#, python-format
2622+#~ msgid "new"
2623+#~ msgstr "جديد"
2624+
2625+#~ msgid "SMS - Gateway: clickatell"
2626+#~ msgstr "بوابة خدمة الرسائل القصيرة: كليكاتل (clickatell)"
2627+
2628+#~ msgid "Metadata"
2629+#~ msgstr "بيانات وصفية"
2630+
2631+#~ msgid "Workflow On"
2632+#~ msgstr "سير العمل نشط"
2633+
2634+#~ msgid "Display Menu Tips"
2635+#~ msgstr "عرض إرشادات القائمة"
2636+
2637+#, python-format
2638+#~ msgid ""
2639+#~ "You can not write in this document (%s) ! Be sure your user belongs to one "
2640+#~ "of these groups: %s."
2641+#~ msgstr ""
2642+#~ "لا يمكنك تعديل هذا المستند (%s)! تأكد من أنك تنتمي إلى إحدى المجموعات "
2643+#~ "التالية: %s."
2644+
2645+#~ msgid "Wood Suppliers"
2646+#~ msgstr "مورّدو الخشب"
2647+
2648+#, python-format
2649+#~ msgid ""
2650+#~ "Some installed modules depend on the module you plan to Uninstall :\n"
2651+#~ " %s"
2652+#~ msgstr ""
2653+#~ "ثمّة وحدات برمجية تعتمد على الوحدة التي تريد إزالتها:\n"
2654+#~ " %s"
2655+
2656+#, python-format
2657+#~ msgid "\"smtp_server\" needs to be set to send mails to users"
2658+#~ msgstr "لا بدّ من تعيين خادم إرسال البريد الإلكتروني \"smtp_server\""
2659+
2660+#~ msgid "Export done"
2661+#~ msgstr "تمّت عملية التصدير"
2662+
2663+#~ msgid "Miscellaneous Suppliers"
2664+#~ msgstr "مورّدون متنوعون"
2665+
2666+#~ msgid "Contact Name"
2667+#~ msgstr "اسم جهة الاتصال"
2668+
2669+#, python-format
2670+#~ msgid ""
2671+#~ "Save this document to a %s file and edit it with a specific software or a "
2672+#~ "text editor. The file encoding is UTF-8."
2673+#~ msgstr ""
2674+#~ "احفظ هذا المستند كملف %s وحرره بإستخدام برنامج مناسب أو محرر نصِّي. ترميز "
2675+#~ "الملف UTF-8."
2676+
2677+#~ msgid "Widget"
2678+#~ msgstr "عنصر واجهة مستخدم"
2679+
2680+#~ msgid "E-Mail"
2681+#~ msgstr "البريد الإلكتروني"
2682+
2683+#~ msgid "Select Action Type"
2684+#~ msgstr "اختر نوع الإجراء"
2685+
2686+#~ msgid "Schedule Upgrade"
2687+#~ msgstr "اختر للترقية"
2688+
2689+#~ msgid "description"
2690+#~ msgstr "الوصف"
2691+
2692+#~ msgid "Certified"
2693+#~ msgstr "مصدّق"
2694+
2695+#~ msgid "New User"
2696+#~ msgstr "مستخدم جديد"
2697+
2698+#~ msgid ""
2699+#~ "OpenERP translations (core, modules, clients) are managed through "
2700+#~ "Launchpad.net, our open source project management facility. We use their "
2701+#~ "online interface to synchronize all translations efforts."
2702+#~ msgstr ""
2703+#~ "تتمّ إدارة ترجمة OpenERP عن طريق الموقع الإلكتروني Launchpad.net، والذي يمثل "
2704+#~ "وسيلتنا لإدارة البرمجة مفتوحة المصدر. كذلك نستخدم الواجهة الإلكتروني للموقع "
2705+#~ "لجمع وعرض جميع مجهودات الترجمة."
2706+
2707+#~ msgid "Partner Form"
2708+#~ msgstr "نموذج الشريك"
2709+
2710+#~ msgid "Event Type"
2711+#~ msgstr "نوع الحدث"
2712+
2713+#~ msgid ","
2714+#~ msgstr "،"
2715+
2716+#~ msgid "Basic Partner"
2717+#~ msgstr "شريك أساسي"
2718+
2719+#~ msgid ""
2720+#~ "Groups are used to define access rights on objects and the visibility of "
2721+#~ "screens and menus"
2722+#~ msgstr "تستخدم المجموعات لتعريف صلاحيات الدخول والتعديل للشاشات والقوائم"
2723+
2724+#~ msgid ""
2725+#~ "Sets the language for the user's user interface, when UI translations are "
2726+#~ "available"
2727+#~ msgstr "تعيين لغة واجهة الاستخدام، في حالة توفر الترجمة"
2728+
2729+#~ msgid "Payment term"
2730+#~ msgstr "أجل الدفع"
2731+
2732+#~ msgid "Human Resources Dashboard"
2733+#~ msgstr "لوحة معلومات الموارد البشرية"
2734+
2735+#~ msgid ""
2736+#~ "To improve or expand the official translations, you should use directly "
2737+#~ "Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
2738+#~ "Launchpad also allows uploading full .po files at once"
2739+#~ msgstr ""
2740+#~ "لتحسين الترجمة الرسمية أو إضافة نصوص جديدة إليها، يفضل استخدام الواجهة "
2741+#~ "الإلكترونية (Rosetta) لموقع Launchpad. إذا كنت تريد القيام بترجمة نصوص "
2742+#~ "عديدة، يمكنك رفع ملفات .po إلى Launchpad كذلك."
2743+
2744+#~ msgid "To export a new language, do not select a language."
2745+#~ msgstr "لتصدير لغة جديدة، لا تختر أي لغة."
2746+
2747+#~ msgid "Request Date"
2748+#~ msgstr "تاريخ الطلب"
2749+
2750+#~ msgid "Dashboard"
2751+#~ msgstr "لوحة المعلومات"
2752+
2753+#, python-format
2754+#~ msgid "Error during communication with the publisher warranty server."
2755+#~ msgstr "خطأ أثناء الاتصال بخادم ضمان الناشر."
2756+
2757+#~ msgid ""
2758+#~ "This wizard helps you register a publisher warranty contract in your OpenERP "
2759+#~ "system. After the contract has been registered, you will be able to send "
2760+#~ "issues directly to OpenERP."
2761+#~ msgstr ""
2762+#~ "هذا المعالج يساعدك على تسجيل عقد ضمان الناشر في نسختك من نظام OpenERP. بعد "
2763+#~ "إتمام تسجيل العقد سيمكنك إرسال مساءلاتك إلى OpenERP مباشرة."
2764+
2765+#~ msgid "-"
2766+#~ msgstr "-"
2767+
2768+#~ msgid "Payment Term (short name)"
2769+#~ msgstr "أجل الدفع (اسم قصير)"
2770+
2771+#~ msgid "Main report file path"
2772+#~ msgstr "مسار ملف التقرير الرئيسي"
2773+
2774+#~ msgid ""
2775+#~ "Date : %(date)s\n"
2776+#~ "\n"
2777+#~ "Dear %(partner_name)s,\n"
2778+#~ "\n"
2779+#~ "Please find in attachment a reminder of all your unpaid invoices, for a "
2780+#~ "total amount due of:\n"
2781+#~ "\n"
2782+#~ "%(followup_amount).2f %(company_currency)s\n"
2783+#~ "\n"
2784+#~ "Thanks,\n"
2785+#~ "--\n"
2786+#~ "%(user_signature)s\n"
2787+#~ "%(company_name)s"
2788+#~ msgstr ""
2789+#~ "التاريخ: %(date)s\n"
2790+#~ "\n"
2791+#~ "عزيزي %(partner_name)s،\n"
2792+#~ "\n"
2793+#~ "مرفق بهذه الرسالة تذكير بكافة فواتيرك غير المسددة، والتي يبلغ مجموعها:\n"
2794+#~ "\n"
2795+#~ "\n"
2796+#~ "%(followup_amount).2f %(company_currency)s\n"
2797+#~ "\n"
2798+#~ "وشكراً.\n"
2799+#~ "--\n"
2800+#~ "%(user_signature)s\n"
2801+#~ "%(company_name)s"
2802+
2803+#~ msgid "Attached ID"
2804+#~ msgstr "معرف ملحقات"
2805+
2806+#~ msgid "Homepage Widgets"
2807+#~ msgstr "عناصر واجهة المستخدم للصفحة الرئيسية"
2808+
2809+#~ msgid ""
2810+#~ "Condition that is to be tested before action is executed, e.g. "
2811+#~ "object.list_price > object.cost_price"
2812+#~ msgstr ""
2813+#~ "الشرط الذي يجب أن يتحقق لكي يتمّ تنفيذ الإجراء. مثال: object.list_price > "
2814+#~ "object.cost_price"
2815+
2816+#~ msgid "Keep 0 if the action must appear on all resources."
2817+#~ msgstr "أبق 0 لكي يظهر الإجراء دائماً"
2818+
2819+#~ msgid ""
2820+#~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
2821+#~ "object.partner_id.name ]]`"
2822+#~ msgstr ""
2823+#~ "حدّد الرسالة. يمكنك استخدام حقول الكائن. مثال: 'عزيزي [[ "
2824+#~ "object.partner_id.name ]]'"
2825+
2826+#~ msgid "Domain Setup"
2827+#~ msgstr "إعداد النطاق"
2828+
2829+#~ msgid "References"
2830+#~ msgstr "المراجع"
2831+
2832+#~ msgid ""
2833+#~ "Keep empty if you don't want the user to be able to connect on the system."
2834+#~ msgstr "أبقِ خالياً لمنع المستخدم من استخدام النظام."
2835+
2836+#~ msgid "Advanced"
2837+#~ msgstr "متقدم"
2838+
2839+#~ msgid ""
2840+#~ "When using CSV format, please also check that the first line of your file is "
2841+#~ "one of the following:"
2842+#~ msgstr ""
2843+#~ "عند استخدام صيغة CSV، تأكد من أن السطر الأول من الملف هو أحد الخيارات "
2844+#~ "التالية:"
2845+
2846+#~ msgid "Logs"
2847+#~ msgstr "السجلات"
2848+
2849+#~ msgid ""
2850+#~ "This wizard will scan all module repositories on the server side to detect "
2851+#~ "newly added modules as well as any change to existing modules."
2852+#~ msgstr ""
2853+#~ "يقوم هذا المعالج بالبحث عن أي وحدات برمجية جديدة أو تحديثات وحدات موجودة في "
2854+#~ "الخادم."
2855+
2856+#~ msgid "Uninstall (beta)"
2857+#~ msgstr "إزالة (تجريبي)"
2858+
2859+#~ msgid ""
2860+#~ "Create additional users and assign them groups that will allow them to have "
2861+#~ "access to selected functionalities within the system. Click on 'Done' if you "
2862+#~ "do not wish to add more users at this stage, you can always do this later."
2863+#~ msgstr ""
2864+#~ "أنشئ متخدمين إضافيين وعين لهم مجموعات تعرف صلاحياتهم في النظام. عند انتهائك، "
2865+#~ "أو في حالة عدم رغبتك في إضافة مستخدمين، انقر 'تمّ'. يمكنك إضافة مستخدين "
2866+#~ "لاحقاً وقتما تشاء."
2867+
2868+#~ msgid "This field is not used, it only helps you to select the right action."
2869+#~ msgstr ""
2870+#~ "هذا الحقل غير مستخدم، ولكنه موجود ليساعدك على اختيار الإجراء المناسب."
2871+
2872+#~ msgid "Please be patient, as this operation may take a few seconds..."
2873+#~ msgstr "فضلاً انتظر. هذه العملية يمكن أن تستغرق عدة ثوانٍ..."
2874+
2875+#~ msgid "Values"
2876+#~ msgstr "القيم"
2877+
2878+#~ msgid "Customization"
2879+#~ msgstr "تخصيص"
2880+
2881+#~ msgid "Messages"
2882+#~ msgstr "الرسائل"
2883+
2884+#~ msgid "Ending Date"
2885+#~ msgstr "تاريخ الانتهاء"
2886+
2887+#~ msgid "Valid"
2888+#~ msgstr "صحيح"
2889+
2890+#~ msgid "Property"
2891+#~ msgstr "الخاصية"
2892+
2893+#~ msgid "Canceled"
2894+#~ msgstr "ملغي"
2895+
2896+#~ msgid "Partner Name"
2897+#~ msgstr "اسم الشريك"
2898+
2899+#~ msgid "Draft"
2900+#~ msgstr "مسودّة"
2901+
2902+#~ msgid "HR sector"
2903+#~ msgstr "قطاع الموارد البشرية"
2904+
2905+#~ msgid "Report Footer 1"
2906+#~ msgstr "تذييل تقرير 1"
2907+
2908+#~ msgid "Report Footer 2"
2909+#~ msgstr "تذييل تقرير 2"
2910+
2911+#~ msgid ""
2912+#~ "Please double-check that the file encoding is set to UTF-8 (sometimes called "
2913+#~ "Unicode) when the translator exports it."
2914+#~ msgstr ""
2915+#~ "فضلاً تأكد أن الملف يستخدم ترميز UTF-8 (Unicode) عند تصديره من المترجم."
2916+
2917+#~ msgid "Start Configuration"
2918+#~ msgstr "بدء الإعداد"
2919+
2920+#~ msgid "Channel"
2921+#~ msgstr "القناة"
2922+
2923+#, python-format
2924+#~ msgid "Please check that all your lines have %d columns."
2925+#~ msgstr "فضلاً تأكد من أن كل سطر يحتوي %d عموداً."
2926+
2927+#~ msgid "Payment Term"
2928+#~ msgstr "أجل السداد"
2929+
2930+#~ msgid ""
2931+#~ "This wizard helps you add a new language to your OpenERP system. After "
2932+#~ "loading a new language it becomes available as default interface language "
2933+#~ "for users and partners."
2934+#~ msgstr ""
2935+#~ "يساعدك هذا المعالج على إضافة لغة جديدة لنسختك من نظام OpenERP. بعد تحميل "
2936+#~ "اللغة الجديدة، يمكن للمستخدمين والشركاء استخدامها كلغة افتراضية لواجهة "
2937+#~ "الاستخدام."
2938+
2939+#~ msgid "Field Information"
2940+#~ msgstr "معلومات الحقل"
2941+
2942+#~ msgid "Categories"
2943+#~ msgstr "الفئات"
2944+
2945+#~ msgid ""
2946+#~ "You cannot have multiple records with the same id for the same module !"
2947+#~ msgstr "لا يمكن استخدام المعرّف نفسه لأكثر من سجل في وحدة برمجية واحدة!"
2948+
2949+#~ msgid "Send SMS"
2950+#~ msgstr "إرسال رسالة قصيرة (SMS)"
2951+
2952+#~ msgid ""
2953+#~ "If you need another language than the official ones available, you can "
2954+#~ "import a language pack from here. Other OpenERP languages than the official "
2955+#~ "ones can be found on launchpad."
2956+#~ msgstr ""
2957+#~ "إذا كنت تريد استخدام لغة ليست ضمن اللغات المدعومة رسمياً، يمكنك استيراد حزمة "
2958+#~ "لغة من هنا. يوجد المزيد من اللغات غير المدعومة رسمياً على موقع Launchpad."
2959+
2960+#~ msgid "Last Connection"
2961+#~ msgstr "الاتصال الأخير"
2962+
2963+#~ msgid "Quality Certificate"
2964+#~ msgstr "شهادة الجودة"
2965+
2966+#~ msgid "Check this box if the partner is a customer."
2967+#~ msgstr "اختر إذا كان الشريك عميلاً."
2968+
2969+#, python-format
2970+#~ msgid ""
2971+#~ "Save this document to a .CSV file and open it with your favourite "
2972+#~ "spreadsheet software. The file encoding is UTF-8. You have to translate the "
2973+#~ "latest column before reimporting it."
2974+#~ msgstr ""
2975+#~ "احفظ هذا المستند بصيغة CSV وافتحه باستخدام برنامجك المفضل للجداول "
2976+#~ "الإلكترونية. سيتمّ حفظ الملف باستخدام ترميز UTF-8. يجب عليك ترجمة العمود "
2977+#~ "الأخير قبل أن تستورد الملف مرة أخرى."
2978+
2979+#~ msgid "Validate"
2980+#~ msgstr "تحقق"
2981+
2982+#~ msgid ""
2983+#~ "If the selected language is loaded in the system, all documents related to "
2984+#~ "this partner will be printed in this language. If not, it will be english."
2985+#~ msgstr ""
2986+#~ "إذا كانت اللغة المختارة محملة في النظام، سيتم طباعة جميع المستندات المتعلقة "
2987+#~ "بهذا الشريك باستخدام هذه اللغة، وإلّا فسوف يتمّ استخدام اللغة الإنجليزية."
2988+
2989+#~ msgid "Restart"
2990+#~ msgstr "إعادة التشغيل"
2991+
2992+#, python-format
2993+#~ msgid "\"email_from\" needs to be set to send welcome mails to users"
2994+#~ msgstr ""
2995+#~ "لا بدّ من تحديد قيمة لـ \"email_from\" حتى يمكنك إرسال خطابات الترحيب إلى "
2996+#~ "المستخدمين"
2997+
2998+#~ msgid ""
2999+#~ "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
3000+#~ "object.partner_id.name ]]`"
3001+#~ msgstr ""
3002+#~ "حدد الموضوع. يمكنك استخدام حقول الكائن، مثل: 'مرحباً [[ "
3003+#~ "object.partner_id.name ]]'"
3004+
3005+#~ msgid "Default Filters"
3006+#~ msgstr "مرشحات الفرز الافتراضية"
3007+
3008+#~ msgid "Current Activity"
3009+#~ msgstr "النشاط الحالي"
3010+
3011+#~ msgid "Always"
3012+#~ msgstr "دائماً"
3013+
3014+#~ msgid "Customized Architecture"
3015+#~ msgstr "هيكل مخصص"
3016+
3017+#~ msgid "Create Users"
3018+#~ msgstr "إنشاء مستخدمين"
3019+
3020+#, python-format
3021+#~ msgid ""
3022+#~ "Operation prohibited by access rules, or performed on an already deleted "
3023+#~ "document (Operation: read, Document type: %s)."
3024+#~ msgstr ""
3025+#~ "العملية ممنوعة حسب قواعد الصلاحيات، أو أنه تمّ تنفيذ العملية على مستندات "
3026+#~ "محذوفة (العملية: قراءة. نوع المستند: %s)."
3027+
3028+#, python-format
3029+#~ msgid "You can not remove the model '%s' !"
3030+#~ msgstr "لا يمكنك حذف النموذج '%s'!"
3031+
3032+#~ msgid "Retailers"
3033+#~ msgstr "تجار التجزئة"
3034+
3035+#~ msgid "Custom Reports"
3036+#~ msgstr "التقارير المخصصة"
3037+
3038+#~ msgid "Event"
3039+#~ msgstr "الحدث"
3040+
3041+#, python-format
3042+#~ msgid "That contract is already registered in the system."
3043+#~ msgstr "ذلك العقد قد تمّ تسجيله في النظام سابقاً."
3044+
3045+#, python-format
3046+#~ msgid ""
3047+#~ "You can not create this document (%s) ! Be sure your user belongs to one of "
3048+#~ "these groups: %s."
3049+#~ msgstr ""
3050+#~ "لا يمكنك إنشاء هذا المستند (%s)! تأكد أنك تنتمي لإحدى هذه المجموعات: %s."
3051+
3052+#~ msgid "Translation Terms"
3053+#~ msgstr "مصطلحات الترجمة"
3054+
3055+#~ msgid "System update completed"
3056+#~ msgstr "تمّ تحديث النظام"
3057+
3058+#~ msgid "Creator"
3059+#~ msgstr "المُنشِئ"
3060+
3061+#~ msgid "Apply For Delete"
3062+#~ msgstr "اطلب صلاحية الحذف"
3063+
3064+#~ msgid "General Description"
3065+#~ msgstr "الوصف العام"
3066+
3067+#~ msgid "Plugins"
3068+#~ msgstr "الإضافات البرمجية"
3069+
3070+#~ msgid "Configure Your Interface"
3071+#~ msgstr "إعدادات الواجهة"
3072+
3073+#~ msgid "Parent Partner"
3074+#~ msgstr "الشريك الأم"
3075+
3076+#~ msgid ""
3077+#~ "The internal user that is in charge of communicating with this partner if "
3078+#~ "any."
3079+#~ msgstr "المستخد الداخلي المكلَّف بالتواصل مع هذا الشريك، إن وُجِد."
3080+
3081+#~ msgid ""
3082+#~ "The user's timezone, used to perform timezone conversions between the server "
3083+#~ "and the client."
3084+#~ msgstr ""
3085+#~ "المنطقة الزمنية للمستخدم. تستخدم لتحويل الوقت ما بين منطقة المستخدم ومنطقة "
3086+#~ "الخادم."
3087+
3088+#~ msgid "Demo data"
3089+#~ msgstr "بيانات تجريبية"
3090+
3091+#~ msgid "Starter Partner"
3092+#~ msgstr "شريك مبتدِئ"
3093+
3094+#~ msgid "The state code in three chars.\n"
3095+#~ msgstr "رمز الولاية (ثلاثة حروف).\n"
3096+
3097+#~ msgid "Please enter the serial key provided in your contract document:"
3098+#~ msgstr "فضلاً أدخل المفتاح التسلسلي الموجود في مستند العقد:"
3099+
3100+#, python-format
3101+#~ msgid "module base cannot be loaded! (hint: verify addons-path)"
3102+#~ msgstr ""
3103+#~ "لا يمكن تحميل الوحدة البرمجية الأساسية (base)! تأكد من ضبط مسار الإضافات "
3104+#~ "(addons-path)"
3105+
3106+#~ msgid "Author Website"
3107+#~ msgstr "الموقع الإلكتروني للمؤلف"
3108+
3109+#~ msgid "Load Official Translation"
3110+#~ msgstr "تحميل ترجمة رسمية"
3111+
3112+#~ msgid "Events"
3113+#~ msgstr "الأحداث"
3114+
3115+#~ msgid "Currency Converter"
3116+#~ msgstr "محوّل العملات"
3117+
3118+#~ msgid "Partner Contacts"
3119+#~ msgstr "جهات اتصال الشريك"
3120+
3121+#~ msgid "Partner Addresses"
3122+#~ msgstr "عناوين الشريك"
3123+
3124+#~ msgid "Request History"
3125+#~ msgstr "الطلبات السابقة"
3126+
3127+#~ msgid "Objects"
3128+#~ msgstr "الكائنات"
3129+
3130+#~ msgid "Unread"
3131+#~ msgstr "غير المقروءة"
3132+
3133+#~ msgid "Advice"
3134+#~ msgstr "نصيحة"
3135+
3136+#~ msgid "Check this box if the partner is an Employee."
3137+#~ msgstr "اختر إذا كان الشريك موظفاً"
3138+
3139+#~ msgid "Create User"
3140+#~ msgstr "إنشاء مستخدم"
3141+
3142+#~ msgid "Maintenance Contract"
3143+#~ msgstr "عقد صيانة"
3144+
3145+#~ msgid "Audit"
3146+#~ msgstr "المراقبة"
3147+
3148+#~ msgid "Cancelled"
3149+#~ msgstr "ملغي"
3150+
3151+#~ msgid "Interface"
3152+#~ msgstr "الواجهة"
3153+
3154+#, python-format
3155+#~ msgid "Not Implemented"
3156+#~ msgstr "غير جاهز للاستخدام"
3157+
3158+#~ msgid "Salesman"
3159+#~ msgstr "مندوب المبيعات"
3160+
3161+#~ msgid "_Ok"
3162+#~ msgstr "_موافق"
3163+
3164+#~ msgid "Widgets"
3165+#~ msgstr "عناصر واجهة مستخدم"
3166+
3167+#~ msgid "Add"
3168+#~ msgstr "إضافة"
3169+
3170+#~ msgid "Widget Wizard"
3171+#~ msgstr "معالج عناصر واجهات المستخدم"
3172+
3173+#~ msgid "Textile Suppliers"
3174+#~ msgstr "مورّدو النسيج"
3175+
3176+#~ msgid "Publisher Warranty Contracts"
3177+#~ msgstr "عقود ضمان الناشر"
3178+
3179+#~ msgid "My Logs"
3180+#~ msgstr "سجلاتي"
3181+
3182+#~ msgid "Latest version"
3183+#~ msgstr "الإصدارة الأخيرة"
3184+
3185+#~ msgid "Addresses"
3186+#~ msgstr "العناوين"
3187+
3188+#~ msgid "Skipped"
3189+#~ msgstr "تمّ تجاوزه"
3190+
3191+#~ msgid "SMS Message"
3192+#~ msgstr "رسالة قصيرة (SMS)"
3193+
3194+#~ msgid "Select Report"
3195+#~ msgstr "اختر التقرير"
3196+
3197+#~ msgid "Sender's email"
3198+#~ msgstr "البريد الإلكتروني للمرسِل"
3199+
3200+#~ msgid "Connect Events to Actions"
3201+#~ msgstr "اربط الأحداث بالإجراءات"
3202+
3203+#, python-format
3204+#~ msgid "Module %s: Invalid Quality Certificate"
3205+#~ msgstr "الوحدة البرمجية %s: شهادة الجودة غير صحيحية"
3206+
3207+#~ msgid "SMS Send"
3208+#~ msgstr "إرسال رسالة قصيرة (SMS)"
3209+
3210+#~ msgid "Values for Event Type"
3211+#~ msgstr "القيم الممكنة لنوع الحدث"
3212+
3213+#~ msgid "Content"
3214+#~ msgstr "المحتوى"
3215+
3216+#~ msgid "Next planned execution date for this scheduler"
3217+#~ msgstr "تاريخ التنفيذ القادم لهذا المُجدوِل"
3218+
3219+#~ msgid "Choose between the simplified interface and the extended one"
3220+#~ msgstr "اختر من بين الواجهة المبسطة والواجهة المفصلة"
3221+
3222+#~ msgid ""
3223+#~ "Your publisher warranty contract is already subscribed in the system !"
3224+#~ msgstr "قد تمّ إشراك هذا النظام في عقد ضمان الناشر سابقاً!"
3225+
3226+#~ msgid "Bulk SMS send"
3227+#~ msgstr "إرسال رسائل قصيرة (SMS) بالجملة"
3228+
3229+#, python-format
3230+#~ msgid "Object %s does not exists"
3231+#~ msgstr "الكائن %s غير موجود"
3232+
3233+#~ msgid "Add User"
3234+#~ msgstr "إضافة مستخدم"
3235+
3236+#~ msgid "_Close"
3237+#~ msgstr "إ_غلاق"
3238+
3239+#~ msgid "Waiting"
3240+#~ msgstr "جاري الانتظار"
3241+
3242+#, python-format
3243+#~ msgid "Could not load base module"
3244+#~ msgstr "لم يمكن تحميل الوحدة البرمجية الأساسية (base)"
3245+
3246+#~ msgid "Creation Date"
3247+#~ msgstr "تاريخ الإنشاء"
3248+
3249+#~ msgid "Ignore"
3250+#~ msgstr "تجاهل"
3251+
3252+#~ msgid ""
3253+#~ "If an email is provided, the user will be sent a message welcoming him.\n"
3254+#~ "\n"
3255+#~ "Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
3256+#~ "be possible to email new users."
3257+#~ msgstr ""
3258+#~ "في حالة ذكر بريد إلكتروني، سيتمّ إرسالة رسالة ترحيبية للمستخدم.\n"
3259+#~ "\n"
3260+#~ "تحذير: إذا لم يكن قد تمّ إعداد كل من الإعدادات \"email_from\" و "
3261+#~ "\"smtp_server\"، فلن يكون من الممكن إرسال بريد إلكتروني."
3262+
3263+#~ msgid "The kernel of OpenERP, needed for all installation."
3264+#~ msgstr "نواة نظام OpenERP. لازم لكل نسخة من النظام."
3265+
3266+#~ msgid "Current"
3267+#~ msgstr "الحالي"
3268+
3269+#~ msgid "Components Supplier"
3270+#~ msgstr "مورّد المكوّنات"
3271+
3272+#~ msgid "Week of the year: %(woy)s"
3273+#~ msgstr "الأسبوع من السنة: %(woy)s"
3274+
3275+#~ msgid "Bad customers"
3276+#~ msgstr "عملاء سيئون"
3277+
3278+#~ msgid "Finished"
3279+#~ msgstr "انتهى"
3280+
3281+#, python-format
3282+#~ msgid "Please specify server option --email-from !"
3283+#~ msgstr "فضلاً استخدم خيار الخادم --email-from !"
3284+
3285+#~ msgid "Apply For Read"
3286+#~ msgstr "اطلب صلاحية القراءة"
3287+
3288+#~ msgid ""
3289+#~ "View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
3290+#~ "views"
3291+#~ msgstr ""
3292+#~ "نوع طريقة العرض: اختر 'شجرة' للحصول على طريقة عرض هرمية، أو 'نموذج' لطرق "
3293+#~ "العرض الأخرى"
3294+
3295+#~ msgid "Fund Raising"
3296+#~ msgstr "حملة تبرعات"
3297+
3298+#~ msgid "Create"
3299+#~ msgstr "إنشاء"
3300+
3301+#~ msgid "User Name"
3302+#~ msgstr "اسم المستخدم"
3303+
3304+#~ msgid "Day of the year: %(doy)s"
3305+#~ msgstr "اليوم من السنة: %(doy)s"
3306+
3307+#~ msgid "Object Identifiers"
3308+#~ msgstr "مُعرِّفات الكائنات"
3309+
3310+#~ msgid "E-mail"
3311+#~ msgstr "البريد الإلكتروني"
3312+
3313+#~ msgid "Installed version"
3314+#~ msgstr "النسخة المثبتة"
3315+
3316+#~ msgid "To browse official translations, you can start with these links:"
3317+#~ msgstr "لتصفّح الترجمات الرسمية، ابدأ بهذه الروابط:"
3318+
3319+#~ msgid "Module update result"
3320+#~ msgstr "نتيجة تحديث الوحدة البرمجية"
3321+
3322+#, python-format
3323+#~ msgid ""
3324+#~ "You can not read this document (%s) ! Be sure your user belongs to one of "
3325+#~ "these groups: %s."
3326+#~ msgstr ""
3327+#~ "لا يمكنك قراءة هذا المستند (%s)! تأكد من أنك تنتمي لإحدى هذه المجموعات: %s."
3328+
3329+#~ msgid "Postal Address"
3330+#~ msgstr "العنوان البريدي"
3331+
3332+#~ msgid "Requests"
3333+#~ msgstr "الطلبات"
3334+
3335+#~ msgid ""
3336+#~ "Please be patient, this operation may take a few minutes (depending on the "
3337+#~ "number of modules currently installed)..."
3338+#~ msgstr ""
3339+#~ "فضلاً انتظر. يمكن أن تستغرق هذه العملية عدة دقائق (اعتماداً على عدد الوحدات "
3340+#~ "البرمجية المثبّتة حالياً)..."
3341+
3342+#~ msgid "Start update"
3343+#~ msgstr "ابدأ التحديث"
3344+
3345+#, python-format
3346+#~ msgid "Contract validation error"
3347+#~ msgstr "خطأ أثناء التأكد من صحة العقد"
3348+
3349+#~ msgid "OpenERP Partners"
3350+#~ msgstr "شركاء OpenERP"
3351+
3352+#~ msgid "Error ! You can not create recursive associated members."
3353+#~ msgstr "خطأ! لا يمكنك إنشاء أعضاء ذوي ارتباطات متداخلة."
3354+
3355+#~ msgid "HR Manager Dashboard"
3356+#~ msgstr "لوحة معلومات مدير الموارد البشرية"
3357+
3358+#~ msgid "Ms."
3359+#~ msgstr "السيدة"
3360+
3361+#~ msgid "Rounding factor"
3362+#~ msgstr "معامل التقريب"
3363+
3364+#~ msgid "The new user's real name, used for searching and most listings"
3365+#~ msgstr "الاسم الحقيقي للمستخدم الجديد. يستخدم في البحث والعرض."
3366+
3367+#~ msgid "Open Report"
3368+#~ msgstr "فتح التقرير"
3369+
3370+#~ msgid "Important customers"
3371+#~ msgstr "العملاء المهمّون"
3372+
3373+#~ msgid "Terminated"
3374+#~ msgstr "تمّ الإنهاء"
3375+
3376+#~ msgid "Short Description"
3377+#~ msgstr "وصف قصير"
3378+
3379+#, python-format
3380+#~ msgid ""
3381+#~ "Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
3382+#~ msgstr "لا يمكن حذف مجموعة ما زالت تحتوي على مستخدمين: %s !"
3383+
3384+#~ msgid "Synchronize Translations"
3385+#~ msgstr "تحديث الترجمات"
3386+
3387+#~ msgid "Starting Date"
3388+#~ msgstr "تاريخ الابتداء"
3389+
3390+#, python-format
3391+#~ msgid "Warning !"
3392+#~ msgstr "تحذير !"
3393+
3394+#~ msgid "Google Maps"
3395+#~ msgstr "خرائط Google"
3396+
3397+#~ msgid "Website of Partner"
3398+#~ msgstr "الموقع الإلكتروني للشريك"
3399+
3400+#~ msgid "Gold Partner"
3401+#~ msgstr "شريك ذهبي"
3402+
3403+#~ msgid "Open Source Service Company"
3404+#~ msgstr "شركة خدمات مفتوحة المصدر"
3405+
3406+#~ msgid "Load an Official Translation"
3407+#~ msgstr "تحميل ترجمة رسمية"
3408+
3409+#~ msgid "Miscelleanous"
3410+#~ msgstr "متفرقات"
3411+
3412+#~ msgid "Report file"
3413+#~ msgstr "ملف التقرير"
3414+
3415+#~ msgid "Created"
3416+#~ msgstr "تمّ الإنشاء"
3417+
3418+#~ msgid "Report Header"
3419+#~ msgstr "رأس التقرير"
3420+
3421+#~ msgid "Uncheck the active field to hide the contact."
3422+#~ msgstr "أزل اختيار حقل 'نشط' لإخفاء جهة الاتصال."
3423+
3424+#~ msgid "Add a widget for User"
3425+#~ msgstr "أضف عنصر واجهة مستخدم للمستخدم"
3426+
3427+#~ msgid ""
3428+#~ "Only specify a value if you want to change the user password. This user will "
3429+#~ "have to logout and login again!"
3430+#~ msgstr ""
3431+#~ "حدد قيمة إذا كنت تريد تغيير كلمة المرور للمستخدم فقط. سيضطر المستخدم لتسجيل "
3432+#~ "الخروج ثم تسجيل الدخول مجدداً!"
3433+
3434+#~ msgid ""
3435+#~ "You can install new modules in order to activate new features, menu, reports "
3436+#~ "or data in your OpenERP instance. To install some modules, click on the "
3437+#~ "button \"Schedule for Installation\" from the form view, then click on "
3438+#~ "\"Apply Scheduled Upgrades\" to migrate your system."
3439+#~ msgstr ""
3440+#~ "يمكنك تثبيت وحدات برمجية جديدة لتنشيط مزايا وقوائم وتقارير وبيانات جديدة في "
3441+#~ "نسختك من نظام OpenERP. لتثبيت وحدات برمجية، انقر زر \"اختر للتثبيت\" من "
3442+#~ "طريقة عرض النموذج، ثم انقر \"نفّذ الترقيات المُعدّة\"."
3443+
3444+#~ msgid "Your Logo - Use a size of about 450x150 pixels."
3445+#~ msgstr "الشعار - استخدم صورة بحجم 150x450 نقطة"
3446+
3447+#~ msgid "Emails"
3448+#~ msgstr "الرسائل الإلكترونية"
3449+
3450+#~ msgid "Modules to update"
3451+#~ msgstr "الوحدات البرمجية في انتظار التحديث"
3452+
3453+#~ msgid "Send Email"
3454+#~ msgstr "إرسال بريد إلكتروني"
3455+
3456+#~ msgid "Register"
3457+#~ msgstr "تسجيل"
3458+
3459+#~ msgid ""
3460+#~ "This wizard helps you add a new language to you OpenERP system. After "
3461+#~ "loading a new language it becomes available as default interface language "
3462+#~ "for users and partners."
3463+#~ msgstr ""
3464+#~ "يساعدك هذا المعالج على إضافة لغة جديدة لنسختك من نظام OpenERP. بعد تحميل لغة "
3465+#~ "جديدة ستصبح متاحة كلغة افتراضية للمستخدمين والشركاء."
3466+
3467+#~ msgid "Consumers"
3468+#~ msgstr "المستهلكون"
3469+
3470+#~ msgid "Next"
3471+#~ msgstr "التالي"
3472+
3473+#~ msgid ""
3474+#~ "This wizard will detect new terms to translate in the application, so that "
3475+#~ "you can then add translations manually or perform a complete export (as a "
3476+#~ "template for a new language example)."
3477+#~ msgstr ""
3478+#~ "يقوم هذا المعالج باكتشاف المصطلحات الجديدة في التطبيق لترجمتها، ومن ثَمّ "
3479+#~ "يمكنك إضافة الترجمات يدوياً، أو تصدير الترجمة كاملة (كقالب للغة جديدة)."
3480+
3481+#~ msgid "Publisher warranty contract successfully registered!"
3482+#~ msgstr "تمّ تسجيل عقد ضمان الناشر بنجاح!"
3483+
3484+#~ msgid "Channel Name"
3485+#~ msgstr "اسم القناة"
3486+
3487+#~ msgid "Landscape"
3488+#~ msgstr "عرضيّ"
3489+
3490+#~ msgid "Reply"
3491+#~ msgstr "رد"
3492+
3493+#, python-format
3494+#~ msgid ""
3495+#~ "Operation prohibited by access rules, or performed on an already deleted "
3496+#~ "document (Operation: %s, Document type: %s)."
3497+#~ msgstr ""
3498+#~ "العملية محظورة حسب قواعد الصلاحيات، أن أنها نُفِّذت على مستند قد تمّ حذفه "
3499+#~ "(العملية: %s، نوع المستند: %s)."
3500+
3501+#~ msgid "User Widgets"
3502+#~ msgstr "كائنات واجهة المستخدم الخاصة بالمستخدم"
3503+
3504+#~ msgid "Other Actions Configuration"
3505+#~ msgstr "إعدادات الإجراءات الأخرى"
3506+
3507+#~ msgid "Schedule for Installation"
3508+#~ msgstr "اختر للتثبيت"
3509+
3510+#~ msgid "Channels"
3511+#~ msgstr "القنوات"
3512+
3513+#~ msgid "Extra Info"
3514+#~ msgstr "معلومات إضافية"
3515+
3516+#~ msgid "Send"
3517+#~ msgstr "إرسال"
3518+
3519+#~ msgid "Menu Tips"
3520+#~ msgstr "إرشادات القائمة"
3521+
3522+#~ msgid "Internal Header/Footer"
3523+#~ msgstr "رأس / تذييل داخلي"
3524+
3525+#, python-format
3526+#~ msgid ""
3527+#~ "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
3528+#~ "may be uploaded to launchpad."
3529+#~ msgstr ""
3530+#~ "احفظ هذا المستند في ملف .tgz. سيحتوي هذا الأرشيف على %s ملفات ذات ترميز UTF-"
3531+#~ "8 ويمكن رفعه إلى موقع Launchpad."
3532+
3533+#~ msgid ""
3534+#~ "Check out this box if you want to always display tips on each menu action"
3535+#~ msgstr "اختر لكي تظهر لك إرشادات لكل إجراء في القائمة دائماً"
3536+
3537+#~ msgid "Event Logs"
3538+#~ msgstr "سجلات الأحداث"
3539+
3540+#~ msgid ""
3541+#~ "Check this box if the partner is a supplier. If it's not checked, purchase "
3542+#~ "people will not see it when encoding a purchase order."
3543+#~ msgstr ""
3544+#~ "اختر إذا كان الشريك مُورِّداً. إذا لم تختر، لن يظهر الشربك لقسم المشتريات "
3545+#~ "أثناء إعدادهم لأمر شراء."
3546+
3547+#~ msgid "_Export"
3548+#~ msgstr "ت_صدير"
3549+
3550+#~ msgid "Register a Contract"
3551+#~ msgstr "تسجيل عقد"
3552+
3553+#, python-format
3554+#~ msgid "Please check your publisher warranty contract name and validity."
3555+#~ msgstr "فضلاً تحقق من اسم وسريان عقد ضمان الناشر الخاص بك."
3556+
3557+#~ msgid "System Logs"
3558+#~ msgstr "سجلات النظام"
3559+
3560+#, python-format
3561+#~ msgid "You cannot remove the field '%s' !"
3562+#~ msgstr "لا يمكنك حذف الحقل '%s' !"
3563+
3564+#, python-format
3565+#~ msgid ""
3566+#~ "You can not delete this document (%s) ! Be sure your user belongs to one of "
3567+#~ "these groups: %s."
3568+#~ msgstr ""
3569+#~ "لا يمكنك حذف هذا المستند (%s) ! تأكد من أنك تنتمي لإحدى هذه المجموعات: %s."
3570+
3571+#~ msgid ""
3572+#~ "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
3573+#~ "Portable Objects)"
3574+#~ msgstr ""
3575+#~ "صيغ الملفات المدعومة: csv (قيم مفصولة بفواصل) أو po (كائنات GetText متنقلة)"
3576+
3577+#~ msgid "Publisher Warranty"
3578+#~ msgstr "ضمان الناشر"
3579+
3580+#~ msgid "Filename"
3581+#~ msgstr "اسم الملف"
3582+
3583+#~ msgid "Email & Signature"
3584+#~ msgstr "البريد الإلكتروني والتوقيع"
3585+
3586+#~ msgid "Publisher Warranty Contract"
3587+#~ msgstr "عقد ضمان الناشر"
3588+
3589+#~ msgid ""
3590+#~ "You can access all information regarding your suppliers from the supplier "
3591+#~ "form: accounting data, history of emails, meetings, purchases, etc. You can "
3592+#~ "uncheck the 'Suppliers' filter button in order to search in all your "
3593+#~ "partners, including customers and prospects."
3594+#~ msgstr ""
3595+#~ "يمكنك الحصول على كافة المعلومات المتعلقة بالمُورِّدين من نموذج المُورِّد: "
3596+#~ "بيانات الحسابات، الرسائل الألكترونية السابقة، الاجتماعات، عمليات الشراء، "
3597+#~ "إلخ. يمكنك إزالة اختيار مرشح الفرز 'المُورِّدون' لكي يتمّ بحث كافة الشركاء "
3598+#~ "بما فيهم العملاء والمستقبليون."
3599+
3600+#~ msgid "Action Source"
3601+#~ msgstr "مصدر الإجراء"
3602+
3603+#~ msgid "Day of the week (0:Monday): %(weekday)s"
3604+#~ msgstr "اليوم الأسبوعي (0: الإثنين): %(weekday)s"
3605+
3606+#~ msgid ""
3607+#~ "If you use OpenERP for the first time we strongly advise you to select the "
3608+#~ "simplified interface, which has less features but is easier. You can always "
3609+#~ "switch later from the user preferences."
3610+#~ msgstr ""
3611+#~ "إذا كنت تستخدم OpenERP لأول مرة، ننصحك بشدة أن تختار الواجهة المبسطة، والتي "
3612+#~ "تنقصها بعض المزايا ولكنها أسهل استخداماً. يمكنك تغيير هذا الاختيار في أي وقت "
3613+#~ "من تفضيلات المستخدم."
3614+
3615+#~ msgid "IT sector"
3616+#~ msgstr "قطاع تقنية المعلومات"
3617+
3618+#~ msgid "Select Groups"
3619+#~ msgstr "اختر المجموعات"
3620+
3621+#~ msgid "Configuration Progress"
3622+#~ msgstr "تقدم الإعدادات"
3623+
3624+#~ msgid "Portrait"
3625+#~ msgstr "طوليّ"
3626+
3627+#~ msgid "Homepage Widgets Management"
3628+#~ msgstr "إدارة عناصر واجهة المستخدم الخاصة بالصفحة الرئيسية"
3629+
3630+#~ msgid "Delivery"
3631+#~ msgstr "التسليم"
3632+
3633+#~ msgid "Extended"
3634+#~ msgstr "مفصلة"
3635+
3636+#~ msgid "Simplified"
3637+#~ msgstr "مبسطة"
3638+
3639+#~ msgid "Apply For Write"
3640+#~ msgstr "اطلب صلاحية الكتابة"
3641+
3642+#~ msgid "Apply For Create"
3643+#~ msgstr "تنفيذ للإنشاء"
3644+
3645+#~ msgid "BIC/Swift code"
3646+#~ msgstr "كود السويفت"
3647+
3648+#~ msgid "Never"
3649+#~ msgstr "أبداً"
3650+
3651+#~ msgid "Search Widget"
3652+#~ msgstr "بحث الملحقات البرمجية"
3653+
3654+#, python-format
3655+#~ msgid "The read method is not implemented on this object !"
3656+#~ msgstr "وظيفة القراءة لم تنفذ في هذا الكائن !"
3657+
3658+#~ msgid "res.config.users"
3659+#~ msgstr "res.config.users"
3660+
3661+#~ msgid "client_action_multi, client_action_relate"
3662+#~ msgstr "client_action_multi, client_action_relate"
3663+
3664+#~ msgid "wizard.ir.model.menu.create.line"
3665+#~ msgstr "wizard.ir.model.menu.create.line"
3666+
3667+#~ msgid "https://help.launchpad.net/Translations"
3668+#~ msgstr ""
3669+#~ "https://www.facebook.com/#!/pages/OpenERP-Arabic-Team/270243976333404 أو "
3670+#~ "https://help.launchpad.net/Translations"
3671+
3672+#~ msgid "Facebook"
3673+#~ msgstr "فيسبوك"
3674+
3675+#~ msgid "res.partner.event"
3676+#~ msgstr "res.partner.event"
3677+
3678+#~ msgid "maintenance.contract"
3679+#~ msgstr "maintenance.contract"
3680+
3681+#~ msgid "VAT"
3682+#~ msgstr "ضريبة القيمة المضافة"
3683+
3684+#~ msgid "XML Id"
3685+#~ msgstr "معرف XML"
3686+
3687+#~ msgid "tree_but_action, client_print_multi"
3688+#~ msgstr "tree_but_action, client_print_multi"
3689+
3690+#~ msgid "OpenERP Favorites"
3691+#~ msgstr "مفضلات OpenERP"
3692+
3693+#~ msgid "res.groups"
3694+#~ msgstr "res.groups"
3695+
3696+#~ msgid "res.users"
3697+#~ msgstr "res.users"
3698+
3699+#~ msgid "ir.actions.url"
3700+#~ msgstr "ir.actions.url"
3701+
3702+#~ msgid "- module,type,name,res_id,src,value"
3703+#~ msgstr "- module,type,name,res_id,src,value"
3704+
3705+#~ msgid "On delete"
3706+#~ msgstr "أثناء المسح"
3707+
3708+#~ msgid "res.widget.user"
3709+#~ msgstr "res.widget.user"
3710+
3711+#~ msgid "res.config.view"
3712+#~ msgstr "res.config.view"
3713+
3714+#~ msgid "Read"
3715+#~ msgstr "قراءة"
3716+
3717+#~ msgid "ir.actions.todo"
3718+#~ msgstr "ir.actions.todo"
3719+
3720+#~ msgid "XSL path"
3721+#~ msgstr "مسار XSL"
3722+
3723+#~ msgid "res.widget"
3724+#~ msgstr "res.widget"
3725+
3726+#~ msgid "res.log"
3727+#~ msgstr "res.log"
3728+
3729+#~ msgid "ir.wizard.screen"
3730+#~ msgstr "ir.wizard.screen"
3731+
3732+#~ msgid "- type,name,res_id,src,value"
3733+#~ msgstr "- type,name,res_id,src,value"
3734+
3735+#~ msgid "Congo, The Democratic Republic of the"
3736+#~ msgstr "جمهورية الكونغو الديمقراطية"
3737+
3738+#~ msgid "Object ID"
3739+#~ msgstr "معرف الكائن"
3740+
3741+#~ msgid "https://translations.launchpad.net/openobject"
3742+#~ msgstr "https://translations.launchpad.net/openobject"
3743+
3744+#~ msgid "state"
3745+#~ msgstr "الولاية"
3746+
3747+#~ msgid "XML path"
3748+#~ msgstr "مسار XML"
3749+
3750+#~ msgid "Slovak Republic"
3751+#~ msgstr "سلوفاكيا"
3752+
3753+#~ msgid "Is Object"
3754+#~ msgstr "هو كائن"
3755+
3756+#~ msgid "Localisation"
3757+#~ msgstr "التهيئة المحلية"
3758+
3759+#~ msgid "Contracts"
3760+#~ msgstr "عقود"
3761+
3762+#, python-format
3763+#~ msgid "Key/value '%s' not found in selection field '%s'"
3764+#~ msgstr "قيمة/ مفتاح '%s' غير موجود في الحقول المختارة '%s'"
3765+
3766+#~ msgid "On multiple doc."
3767+#~ msgstr "على عدة مستندات."
3768+
3769+#~ msgid "Create Action"
3770+#~ msgstr "أنشأ إجراء"
3771+
3772+#~ msgid "Attached Model"
3773+#~ msgstr "نموذج ملحق"
3774+
3775+#~ msgid "Trigger Name"
3776+#~ msgstr "اسم المشغل"
3777+
3778+#~ msgid "Search Contact"
3779+#~ msgstr "بحث جهة الإتصال"
3780+
3781+#~ msgid "Unvalidated"
3782+#~ msgstr "غير محقق"
3783+
3784+#~ msgid "Code (eg:en__US)"
3785+#~ msgstr "الترميز (مثل: ar_EG)"
3786+
3787+#~ msgid "Process"
3788+#~ msgstr "عمليّة"
3789+
3790+#~ msgid "MRP Subproducts"
3791+#~ msgstr "المنتجات الفرعية من تخطيط مصدر التصنيع"
3792+
3793+#~ msgid "Html View"
3794+#~ msgstr "عرض HTML"
3795+
3796+#, python-format
3797+#~ msgid "Website: "
3798+#~ msgstr "الموقع : "
3799+
3800+#, python-format
3801+#~ msgid "Fax: "
3802+#~ msgstr "فاكس: "
3803+
3804+#~ msgid "Master Procurement Schedule"
3805+#~ msgstr "جدول الاستاذ للمشتريات"
3806+
3807+#~ msgid "Administration Dashboard"
3808+#~ msgstr "لوحة تحكم المشرفين"
3809+
3810+#~ msgid "Portugese / Português"
3811+#~ msgstr "البرتغالية / Português"
3812+
3813+#~ msgid "API ID"
3814+#~ msgstr "هوية API"
3815+
3816+#~ msgid "Test"
3817+#~ msgstr "إختبار"
3818+
3819+#~ msgid "web Gantt"
3820+#~ msgstr "خرائط جانت"
3821+
3822+#~ msgid "web Graph"
3823+#~ msgstr "الرسوم البيانية"
3824+
3825+#~ msgid "Web Chat"
3826+#~ msgstr "المحادثة"
3827+
3828+#~ msgid "publisher_warranty.contract.wizard"
3829+#~ msgstr "publisher_warranty.contract.wizard"
3830+
3831+#~ msgid "Send an SMS"
3832+#~ msgstr "إرسال SMS"
3833+
3834+#~ msgid "Sales Orders Print Layout"
3835+#~ msgstr "تنسيق طباعة اوامر البيع"
3836+
3837+#~ msgid "Point Of Sale"
3838+#~ msgstr "نقطة بيع"
3839+
3840+#~ msgid "Set password"
3841+#~ msgstr "ضبط كلمة المرور"
3842+
3843+#~ msgid "Change Color"
3844+#~ msgstr "تغيير اللون"
3845+
3846+#~ msgid "In-Project Messaging System"
3847+#~ msgstr "نظام المراسلة في المشاريع"
3848+
3849+#~ msgid "Miscellaneous Tools"
3850+#~ msgstr "أدوات متنوعة."
3851+
3852+#, python-format
3853+#~ msgid "Phone: "
3854+#~ msgstr "هاتف "
3855+
3856+#~ msgid "Address Information"
3857+#~ msgstr "معلومات العنوان"
3858+
3859+#~ msgid ""
3860+#~ "The user this filter is available to. When left empty the filter is usable "
3861+#~ "by the system only."
3862+#~ msgstr ""
3863+#~ "مرشحات المستخدم غير متوفرة. عندما يترك فارغا فان المرشح يستخدم بواسطة النظام "
3864+#~ "فقط."
3865+
3866+#~ msgid ""
3867+#~ "Value Added Tax number. Check the box if the partner is subjected to the "
3868+#~ "VAT. Used by the VAT legal statement."
3869+#~ msgstr ""
3870+#~ "رقم ضريبة القيمة المضافة. ضع علامة في هذا المربع اذا كان الشريك خاضع لضريبة "
3871+#~ "القيمة المضافة. تستخدم بواسطة كشف ضريبة القيمة المضافة القانونية."
3872+
3873+#~ msgid "View Ordering"
3874+#~ msgstr "عرض الطلبات"
3875+
3876+#~ msgid "Partner Manager"
3877+#~ msgstr "إدارة الشركاء"
3878+
3879+#~ msgid "Website of Partner."
3880+#~ msgstr "موقع إلكتروني للشريك."
3881+
3882+#~ msgid "Tools / Customization"
3883+#~ msgstr "أدوات / تخصيصات"
3884+
3885+#~ msgid ""
3886+#~ "\n"
3887+#~ "Add additional date information to the sales order.\n"
3888+#~ "===================================================\n"
3889+#~ "\n"
3890+#~ "You can add the following additional dates to a sale order:\n"
3891+#~ " * Requested Date\n"
3892+#~ " * Commitment Date\n"
3893+#~ " * Effective Date\n"
3894+#~ msgstr ""
3895+#~ "\n"
3896+#~ "أضف تواريخ اضافية الى طلب البيع.\n"
3897+#~ "===============================\n"
3898+#~ "\n"
3899+#~ "يمكنك اضافة التواريخ التالية الى طلب البيع:\n"
3900+#~ "* التاريخ المطلوب\n"
3901+#~ "* التاريخ الملتزم به\n"
3902+#~ "* تاريخ السريان\n"
3903+
3904+#~ msgid "Expenses Management"
3905+#~ msgstr "إدارة المصروفات و النفقات"
3906+
3907+#~ msgid "Live Chat Support"
3908+#~ msgstr "التحدث مع الدعم الفني"
3909+
3910+#~ msgid ""
3911+#~ "The default language used in the graphical user interface, when translations "
3912+#~ "are available. To add a new language, you can use the 'Load an Official "
3913+#~ "Translation' wizard available from the 'Administration' menu."
3914+#~ msgstr ""
3915+#~ "اللغة الافتراضية المستخدمة في الواجهات، عندما تكون هناك ترجمات متوفرة. "
3916+#~ "لإضافة لغة جديدة، يمكنك استخدام 'تحميل ترجمة رسمية' من قائمة \"إدارة\"."
3917+
3918+#~ msgid "Appears by default on the top right corner of your printed documents."
3919+#~ msgstr "يظهر إفتراضيا في أعلى الزاوية اليمنى من الوثائق المطبوعة."
3920+
3921+#~ msgid "Allow users to login through OpenID."
3922+#~ msgstr "السماح للمستخدمين بالدخول باستخدام أوبن أي دي(OpenID)."
3923+
3924+#~ msgid "Report Designer"
3925+#~ msgstr "مصمم التقارير"
3926+
3927+#~ msgid "Save As Attachment Prefix"
3928+#~ msgstr "حفظ مقدمة المرفقات"
3929+
3930+#~ msgid "In modules"
3931+#~ msgstr "في الملحقات"
3932+
3933+#~ msgid "Openerp web graph view"
3934+#~ msgstr "مستعرض الرسوم البيانية"
3935+
3936+#~ msgid "Action Binding"
3937+#~ msgstr "إجراءات الربط"
3938+
3939+#~ msgid "OpenERP Web web"
3940+#~ msgstr "واجهة الويب للنظام"
3941+
3942+#~ msgid "Clear IDs"
3943+#~ msgstr "إزالة المعرفات"
3944+
3945+#~ msgid "Specifications on PADs"
3946+#~ msgstr "مواصفات الباد (PADs)"
3947+
3948+#~ msgid "Billing Rates on Contracts"
3949+#~ msgstr "عدل الفواتير علي العقود"
3950+
3951+#~ msgid ""
3952+#~ "Your OpenERP Publisher's Warranty Contract unique key, also called serial "
3953+#~ "number."
3954+#~ msgstr ""
3955+#~ "رمز اتفاقية ضمان الناشر الخاص بك لنظام أوبن إي آر بي، يدعى أيضاً الرقم "
3956+#~ "التسلسلي."
3957+
3958+#~ msgid "Tasks-Mail Integration"
3959+#~ msgstr "دمج المهام عن طريق الإيميل"
3960
3961=== modified file 'openerp/addons/base/i18n/base.pot'
3962--- openerp/addons/base/i18n/base.pot 2013-03-07 12:02:59 +0000
3963+++ openerp/addons/base/i18n/base.pot 2013-06-03 11:35:34 +0000
3964@@ -4,10 +4,10 @@
3965 #
3966 msgid ""
3967 msgstr ""
3968-"Project-Id-Version: OpenERP Server 7.0\n"
3969+"Project-Id-Version: OpenERP Server 7.0alpha\n"
3970 "Report-Msgid-Bugs-To: \n"
3971-"POT-Creation-Date: 2013-03-07 08:36+0000\n"
3972-"PO-Revision-Date: 2013-03-07 08:36+0000\n"
3973+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
3974+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
3975 "Last-Translator: <>\n"
3976 "Language-Team: \n"
3977 "MIME-Version: 1.0\n"
3978@@ -24,11 +24,6 @@
3979 msgstr ""
3980
3981 #. module: base
3982-#: view:res.partner.bank:0
3983-msgid "e.g. GEBABEBB"
3984-msgstr ""
3985-
3986-#. module: base
3987 #: model:res.country,name:base.sh
3988 msgid "Saint Helena"
3989 msgstr ""
3990@@ -44,7 +39,7 @@
3991 msgstr ""
3992
3993 #. module: base
3994-#: code:addons/fields.py:652
3995+#: code:addons/fields.py:643
3996 #, python-format
3997 msgid "The second argument of the many2many field %s must be a SQL table !You used %s, which is not a valid SQL table name."
3998 msgstr ""
3999@@ -178,19 +173,19 @@
4000 #. module: base
4001 #: code:addons/base/ir/ir_sequence.py:104
4002 #: code:addons/base/ir/ir_sequence.py:130
4003-#: code:addons/base/res/res_users.py:473
4004+#: code:addons/base/res/res_users.py:467
4005 #, python-format
4006 msgid "Warning!"
4007 msgstr ""
4008
4009 #. module: base
4010-#: code:addons/base/ir/ir_model.py:406
4011+#: code:addons/base/ir/ir_model.py:399
4012 #, python-format
4013 msgid "Properties of base fields cannot be altered in this manner! Please modify them through Python code, preferably through a custom addon!"
4014 msgstr ""
4015
4016 #. module: base
4017-#: code:addons/osv.py:151
4018+#: code:addons/osv.py:132
4019 #, python-format
4020 msgid "Constraint Error"
4021 msgstr ""
4022@@ -201,7 +196,7 @@
4023 msgstr ""
4024
4025 #. module: base
4026-#: code:addons/base/ir/ir_model.py:375
4027+#: code:addons/base/ir/ir_model.py:368
4028 #, python-format
4029 msgid "Renaming sparse field \"%s\" is not allowed"
4030 msgstr ""
4031@@ -212,7 +207,7 @@
4032 msgstr ""
4033
4034 #. module: base
4035-#: code:addons/orm.py:4486
4036+#: code:addons/orm.py:4485
4037 #, python-format
4038 msgid "created."
4039 msgstr ""
4040@@ -352,7 +347,7 @@
4041 msgstr ""
4042
4043 #. module: base
4044-#: code:addons/orm.py:2649
4045+#: code:addons/orm.py:2648
4046 #, python-format
4047 msgid "Invalid group_by"
4048 msgstr ""
4049@@ -418,7 +413,7 @@
4050 msgstr ""
4051
4052 #. module: base
4053-#: code:addons/orm.py:4153
4054+#: code:addons/orm.py:4152
4055 #, python-format
4056 msgid "One of the records you are trying to modify has already been deleted (Document type: %s)."
4057 msgstr ""
4058@@ -464,7 +459,7 @@
4059 msgstr ""
4060
4061 #. module: base
4062-#: code:addons/base/res/res_users.py:311
4063+#: code:addons/base/res/res_users.py:307
4064 #, python-format
4065 msgid "You can not remove the admin user as it is used internally for resources created by OpenERP (updates, module installation, ...)"
4066 msgstr ""
4067@@ -598,11 +593,6 @@
4068 msgstr ""
4069
4070 #. module: base
4071-#: view:res.partner:0
4072-msgid "Put an internal note..."
4073-msgstr ""
4074-
4075-#. module: base
4076 #: view:ir.translation:0
4077 msgid "Untranslated"
4078 msgstr ""
4079@@ -624,7 +614,7 @@
4080 msgstr ""
4081
4082 #. module: base
4083-#: code:addons/base/ir/ir_model.py:345
4084+#: code:addons/base/ir/ir_model.py:339
4085 #, python-format
4086 msgid "Custom fields must have a name that starts with 'x_' !"
4087 msgstr ""
4088@@ -906,15 +896,6 @@
4089 msgstr ""
4090
4091 #. module: base
4092-#: view:res.bank:0
4093-#: view:res.company:0
4094-#: view:res.partner:0
4095-#: view:res.partner.bank:0
4096-#: view:res.users:0
4097-msgid "ZIP"
4098-msgstr ""
4099-
4100-#. module: base
4101 #: selection:base.language.install,lang:0
4102 msgid "Spanish (UY) / Español (UY)"
4103 msgstr ""
4104@@ -1049,8 +1030,8 @@
4105 msgstr ""
4106
4107 #. module: base
4108-#: code:addons/base/ir/ir_model.py:733
4109-#: code:addons/base/ir/ir_model.py:736
4110+#: code:addons/base/ir/ir_model.py:725
4111+#: code:addons/base/ir/ir_model.py:728
4112 #, python-format
4113 msgid "Document model"
4114 msgstr ""
4115@@ -1154,7 +1135,7 @@
4116 msgstr ""
4117
4118 #. module: base
4119-#: code:addons/base/ir/ir_mail_server.py:214
4120+#: code:addons/base/ir/ir_mail_server.py:212
4121 #, python-format
4122 msgid "Connection test failed!"
4123 msgstr ""
4124@@ -1191,7 +1172,7 @@
4125 msgstr ""
4126
4127 #. module: base
4128-#: code:addons/orm.py:4918
4129+#: code:addons/orm.py:4917
4130 #, python-format
4131 msgid "Record #%d of %s not found, cannot copy!"
4132 msgstr ""
4133@@ -1320,7 +1301,7 @@
4134 msgstr ""
4135
4136 #. module: base
4137-#: code:addons/base/ir/ir_model.py:430
4138+#: code:addons/base/ir/ir_model.py:423
4139 #, python-format
4140 msgid "Changing the model of a field is forbidden!"
4141 msgstr ""
4142@@ -1342,7 +1323,7 @@
4143 msgstr ""
4144
4145 #. module: base
4146-#: code:addons/osv.py:154
4147+#: code:addons/osv.py:135
4148 #, python-format
4149 msgid "The operation cannot be completed, probably due to the following:\n"
4150 "- deletion: you may be trying to delete a record while other records still reference it\n"
4151@@ -1585,7 +1566,7 @@
4152 msgstr ""
4153
4154 #. module: base
4155-#: code:addons/base/ir/ir_model.py:914
4156+#: code:addons/base/ir/ir_model.py:906
4157 #, python-format
4158 msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
4159 msgstr ""
4160@@ -1666,7 +1647,7 @@
4161 msgstr ""
4162
4163 #. module: base
4164-#: code:addons/base/module/module.py:414
4165+#: code:addons/base/module/module.py:415
4166 #: view:ir.module.module:0
4167 #, python-format
4168 msgid "Install"
4169@@ -1830,7 +1811,7 @@
4170 msgstr ""
4171
4172 #. module: base
4173-#: code:addons/base/ir/ir_model.py:321
4174+#: code:addons/base/ir/ir_model.py:318
4175 #, python-format
4176 msgid "This column contains module data and cannot be removed!"
4177 msgstr ""
4178@@ -1884,7 +1865,7 @@
4179 msgstr ""
4180
4181 #. module: base
4182-#: code:addons/base/res/res_users.py:311
4183+#: code:addons/base/res/res_users.py:307
4184 #, python-format
4185 msgid "Can not remove root user!"
4186 msgstr ""
4187@@ -1908,8 +1889,8 @@
4188 #: code:addons/base/ir/ir_filters.py:36
4189 #: code:addons/base/res/res_partner.py:314
4190 #: code:addons/base/res/res_users.py:92
4191-#: code:addons/base/res/res_users.py:335
4192-#: code:addons/base/res/res_users.py:337
4193+#: code:addons/base/res/res_users.py:331
4194+#: code:addons/base/res/res_users.py:333
4195 #, python-format
4196 msgid "%s (copy)"
4197 msgstr ""
4198@@ -2217,7 +2198,7 @@
4199 msgstr ""
4200
4201 #. module: base
4202-#: code:addons/orm.py:3843
4203+#: code:addons/orm.py:3842
4204 #, python-format
4205 msgid "A document was modified since you last viewed it (%s:%d)"
4206 msgstr ""
4207@@ -2342,7 +2323,7 @@
4208 msgstr ""
4209
4210 #. module: base
4211-#: code:addons/base/ir/ir_model.py:127
4212+#: code:addons/base/ir/ir_model.py:126
4213 #, python-format
4214 msgid "The Object name must start with x_ and not contain any special character !"
4215 msgstr ""
4216@@ -2511,6 +2492,11 @@
4217 msgstr ""
4218
4219 #. module: base
4220+#: view:ir.filters:0
4221+msgid "My Filters"
4222+msgstr ""
4223+
4224+#. module: base
4225 #: field:ir.actions.server,email:0
4226 msgid "Email Address"
4227 msgstr ""
4228@@ -2603,7 +2589,7 @@
4229 msgstr ""
4230
4231 #. module: base
4232-#: code:addons/base/ir/ir_model.py:727
4233+#: code:addons/base/ir/ir_model.py:719
4234 #, python-format
4235 msgid "Sorry, you are not allowed to access this document."
4236 msgstr ""
4237@@ -2766,21 +2752,21 @@
4238 msgstr ""
4239
4240 #. module: base
4241-#: code:addons/orm.py:2021
4242-#: code:addons/orm.py:2032
4243+#: code:addons/orm.py:2020
4244+#: code:addons/orm.py:2031
4245 #, python-format
4246 msgid "Invalid Object Architecture!"
4247 msgstr ""
4248
4249 #. module: base
4250-#: code:addons/base/ir/ir_model.py:373
4251-#: code:addons/base/ir/ir_model.py:375
4252-#: code:addons/base/ir/ir_model.py:405
4253-#: code:addons/base/ir/ir_model.py:419
4254-#: code:addons/base/ir/ir_model.py:421
4255+#: code:addons/base/ir/ir_model.py:366
4256+#: code:addons/base/ir/ir_model.py:368
4257+#: code:addons/base/ir/ir_model.py:398
4258+#: code:addons/base/ir/ir_model.py:412
4259+#: code:addons/base/ir/ir_model.py:414
4260+#: code:addons/base/ir/ir_model.py:416
4261 #: code:addons/base/ir/ir_model.py:423
4262-#: code:addons/base/ir/ir_model.py:430
4263-#: code:addons/base/ir/ir_model.py:433
4264+#: code:addons/base/ir/ir_model.py:426
4265 #: code:addons/base/module/wizard/base_update_translations.py:39
4266 #, python-format
4267 msgid "Error!"
4268@@ -2844,11 +2830,6 @@
4269 msgstr ""
4270
4271 #. module: base
4272-#: model:ir.module.module,shortdesc:base.module_hr_expense
4273-msgid "Expense Management"
4274-msgstr ""
4275-
4276-#. module: base
4277 #: field:ir.actions.server,action_id:0
4278 #: selection:ir.actions.server,state:0
4279 #: view:ir.values:0
4280@@ -2872,17 +2853,12 @@
4281 msgstr ""
4282
4283 #. module: base
4284-#: view:res.company:0
4285-msgid "e.g. Global Business Solutions"
4286-msgstr ""
4287-
4288-#. module: base
4289 #: field:res.company,rml_header1:0
4290 msgid "Company Tagline"
4291 msgstr ""
4292
4293 #. module: base
4294-#: code:addons/base/res/res_users.py:674
4295+#: code:addons/base/res/res_users.py:668
4296 #: model:ir.model,name:base.model_ir_module_category
4297 #: field:ir.module.module,application:0
4298 #: field:res.groups,category_id:0
4299@@ -2914,7 +2890,7 @@
4300 msgstr ""
4301
4302 #. module: base
4303-#: code:addons/base/module/module.py:525
4304+#: code:addons/base/module/module.py:526
4305 #, python-format
4306 msgid "Can not upgrade module '%s'. It is not installed."
4307 msgstr ""
4308@@ -2925,7 +2901,7 @@
4309 msgstr ""
4310
4311 #. module: base
4312-#: code:addons/report_sxw.py:443
4313+#: code:addons/report_sxw.py:441
4314 #, python-format
4315 msgid "Unknown report type: %s"
4316 msgstr ""
4317@@ -3001,7 +2977,7 @@
4318 msgstr ""
4319
4320 #. module: base
4321-#: code:addons/orm.py:3871
4322+#: code:addons/orm.py:3870
4323 #, python-format
4324 msgid "Missing document(s)"
4325 msgstr ""
4326@@ -3068,7 +3044,7 @@
4327 msgstr ""
4328
4329 #. module: base
4330-#: code:addons/orm.py:4685
4331+#: code:addons/orm.py:4684
4332 #, python-format
4333 msgid "Invalid \"order\" specified. A valid \"order\" specification is a comma-separated list of valid field names (optionally followed by asc/desc for the direction)"
4334 msgstr ""
4335@@ -3096,7 +3072,7 @@
4336 msgstr ""
4337
4338 #. module: base
4339-#: code:addons/base/ir/ir_model.py:278
4340+#: code:addons/base/ir/ir_model.py:275
4341 #, python-format
4342 msgid "The Selection Options expression is not a valid Pythonic expression.Please provide an expression in the [('key','Label'), ...] format."
4343 msgstr ""
4344@@ -3159,7 +3135,7 @@
4345 msgstr ""
4346
4347 #. module: base
4348-#: code:addons/base/ir/ir_mail_server.py:239
4349+#: code:addons/base/ir/ir_mail_server.py:237
4350 #, python-format
4351 msgid "SMTP-over-SSL mode unavailable"
4352 msgstr ""
4353@@ -3247,6 +3223,11 @@
4354 msgstr ""
4355
4356 #. module: base
4357+#: view:ir.filters:0
4358+msgid "Personal"
4359+msgstr ""
4360+
4361+#. module: base
4362 #: field:base.language.export,modules:0
4363 msgid "Modules To Export"
4364 msgstr ""
4365@@ -3257,7 +3238,7 @@
4366 msgstr ""
4367
4368 #. module: base
4369-#: code:addons/base/ir/ir_model.py:733
4370+#: code:addons/base/ir/ir_model.py:725
4371 #, python-format
4372 msgid "Only users with the following access level are currently allowed to do that"
4373 msgstr ""
4374@@ -3442,7 +3423,7 @@
4375 msgstr ""
4376
4377 #. module: base
4378-#: code:addons/orm.py:4246
4379+#: code:addons/orm.py:4245
4380 #, python-format
4381 msgid "Recursivity Detected."
4382 msgstr ""
4383@@ -3507,10 +3488,10 @@
4384 msgstr ""
4385
4386 #. module: base
4387-#: code:addons/base/ir/ir_model.py:740
4388-#: code:addons/orm.py:3567
4389-#: code:addons/orm.py:3860
4390-#: code:addons/orm.py:3902
4391+#: code:addons/base/ir/ir_model.py:732
4392+#: code:addons/orm.py:3566
4393+#: code:addons/orm.py:3859
4394+#: code:addons/orm.py:3901
4395 #, python-format
4396 msgid "Access Denied"
4397 msgstr ""
4398@@ -3521,7 +3502,7 @@
4399 msgstr ""
4400
4401 #. module: base
4402-#: code:addons/orm.py:2808
4403+#: code:addons/orm.py:2807
4404 #, python-format
4405 msgid "Invalid value for reference field \"%s.%s\" (last part must be a non-zero integer): \"%s\""
4406 msgstr ""
4407@@ -3641,7 +3622,7 @@
4408 msgstr ""
4409
4410 #. module: base
4411-#: code:addons/base/module/module.py:644
4412+#: code:addons/base/module/module.py:645
4413 #, python-format
4414 msgid "Can not create the module file:\n"
4415 " %s"
4416@@ -3702,7 +3683,7 @@
4417 msgstr ""
4418
4419 #. module: base
4420-#: code:addons/base/ir/ir_mail_server.py:469
4421+#: code:addons/base/ir/ir_mail_server.py:465
4422 #, python-format
4423 msgid "Mail delivery failed via SMTP server '%s'.\n"
4424 "%s: %s"
4425@@ -3813,7 +3794,7 @@
4426 msgstr ""
4427
4428 #. module: base
4429-#: code:addons/orm.py:2247
4430+#: code:addons/orm.py:2246
4431 #, python-format
4432 msgid "Invalid Architecture!"
4433 msgstr ""
4434@@ -4239,7 +4220,6 @@
4435
4436 #. module: base
4437 #: field:ir.actions.server,srcmodel_id:0
4438-#: view:ir.filters:0
4439 #: field:ir.filters,model_id:0
4440 #: view:ir.model:0
4441 #: field:ir.model,model:0
4442@@ -4365,7 +4345,7 @@
4443 msgstr ""
4444
4445 #. module: base
4446-#: code:addons/base/res/res_config.py:388
4447+#: code:addons/base/res/res_config.py:387
4448 #, python-format
4449 msgid "Your database is now fully configured.\n"
4450 "\n"
4451@@ -4598,7 +4578,7 @@
4452 msgstr ""
4453
4454 #. module: base
4455-#: code:addons/orm.py:1540
4456+#: code:addons/orm.py:1539
4457 #, python-format
4458 msgid "Error occurred while validating the field(s) %s: %s"
4459 msgstr ""
4460@@ -4728,7 +4708,7 @@
4461 msgstr ""
4462
4463 #. module: base
4464-#: code:addons/base/ir/ir_model.py:373
4465+#: code:addons/base/ir/ir_model.py:366
4466 #, python-format
4467 msgid "Changing the storing system for field \"%s\" is not allowed."
4468 msgstr ""
4469@@ -4930,7 +4910,7 @@
4470 msgstr ""
4471
4472 #. module: base
4473-#: code:addons/base/ir/ir_model.py:421
4474+#: code:addons/base/ir/ir_model.py:414
4475 #, python-format
4476 msgid "Cannot rename column to %s, because that column already exists!"
4477 msgstr ""
4478@@ -4946,7 +4926,7 @@
4479 msgstr ""
4480
4481 #. module: base
4482-#: code:addons/orm.py:5319
4483+#: code:addons/orm.py:5318
4484 #, python-format
4485 msgid "Missing required value for the field '%s'."
4486 msgstr ""
4487@@ -5179,12 +5159,9 @@
4488 #: field:res.currency.rate.type,name:0
4489 #: field:res.groups,name:0
4490 #: field:res.lang,name:0
4491-#: view:res.partner:0
4492 #: field:res.partner,name:0
4493-#: view:res.partner.bank:0
4494 #: field:res.partner.bank.type,name:0
4495 #: field:res.request.link,name:0
4496-#: view:res.users:0
4497 #: field:workflow,name:0
4498 #: field:workflow.activity,name:0
4499 msgid "Name"
4500@@ -5541,11 +5518,6 @@
4501 msgstr ""
4502
4503 #. module: base
4504-#: view:base.language.import:0
4505-msgid "e.g. English"
4506-msgstr ""
4507-
4508-#. module: base
4509 #: help:ir.cron,numbercall:0
4510 msgid "How many times the method is called,\n"
4511 "a negative number indicates no limit."
4512@@ -5627,13 +5599,6 @@
4513 msgstr ""
4514
4515 #. module: base
4516-#: view:res.company:0
4517-#: view:res.partner:0
4518-#: view:res.users:0
4519-msgid "e.g. www.openerp.com"
4520-msgstr ""
4521-
4522-#. module: base
4523 #: selection:ir.cron,interval_type:0
4524 msgid "Hours"
4525 msgstr ""
4526@@ -5892,7 +5857,7 @@
4527 msgstr ""
4528
4529 #. module: base
4530-#: code:addons/orm.py:2247
4531+#: code:addons/orm.py:2246
4532 #, python-format
4533 msgid "There is no view of type '%s' defined for the structure!"
4534 msgstr ""
4535@@ -5929,7 +5894,7 @@
4536 msgstr ""
4537
4538 #. module: base
4539-#: code:addons/base/module/module.py:502
4540+#: code:addons/base/module/module.py:503
4541 #: view:ir.module.module:0
4542 #, python-format
4543 msgid "Uninstall"
4544@@ -6008,11 +5973,6 @@
4545 msgstr ""
4546
4547 #. module: base
4548-#: model:ir.ui.menu,name:base.menu_sales_followup
4549-msgid "Payment Follow-up"
4550-msgstr ""
4551-
4552-#. module: base
4553 #: model:res.country,name:base.cw
4554 msgid "Curaçao"
4555 msgstr ""
4556@@ -6148,7 +6108,7 @@
4557 msgstr ""
4558
4559 #. module: base
4560-#: code:addons/base/res/res_config.py:444
4561+#: code:addons/base/res/res_config.py:443
4562 #, python-format
4563 msgid "Cannot duplicate configuration!"
4564 msgstr ""
4565@@ -6200,6 +6160,7 @@
4566
4567 #. module: base
4568 #: model:ir.actions.act_window,name:base.action_module_open_categ
4569+#: model:ir.actions.act_window,name:base.open_module_tree
4570 #: field:ir.module.category,module_ids:0
4571 #: view:ir.module.module:0
4572 #: model:ir.ui.menu,name:base.menu_management
4573@@ -6349,7 +6310,7 @@
4574 msgstr ""
4575
4576 #. module: base
4577-#: code:addons/orm.py:4348
4578+#: code:addons/orm.py:4347
4579 #, python-format
4580 msgid "You cannot perform this operation. New Record Creation is not allowed for this object as this object is for reporting purpose."
4581 msgstr ""
4582@@ -6762,11 +6723,6 @@
4583 msgstr ""
4584
4585 #. module: base
4586-#: view:ir.filters:0
4587-msgid "Filters created by myself"
4588-msgstr ""
4589-
4590-#. module: base
4591 #: model:ir.module.module,shortdesc:base.module_l10n_hn
4592 msgid "Honduras - Accounting"
4593 msgstr ""
4594@@ -6809,7 +6765,7 @@
4595 msgstr ""
4596
4597 #. module: base
4598-#: code:addons/orm.py:2021
4599+#: code:addons/orm.py:2020
4600 #, python-format
4601 msgid "Insufficient fields for Calendar View!"
4602 msgstr ""
4603@@ -6846,7 +6802,6 @@
4604
4605 #. module: base
4606 #: field:ir.cron,active:0
4607-#: field:ir.mail_server,active:0
4608 #: field:ir.model.access,active:0
4609 #: field:ir.rule,active:0
4610 #: field:ir.sequence,active:0
4611@@ -6876,27 +6831,27 @@
4612 #: code:addons/base/ir/ir_actions.py:606
4613 #: code:addons/base/ir/ir_actions.py:702
4614 #: code:addons/base/ir/ir_actions.py:705
4615-#: code:addons/base/ir/ir_model.py:165
4616-#: code:addons/base/ir/ir_model.py:277
4617-#: code:addons/base/ir/ir_model.py:291
4618-#: code:addons/base/ir/ir_model.py:321
4619-#: code:addons/base/ir/ir_model.py:340
4620-#: code:addons/base/ir/ir_model.py:345
4621-#: code:addons/base/ir/ir_model.py:348
4622+#: code:addons/base/ir/ir_model.py:164
4623+#: code:addons/base/ir/ir_model.py:274
4624+#: code:addons/base/ir/ir_model.py:288
4625+#: code:addons/base/ir/ir_model.py:318
4626+#: code:addons/base/ir/ir_model.py:334
4627+#: code:addons/base/ir/ir_model.py:339
4628+#: code:addons/base/ir/ir_model.py:342
4629 #: code:addons/base/ir/ir_translation.py:341
4630 #: code:addons/base/module/module.py:320
4631 #: code:addons/base/module/module.py:362
4632 #: code:addons/base/module/module.py:366
4633 #: code:addons/base/module/module.py:372
4634-#: code:addons/base/module/module.py:499
4635-#: code:addons/base/module/module.py:525
4636-#: code:addons/base/module/module.py:539
4637-#: code:addons/base/module/module.py:644
4638+#: code:addons/base/module/module.py:500
4639+#: code:addons/base/module/module.py:526
4640+#: code:addons/base/module/module.py:540
4641+#: code:addons/base/module/module.py:645
4642 #: code:addons/base/res/res_currency.py:193
4643 #: code:addons/base/res/res_users.py:98
4644 #: code:addons/custom.py:555
4645-#: code:addons/orm.py:787
4646-#: code:addons/orm.py:3961
4647+#: code:addons/orm.py:785
4648+#: code:addons/orm.py:3960
4649 #, python-format
4650 msgid "Error"
4651 msgstr ""
4652@@ -6964,12 +6919,6 @@
4653
4654 #. module: base
4655 #: view:res.partner:0
4656-#: view:res.users:0
4657-msgid "Tags..."
4658-msgstr ""
4659-
4660-#. module: base
4661-#: view:res.partner:0
4662 msgid "at"
4663 msgstr ""
4664
4665@@ -6994,11 +6943,6 @@
4666 msgstr ""
4667
4668 #. module: base
4669-#: view:ir.filters:0
4670-msgid "My filters"
4671-msgstr ""
4672-
4673-#. module: base
4674 #: field:res.lang,iso_code:0
4675 msgid "ISO code"
4676 msgstr ""
4677@@ -7137,7 +7081,6 @@
4678 #: field:res.bank,street:0
4679 #: field:res.company,street:0
4680 #: field:res.partner,street:0
4681-#: view:res.partner.bank:0
4682 #: field:res.partner.bank,street:0
4683 msgid "Street"
4684 msgstr ""
4685@@ -7326,7 +7269,7 @@
4686 msgstr ""
4687
4688 #. module: base
4689-#: code:addons/base/res/res_users.py:473
4690+#: code:addons/base/res/res_users.py:467
4691 #, python-format
4692 msgid "Setting empty passwords is not allowed for security reasons!"
4693 msgstr ""
4694@@ -7337,13 +7280,13 @@
4695 msgstr ""
4696
4697 #. module: base
4698-#: code:addons/base/ir/ir_model.py:728
4699+#: code:addons/base/ir/ir_model.py:720
4700 #, python-format
4701 msgid "Sorry, you are not allowed to modify this document."
4702 msgstr ""
4703
4704 #. module: base
4705-#: code:addons/base/res/res_config.py:350
4706+#: code:addons/base/res/res_config.py:349
4707 #, python-format
4708 msgid "\n"
4709 "\n"
4710@@ -7521,7 +7464,7 @@
4711 msgstr ""
4712
4713 #. module: base
4714-#: code:addons/base/module/module.py:539
4715+#: code:addons/base/module/module.py:540
4716 #, python-format
4717 msgid "You try to upgrade a module that depends on the module: %s.\n"
4718 "But this module is not available in your system."
4719@@ -7654,12 +7597,6 @@
4720 msgstr ""
4721
4722 #. module: base
4723-#: code:addons/orm.py:5334
4724-#, python-format
4725-msgid "The value for the field '%s' already exists."
4726-msgstr ""
4727-
4728-#. module: base
4729 #: field:workflow.workitem,inst_id:0
4730 msgid "Instance"
4731 msgstr ""
4732@@ -7685,7 +7622,7 @@
4733 msgstr ""
4734
4735 #. module: base
4736-#: code:addons/base/ir/ir_model.py:340
4737+#: code:addons/base/ir/ir_model.py:334
4738 #, python-format
4739 msgid "For selection fields, the Selection Options must be given!"
4740 msgstr ""
4741@@ -7983,7 +7920,7 @@
4742 msgstr ""
4743
4744 #. module: base
4745-#: code:addons/orm.py:2818
4746+#: code:addons/orm.py:2817
4747 #, python-format
4748 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
4749 msgstr ""
4750@@ -8044,7 +7981,7 @@
4751 msgstr ""
4752
4753 #. module: base
4754-#: code:addons/orm.py:3903
4755+#: code:addons/orm.py:3902
4756 #, python-format
4757 msgid "For this kind of document, you may only access records you created yourself.\n"
4758 "\n"
4759@@ -8062,7 +7999,7 @@
4760 msgstr ""
4761
4762 #. module: base
4763-#: code:addons/base/ir/ir_mail_server.py:444
4764+#: code:addons/base/ir/ir_mail_server.py:440
4765 #, python-format
4766 msgid "Missing SMTP Server"
4767 msgstr ""
4768@@ -8094,7 +8031,7 @@
4769 msgstr ""
4770
4771 #. module: base
4772-#: code:addons/base/ir/ir_model.py:730
4773+#: code:addons/base/ir/ir_model.py:722
4774 #, python-format
4775 msgid "Sorry, you are not allowed to delete this document."
4776 msgstr ""
4777@@ -8183,7 +8120,7 @@
4778 msgstr ""
4779
4780 #. module: base
4781-#: code:addons/base/ir/ir_mail_server.py:221
4782+#: code:addons/base/ir/ir_mail_server.py:219
4783 #, python-format
4784 msgid "Everything seems properly set up!"
4785 msgstr ""
4786@@ -8211,8 +8148,8 @@
4787 msgstr ""
4788
4789 #. module: base
4790-#: code:addons/orm.py:4246
4791-#: code:addons/orm.py:4347
4792+#: code:addons/orm.py:4245
4793+#: code:addons/orm.py:4346
4794 #, python-format
4795 msgid "UserError"
4796 msgstr ""
4797@@ -8233,7 +8170,7 @@
4798 msgstr ""
4799
4800 #. module: base
4801-#: code:addons/orm.py:3961
4802+#: code:addons/orm.py:3960
4803 #, python-format
4804 msgid "Unable to delete this document because it is used as a default property"
4805 msgstr ""
4806@@ -8352,7 +8289,7 @@
4807 msgstr ""
4808
4809 #. module: base
4810-#: code:addons/base/ir/ir_model.py:423
4811+#: code:addons/base/ir/ir_model.py:416
4812 #, python-format
4813 msgid "New column name must still start with x_ , because it is a custom field!"
4814 msgstr ""
4815@@ -8390,8 +8327,8 @@
4816 msgstr ""
4817
4818 #. module: base
4819-#: code:addons/orm.py:4152
4820-#: code:addons/orm.py:4685
4821+#: code:addons/orm.py:4151
4822+#: code:addons/orm.py:4684
4823 #, python-format
4824 msgid "AccessError"
4825 msgstr ""
4826@@ -8462,7 +8399,7 @@
4827 msgstr ""
4828
4829 #. module: base
4830-#: code:addons/base/ir/ir_mail_server.py:240
4831+#: code:addons/base/ir/ir_mail_server.py:238
4832 #, python-format
4833 msgid "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should do the trick."
4834 msgstr ""
4835@@ -8585,10 +8522,8 @@
4836 msgstr ""
4837
4838 #. module: base
4839-#. openerp-web
4840-#: code:addons/base/static/src/js/apps.js:103
4841-#, python-format
4842-msgid "OpenERP Apps Unreachable"
4843+#: model:ir.module.module,shortdesc:base.module_hr_expense
4844+msgid "Expense Management"
4845 msgstr ""
4846
4847 #. module: base
4848@@ -8662,13 +8597,13 @@
4849 msgstr ""
4850
4851 #. module: base
4852-#: code:addons/base/module/module.py:499
4853+#: code:addons/base/module/module.py:500
4854 #, python-format
4855 msgid "The `base` module cannot be uninstalled"
4856 msgstr ""
4857
4858 #. module: base
4859-#: code:addons/base/ir/ir_cron.py:254
4860+#: code:addons/base/ir/ir_cron.py:247
4861 #, python-format
4862 msgid "Record cannot be modified right now"
4863 msgstr ""
4864@@ -8689,7 +8624,7 @@
4865 msgstr ""
4866
4867 #. module: base
4868-#: code:addons/base/ir/ir_model.py:729
4869+#: code:addons/base/ir/ir_model.py:721
4870 #, python-format
4871 msgid "Sorry, you are not allowed to create this kind of document."
4872 msgstr ""
4873@@ -8737,7 +8672,7 @@
4874 msgstr ""
4875
4876 #. module: base
4877-#: code:addons/base/ir/ir_model.py:348
4878+#: code:addons/base/ir/ir_model.py:342
4879 #, python-format
4880 msgid "Model %s does not exist!"
4881 msgstr ""
4882@@ -8789,7 +8724,7 @@
4883 msgstr ""
4884
4885 #. module: base
4886-#: code:addons/orm.py:1507
4887+#: code:addons/orm.py:1506
4888 #, python-format
4889 msgid "Unknown database identifier '%s'"
4890 msgstr ""
4891@@ -8987,7 +8922,7 @@
4892 msgstr ""
4893
4894 #. module: base
4895-#: code:addons/base/res/res_config.py:387
4896+#: code:addons/base/res/res_config.py:386
4897 #, python-format
4898 msgid "Click 'Continue' to configure the next addon..."
4899 msgstr ""
4900@@ -9046,15 +8981,8 @@
4901 msgstr ""
4902
4903 #. module: base
4904-#: code:addons/base/module/module.py:670
4905-#, python-format
4906-msgid "The `%s` module appears to be unavailable at the moment, please try again later."
4907-msgstr ""
4908-
4909-#. module: base
4910 #: view:ir.attachment:0
4911 #: view:ir.cron:0
4912-#: view:ir.filters:0
4913 #: view:ir.model.access:0
4914 #: view:ir.model.data:0
4915 #: view:ir.model.fields:0
4916@@ -9305,7 +9233,7 @@
4917 msgstr ""
4918
4919 #. module: base
4920-#: code:addons/orm.py:4647
4921+#: code:addons/orm.py:4646
4922 #, python-format
4923 msgid "This method does not exist anymore"
4924 msgstr ""
4925@@ -9415,14 +9343,6 @@
4926 msgstr ""
4927
4928 #. module: base
4929-#: view:res.bank:0
4930-#: view:res.company:0
4931-#: view:res.partner:0
4932-#: view:res.users:0
4933-msgid "Street..."
4934-msgstr ""
4935-
4936-#. module: base
4937 #: constraint:res.users:0
4938 msgid "The chosen company is not in the allowed companies for this user"
4939 msgstr ""
4940@@ -9625,15 +9545,10 @@
4941 msgstr ""
4942
4943 #. module: base
4944-#: view:res.bank:0
4945 #: field:res.bank,city:0
4946-#: view:res.company:0
4947 #: field:res.company,city:0
4948-#: view:res.partner:0
4949 #: field:res.partner,city:0
4950-#: view:res.partner.bank:0
4951 #: field:res.partner.bank,city:0
4952-#: view:res.users:0
4953 msgid "City"
4954 msgstr ""
4955
4956@@ -9679,7 +9594,7 @@
4957 msgstr ""
4958
4959 #. module: base
4960-#: code:addons/orm.py:2033
4961+#: code:addons/orm.py:2032
4962 #, python-format
4963 msgid "Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay"
4964 msgstr ""
4965@@ -9755,13 +9670,13 @@
4966 msgstr ""
4967
4968 #. module: base
4969-#: code:addons/base/ir/ir_model.py:736
4970+#: code:addons/base/ir/ir_model.py:728
4971 #, python-format
4972 msgid "Please contact your system administrator if you think this is an error."
4973 msgstr ""
4974
4975 #. module: base
4976-#: code:addons/base/module/module.py:545
4977+#: code:addons/base/module/module.py:546
4978 #: view:base.module.upgrade:0
4979 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
4980 #, python-format
4981@@ -9800,7 +9715,7 @@
4982 msgstr ""
4983
4984 #. module: base
4985-#: code:addons/orm.py:3872
4986+#: code:addons/orm.py:3871
4987 #, python-format
4988 msgid "One of the documents you are trying to access has been deleted, please try again after refreshing."
4989 msgstr ""
4990@@ -10020,9 +9935,9 @@
4991 msgstr ""
4992
4993 #. module: base
4994-#: code:addons/base/ir/ir_model.py:510
4995-#: code:addons/base/ir/ir_model.py:571
4996-#: code:addons/base/ir/ir_model.py:1032
4997+#: code:addons/base/ir/ir_model.py:502
4998+#: code:addons/base/ir/ir_model.py:563
4999+#: code:addons/base/ir/ir_model.py:1024
5000 #, python-format
The diff has been truncated for viewing.