Merge lp:~ludo-neobis/openobject-server/fix_for_bug_1180692 into lp:openobject-server
- fix_for_bug_1180692
- Merge into trunk
Proposed by
Ludo (Neobis)
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~ludo-neobis/openobject-server/fix_for_bug_1180692 | ||||
Merge into: | lp:openobject-server | ||||
Diff against target: |
1551 lines (+722/-84) (has conflicts) 29 files modified
debian/copyright (+4/-4) history/check_profile_l10n_all.py (+0/-1) history/gen_graph.sh (+1/-1) openerp-wsgi.py (+0/-1) openerp/addons/base/i18n/de.po (+15/-0) openerp/addons/base/i18n/et.po (+14/-0) openerp/addons/base/i18n/fr.po (+64/-24) openerp/addons/base/i18n/id.po (+15/-1) openerp/addons/base/i18n/lt.po (+138/-3) openerp/addons/base/i18n/ro.po (+14/-0) openerp/addons/base/i18n/tr.po (+30/-0) openerp/addons/base/ir/ir_ui_menu.py (+25/-0) openerp/addons/base/res/res_partner.py (+3/-2) openerp/addons/base/res/res_partner_view.xml (+2/-2) openerp/addons/base/tests/test_base.py (+18/-0) openerp/addons/base_quality_interrogation.py.OTHER (+353/-0) openerp/cli/server.py (+0/-1) openerp/modules/loading.py (+4/-0) openerp/netsvc.py (+0/-1) openerp/osv/expression.py (+0/-1) openerp/report/render/rml2html/rml2html.py (+1/-1) openerp/report/render/rml2html/utils.py (+1/-1) openerp/report/render/rml2pdf/utils.py (+4/-20) openerp/service/cron.py (+0/-1) openerp/service/http_server.py (+1/-1) openerp/service/websrv_lib.py (+1/-1) openerp/tools/amount_to_text.py (+13/-15) setup.nsi (+1/-1) setup.py (+0/-1) Text conflict in openerp/addons/base/i18n/de.po Text conflict in openerp/addons/base/i18n/et.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/lt.po Text conflict in openerp/addons/base/i18n/ro.po Text conflict in openerp/addons/base/i18n/tr.po Contents conflict in openerp/addons/base_quality_interrogation.py Text conflict in openerp/modules/loading.py |
||||
To merge this branch: | bzr merge lp:~ludo-neobis/openobject-server/fix_for_bug_1180692 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Dutch Team - Nederland | code | Pending | |
Review via email: mp+164093@code.launchpad.net |
This proposal has been superseded by a proposal from 2013-05-16.
Commit message
Description of the change
Fix for bug 1180692, concerning the amount_to_text file from tools.
Please review.
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote : | # |
Unmerged revisions
- 4976. By Ludo van Zuylen <ludo@neosws03>
-
[FIX] - Fixed the representation of the dutch text. Style according to the site from "Onze Taal" (onzetaal.nl).
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/copyright' | |||
2 | --- debian/copyright 2011-10-06 00:18:10 +0000 | |||
3 | +++ debian/copyright 2013-05-16 08:48:42 +0000 | |||
4 | @@ -40,7 +40,7 @@ | |||
5 | 40 | . | 40 | . |
6 | 41 | You should have received a copy of the GNU General Public License | 41 | You should have received a copy of the GNU General Public License |
7 | 42 | along with this program; if not, write to the Free Software | 42 | along with this program; if not, write to the Free Software |
9 | 43 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 43 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
10 | 44 | . | 44 | . |
11 | 45 | On Debian systems, the complete text of the GNU General Public License | 45 | On Debian systems, the complete text of the GNU General Public License |
12 | 46 | can be found in /usr/share/common-licenses/GPL-2 file. | 46 | can be found in /usr/share/common-licenses/GPL-2 file. |
13 | @@ -93,7 +93,7 @@ | |||
14 | 93 | . | 93 | . |
15 | 94 | You should have received a copy of the GNU Library General Public | 94 | You should have received a copy of the GNU Library General Public |
16 | 95 | License along with this library; if not, write to the Free | 95 | License along with this library; if not, write to the Free |
18 | 96 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 96 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
19 | 97 | . | 97 | . |
20 | 98 | On Debian systems, the complete text of the GNU Library General Public License | 98 | On Debian systems, the complete text of the GNU Library General Public License |
21 | 99 | can be found in /usr/share/common-licenses/LGPL-2.1 file. | 99 | can be found in /usr/share/common-licenses/LGPL-2.1 file. |
22 | @@ -137,7 +137,7 @@ | |||
23 | 137 | . | 137 | . |
24 | 138 | You should have received a copy of the GNU General Public License | 138 | You should have received a copy of the GNU General Public License |
25 | 139 | along with this program; if not, write to the Free Software | 139 | along with this program; if not, write to the Free Software |
27 | 140 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 140 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
28 | 141 | . | 141 | . |
29 | 142 | On Debian systems, the complete text of the GNU General Public License | 142 | On Debian systems, the complete text of the GNU General Public License |
30 | 143 | can be found in /usr/share/common-licenses/GPL-2 file. | 143 | can be found in /usr/share/common-licenses/GPL-2 file. |
31 | @@ -159,7 +159,7 @@ | |||
32 | 159 | . | 159 | . |
33 | 160 | You should have received a copy of the GNU General Public License | 160 | You should have received a copy of the GNU General Public License |
34 | 161 | along with this program; if not, write to the Free Software | 161 | along with this program; if not, write to the Free Software |
36 | 162 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 162 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
37 | 163 | . | 163 | . |
38 | 164 | On Debian systems, the complete text of the GNU General Public License | 164 | On Debian systems, the complete text of the GNU General Public License |
39 | 165 | can be found in /usr/share/common-licenses/GPL-2 file. | 165 | can be found in /usr/share/common-licenses/GPL-2 file. |
40 | 166 | 166 | ||
41 | === modified file 'history/check_profile_l10n_all.py' | |||
42 | --- history/check_profile_l10n_all.py 2011-11-07 15:45:01 +0000 | |||
43 | +++ history/check_profile_l10n_all.py 2013-05-16 08:48:42 +0000 | |||
44 | @@ -1,4 +1,3 @@ | |||
45 | 1 | #!/usr/bin/env python | ||
46 | 2 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
47 | 3 | ############################################################################## | 2 | ############################################################################## |
48 | 4 | # | 3 | # |
49 | 5 | 4 | ||
50 | === modified file 'history/gen_graph.sh' | |||
51 | --- history/gen_graph.sh 2011-09-26 00:54:44 +0000 | |||
52 | +++ history/gen_graph.sh 2013-05-16 08:48:42 +0000 | |||
53 | @@ -24,7 +24,7 @@ | |||
54 | 24 | # | 24 | # |
55 | 25 | # You should have received a copy of the GNU General Public License | 25 | # You should have received a copy of the GNU General Public License |
56 | 26 | # along with this program; if not, write to the Free Software | 26 | # along with this program; if not, write to the Free Software |
58 | 27 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 27 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
59 | 28 | # | 28 | # |
60 | 29 | ############################################################################## | 29 | ############################################################################## |
61 | 30 | 30 | ||
62 | 31 | 31 | ||
63 | === modified file 'openerp-wsgi.py' | |||
64 | --- openerp-wsgi.py 2012-09-24 10:50:11 +0000 | |||
65 | +++ openerp-wsgi.py 2013-05-16 08:48:42 +0000 | |||
66 | @@ -1,4 +1,3 @@ | |||
67 | 1 | #!/usr/bin/python | ||
68 | 2 | # WSGI Handler sample configuration file. | 1 | # WSGI Handler sample configuration file. |
69 | 3 | # | 2 | # |
70 | 4 | # Change the appropriate settings below, in order to provide the parameters | 3 | # Change the appropriate settings below, in order to provide the parameters |
71 | 5 | 4 | ||
72 | === modified file 'openerp/addons/base/i18n/de.po' | |||
73 | --- openerp/addons/base/i18n/de.po 2013-05-10 05:51:58 +0000 | |||
74 | +++ openerp/addons/base/i18n/de.po 2013-05-16 08:48:42 +0000 | |||
75 | @@ -5,17 +5,32 @@ | |||
76 | 5 | # Ferdinand Gassauer <f.gassauer@chricar.at>, 2010. | 5 | # Ferdinand Gassauer <f.gassauer@chricar.at>, 2010. |
77 | 6 | msgid "" | 6 | msgid "" |
78 | 7 | msgstr "" | 7 | msgstr "" |
79 | 8 | <<<<<<< TREE | ||
80 | 8 | "Project-Id-Version: OpenERP Server 5.0.4\n" | 9 | "Project-Id-Version: OpenERP Server 5.0.4\n" |
81 | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 10 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
82 | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 11 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
83 | 11 | "PO-Revision-Date: 2012-12-22 01:32+0000\n" | 12 | "PO-Revision-Date: 2012-12-22 01:32+0000\n" |
84 | 12 | "Last-Translator: Felix Schubert <Unknown>\n" | 13 | "Last-Translator: Felix Schubert <Unknown>\n" |
85 | 13 | "Language-Team: German <kde-i18n-doc@kde.org>\n" | 14 | "Language-Team: German <kde-i18n-doc@kde.org>\n" |
86 | 15 | ======= | ||
87 | 16 | "Project-Id-Version: openobject-server\n" | ||
88 | 17 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
89 | 18 | "POT-Creation-Date: 2013-03-07 08:36+0000\n" | ||
90 | 19 | "PO-Revision-Date: 2013-04-24 12:39+0000\n" | ||
91 | 20 | "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-" | ||
92 | 21 | "consulting.net>\n" | ||
93 | 22 | "Language-Team: German <de@li.org>\n" | ||
94 | 23 | >>>>>>> MERGE-SOURCE | ||
95 | 14 | "MIME-Version: 1.0\n" | 24 | "MIME-Version: 1.0\n" |
96 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 25 | "Content-Type: text/plain; charset=UTF-8\n" |
97 | 16 | "Content-Transfer-Encoding: 8bit\n" | 26 | "Content-Transfer-Encoding: 8bit\n" |
98 | 27 | <<<<<<< TREE | ||
99 | 17 | "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n" | 28 | "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n" |
100 | 18 | "X-Generator: Launchpad (build 16598)\n" | 29 | "X-Generator: Launchpad (build 16598)\n" |
101 | 30 | ======= | ||
102 | 31 | "X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n" | ||
103 | 32 | "X-Generator: Launchpad (build 16580)\n" | ||
104 | 33 | >>>>>>> MERGE-SOURCE | ||
105 | 19 | 34 | ||
106 | 20 | #. module: base | 35 | #. module: base |
107 | 21 | #: model:ir.module.module,description:base.module_account_check_writing | 36 | #: model:ir.module.module,description:base.module_account_check_writing |
108 | 22 | 37 | ||
109 | === modified file 'openerp/addons/base/i18n/et.po' | |||
110 | --- openerp/addons/base/i18n/et.po 2013-05-10 05:51:58 +0000 | |||
111 | +++ openerp/addons/base/i18n/et.po 2013-05-16 08:48:42 +0000 | |||
112 | @@ -4,17 +4,31 @@ | |||
113 | 4 | # | 4 | # |
114 | 5 | msgid "" | 5 | msgid "" |
115 | 6 | msgstr "" | 6 | msgstr "" |
116 | 7 | <<<<<<< TREE | ||
117 | 7 | "Project-Id-Version: OpenERP Server 5.0.4\n" | 8 | "Project-Id-Version: OpenERP Server 5.0.4\n" |
118 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
119 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
120 | 10 | "PO-Revision-Date: 2012-12-21 18:17+0000\n" | 11 | "PO-Revision-Date: 2012-12-21 18:17+0000\n" |
121 | 11 | "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n" | 12 | "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n" |
122 | 12 | "Language-Team: \n" | 13 | "Language-Team: \n" |
123 | 14 | ======= | ||
124 | 15 | "Project-Id-Version: openobject-server\n" | ||
125 | 16 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
126 | 17 | "POT-Creation-Date: 2013-03-07 08:36+0000\n" | ||
127 | 18 | "PO-Revision-Date: 2013-04-25 15:21+0000\n" | ||
128 | 19 | "Last-Translator: Illimar Saatväli <is@hot.ee>\n" | ||
129 | 20 | "Language-Team: Estonian <et@li.org>\n" | ||
130 | 21 | >>>>>>> MERGE-SOURCE | ||
131 | 13 | "MIME-Version: 1.0\n" | 22 | "MIME-Version: 1.0\n" |
132 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 23 | "Content-Type: text/plain; charset=UTF-8\n" |
133 | 15 | "Content-Transfer-Encoding: 8bit\n" | 24 | "Content-Transfer-Encoding: 8bit\n" |
134 | 25 | <<<<<<< TREE | ||
135 | 16 | "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n" | 26 | "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n" |
136 | 17 | "X-Generator: Launchpad (build 16598)\n" | 27 | "X-Generator: Launchpad (build 16598)\n" |
137 | 28 | ======= | ||
138 | 29 | "X-Launchpad-Export-Date: 2013-04-26 06:23+0000\n" | ||
139 | 30 | "X-Generator: Launchpad (build 16580)\n" | ||
140 | 31 | >>>>>>> MERGE-SOURCE | ||
141 | 18 | 32 | ||
142 | 19 | #. module: base | 33 | #. module: base |
143 | 20 | #: model:ir.module.module,description:base.module_account_check_writing | 34 | #: model:ir.module.module,description:base.module_account_check_writing |
144 | 21 | 35 | ||
145 | === modified file 'openerp/addons/base/i18n/fr.po' | |||
146 | --- openerp/addons/base/i18n/fr.po 2013-05-10 05:51:58 +0000 | |||
147 | +++ openerp/addons/base/i18n/fr.po 2013-05-16 08:48:42 +0000 | |||
148 | @@ -4,17 +4,31 @@ | |||
149 | 4 | # | 4 | # |
150 | 5 | msgid "" | 5 | msgid "" |
151 | 6 | msgstr "" | 6 | msgstr "" |
152 | 7 | <<<<<<< TREE | ||
153 | 7 | "Project-Id-Version: OpenERP Server 5.0.4\n" | 8 | "Project-Id-Version: OpenERP Server 5.0.4\n" |
154 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
155 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
156 | 10 | "PO-Revision-Date: 2012-12-06 10:07+0000\n" | 11 | "PO-Revision-Date: 2012-12-06 10:07+0000\n" |
157 | 11 | "Last-Translator: Quentin THEURET <Unknown>\n" | 12 | "Last-Translator: Quentin THEURET <Unknown>\n" |
158 | 12 | "Language-Team: \n" | 13 | "Language-Team: \n" |
159 | 14 | ======= | ||
160 | 15 | "Project-Id-Version: openobject-server\n" | ||
161 | 16 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
162 | 17 | "POT-Creation-Date: 2013-03-07 08:36+0000\n" | ||
163 | 18 | "PO-Revision-Date: 2013-05-13 14:03+0000\n" | ||
164 | 19 | "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n" | ||
165 | 20 | "Language-Team: French <fr@li.org>\n" | ||
166 | 21 | >>>>>>> MERGE-SOURCE | ||
167 | 13 | "MIME-Version: 1.0\n" | 22 | "MIME-Version: 1.0\n" |
168 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 23 | "Content-Type: text/plain; charset=UTF-8\n" |
169 | 15 | "Content-Transfer-Encoding: 8bit\n" | 24 | "Content-Transfer-Encoding: 8bit\n" |
170 | 25 | <<<<<<< TREE | ||
171 | 16 | "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n" | 26 | "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n" |
172 | 17 | "X-Generator: Launchpad (build 16598)\n" | 27 | "X-Generator: Launchpad (build 16598)\n" |
173 | 28 | ======= | ||
174 | 29 | "X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n" | ||
175 | 30 | "X-Generator: Launchpad (build 16617)\n" | ||
176 | 31 | >>>>>>> MERGE-SOURCE | ||
177 | 18 | 32 | ||
178 | 19 | #. module: base | 33 | #. module: base |
179 | 20 | #: model:ir.module.module,description:base.module_account_check_writing | 34 | #: model:ir.module.module,description:base.module_account_check_writing |
180 | @@ -601,7 +615,7 @@ | |||
181 | 601 | #. module: base | 615 | #. module: base |
182 | 602 | #: model:ir.module.module,summary:base.module_hr | 616 | #: model:ir.module.module,summary:base.module_hr |
183 | 603 | msgid "Jobs, Departments, Employees Details" | 617 | msgid "Jobs, Departments, Employees Details" |
185 | 604 | msgstr "Postes, Départements, Détail des Employés" | 618 | msgstr "Postes, départements, coordonnées des employés" |
186 | 605 | 619 | ||
187 | 606 | #. module: base | 620 | #. module: base |
188 | 607 | #: model:ir.module.module,description:base.module_analytic | 621 | #: model:ir.module.module,description:base.module_analytic |
189 | @@ -1262,7 +1276,7 @@ | |||
190 | 1262 | #. module: base | 1276 | #. module: base |
191 | 1263 | #: model:ir.module.module,shortdesc:base.module_fleet | 1277 | #: model:ir.module.module,shortdesc:base.module_fleet |
192 | 1264 | msgid "Fleet Management" | 1278 | msgid "Fleet Management" |
194 | 1265 | msgstr "Gestion de flotte" | 1279 | msgstr "Parc automobile" |
195 | 1266 | 1280 | ||
196 | 1267 | #. module: base | 1281 | #. module: base |
197 | 1268 | #: help:ir.server.object.lines,value:0 | 1282 | #: help:ir.server.object.lines,value:0 |
198 | @@ -6817,7 +6831,7 @@ | |||
199 | 6817 | #. module: base | 6831 | #. module: base |
200 | 6818 | #: model:ir.module.module,summary:base.module_mrp | 6832 | #: model:ir.module.module,summary:base.module_mrp |
201 | 6819 | msgid "Manufacturing Orders, Bill of Materials, Routing" | 6833 | msgid "Manufacturing Orders, Bill of Materials, Routing" |
203 | 6820 | msgstr "Ordres de fabrication, Nomenclature, Gammes opératoire" | 6834 | msgstr "Ordres de fabrication, nomenclature, gammes opératoires" |
204 | 6821 | 6835 | ||
205 | 6822 | #. module: base | 6836 | #. module: base |
206 | 6823 | #: field:ir.attachment,name:0 | 6837 | #: field:ir.attachment,name:0 |
207 | @@ -8961,7 +8975,16 @@ | |||
208 | 8961 | #. module: base | 8975 | #. module: base |
209 | 8962 | #: field:change.password.user,user_login:0 | 8976 | #: field:change.password.user,user_login:0 |
210 | 8963 | msgid "User Login" | 8977 | msgid "User Login" |
212 | 8964 | msgstr "Identifiant" | 8978 | <<<<<<< TREE |
213 | 8979 | msgstr "Identifiant" | ||
214 | 8980 | ======= | ||
215 | 8981 | msgstr "Identifiant" | ||
216 | 8982 | |||
217 | 8983 | #. module: base | ||
218 | 8984 | #: view:ir.filters:0 | ||
219 | 8985 | msgid "Filters created by myself" | ||
220 | 8986 | msgstr "Mes filtres" | ||
221 | 8987 | >>>>>>> MERGE-SOURCE | ||
222 | 8965 | 8988 | ||
223 | 8966 | #. module: base | 8989 | #. module: base |
224 | 8967 | #: model:ir.module.module,shortdesc:base.module_l10n_hn | 8990 | #: model:ir.module.module,shortdesc:base.module_l10n_hn |
225 | @@ -9136,7 +9159,7 @@ | |||
226 | 9136 | #. module: base | 9159 | #. module: base |
227 | 9137 | #: view:ir.cron:0 | 9160 | #: view:ir.cron:0 |
228 | 9138 | msgid "Scheduled Action" | 9161 | msgid "Scheduled Action" |
230 | 9139 | msgstr "" | 9162 | msgstr "Action plannifiée" |
231 | 9140 | 9163 | ||
232 | 9141 | #. module: base | 9164 | #. module: base |
233 | 9142 | #: model:res.country,name:base.bi | 9165 | #: model:res.country,name:base.bi |
234 | @@ -9184,6 +9207,15 @@ | |||
235 | 9184 | 9207 | ||
236 | 9185 | #. module: base | 9208 | #. module: base |
237 | 9186 | #: view:res.partner:0 | 9209 | #: view:res.partner:0 |
238 | 9210 | <<<<<<< TREE | ||
239 | 9211 | ======= | ||
240 | 9212 | #: view:res.users:0 | ||
241 | 9213 | msgid "Tags..." | ||
242 | 9214 | msgstr "Étiquettes..." | ||
243 | 9215 | |||
244 | 9216 | #. module: base | ||
245 | 9217 | #: view:res.partner:0 | ||
246 | 9218 | >>>>>>> MERGE-SOURCE | ||
247 | 9187 | msgid "at" | 9219 | msgid "at" |
248 | 9188 | msgstr "" | 9220 | msgstr "" |
249 | 9189 | 9221 | ||
250 | @@ -9208,6 +9240,14 @@ | |||
251 | 9208 | msgstr "Format de fichier" | 9240 | msgstr "Format de fichier" |
252 | 9209 | 9241 | ||
253 | 9210 | #. module: base | 9242 | #. module: base |
254 | 9243 | <<<<<<< TREE | ||
255 | 9244 | ======= | ||
256 | 9245 | #: view:ir.filters:0 | ||
257 | 9246 | msgid "My filters" | ||
258 | 9247 | msgstr "Mes filtres" | ||
259 | 9248 | |||
260 | 9249 | #. module: base | ||
261 | 9250 | >>>>>>> MERGE-SOURCE | ||
262 | 9211 | #: field:res.lang,iso_code:0 | 9251 | #: field:res.lang,iso_code:0 |
263 | 9212 | msgid "ISO code" | 9252 | msgid "ISO code" |
264 | 9213 | msgstr "Code ISO" | 9253 | msgstr "Code ISO" |
265 | @@ -9451,7 +9491,7 @@ | |||
266 | 9451 | #. module: base | 9491 | #. module: base |
267 | 9452 | #: view:base.language.export:0 | 9492 | #: view:base.language.export:0 |
268 | 9453 | msgid "Launchpad" | 9493 | msgid "Launchpad" |
270 | 9454 | msgstr "" | 9494 | msgstr "Launchpad" |
271 | 9455 | 9495 | ||
272 | 9456 | #. module: base | 9496 | #. module: base |
273 | 9457 | #: help:res.currency.rate,currency_rate_type_id:0 | 9497 | #: help:res.currency.rate,currency_rate_type_id:0 |
274 | @@ -9519,7 +9559,7 @@ | |||
275 | 9519 | #. module: base | 9559 | #. module: base |
276 | 9520 | #: model:ir.module.module,summary:base.module_account_accountant | 9560 | #: model:ir.module.module,summary:base.module_account_accountant |
277 | 9521 | msgid "Financial and Analytic Accounting" | 9561 | msgid "Financial and Analytic Accounting" |
279 | 9522 | msgstr "" | 9562 | msgstr "Comptabilité financière et analytique" |
280 | 9523 | 9563 | ||
281 | 9524 | #. module: base | 9564 | #. module: base |
282 | 9525 | #: model:ir.module.module,shortdesc:base.module_portal_project | 9565 | #: model:ir.module.module,shortdesc:base.module_portal_project |
283 | @@ -9542,7 +9582,7 @@ | |||
284 | 9542 | #: view:res.partner:0 | 9582 | #: view:res.partner:0 |
285 | 9543 | #: field:res.partner,user_id:0 | 9583 | #: field:res.partner,user_id:0 |
286 | 9544 | msgid "Salesperson" | 9584 | msgid "Salesperson" |
288 | 9545 | msgstr "" | 9585 | msgstr "Vendeur" |
289 | 9546 | 9586 | ||
290 | 9547 | #. module: base | 9587 | #. module: base |
291 | 9548 | #: view:res.lang:0 | 9588 | #: view:res.lang:0 |
292 | @@ -9614,7 +9654,7 @@ | |||
293 | 9614 | #: code:addons/base/ir/ir_model.py:728 | 9654 | #: code:addons/base/ir/ir_model.py:728 |
294 | 9615 | #, python-format | 9655 | #, python-format |
295 | 9616 | msgid "Sorry, you are not allowed to modify this document." | 9656 | msgid "Sorry, you are not allowed to modify this document." |
297 | 9617 | msgstr "" | 9657 | msgstr "Désolé, vous n’êtes pas autorisé à modifier ce document." |
298 | 9618 | 9658 | ||
299 | 9619 | #. module: base | 9659 | #. module: base |
300 | 9620 | #: code:addons/base/res/res_config.py:350 | 9660 | #: code:addons/base/res/res_config.py:350 |
301 | @@ -9705,7 +9745,7 @@ | |||
302 | 9705 | #. module: base | 9745 | #. module: base |
303 | 9706 | #: model:res.partner.category,name:base.res_partner_category_13 | 9746 | #: model:res.partner.category,name:base.res_partner_category_13 |
304 | 9707 | msgid "Distributor" | 9747 | msgid "Distributor" |
306 | 9708 | msgstr "" | 9748 | msgstr "Distributeur" |
307 | 9709 | 9749 | ||
308 | 9710 | #. module: base | 9750 | #. module: base |
309 | 9711 | #: help:ir.actions.server,subject:0 | 9751 | #: help:ir.actions.server,subject:0 |
310 | @@ -9962,7 +10002,7 @@ | |||
311 | 9962 | #. module: base | 10002 | #. module: base |
312 | 9963 | #: model:ir.module.module,shortdesc:base.module_account_followup | 10003 | #: model:ir.module.module,shortdesc:base.module_account_followup |
313 | 9964 | msgid "Payment Follow-up Management" | 10004 | msgid "Payment Follow-up Management" |
315 | 9965 | msgstr "" | 10005 | msgstr "Gestion des relances de paiement" |
316 | 9966 | 10006 | ||
317 | 9967 | #. module: base | 10007 | #. module: base |
318 | 9968 | #: field:workflow.workitem,inst_id:0 | 10008 | #: field:workflow.workitem,inst_id:0 |
319 | @@ -10204,7 +10244,7 @@ | |||
320 | 10204 | #. module: base | 10244 | #. module: base |
321 | 10205 | #: field:ir.translation,name:0 | 10245 | #: field:ir.translation,name:0 |
322 | 10206 | msgid "Translated field" | 10246 | msgid "Translated field" |
324 | 10207 | msgstr "" | 10247 | msgstr "Champ traduit" |
325 | 10208 | 10248 | ||
326 | 10209 | #. module: base | 10249 | #. module: base |
327 | 10210 | #: model:ir.module.module,shortdesc:base.module_stock_location | 10250 | #: model:ir.module.module,shortdesc:base.module_stock_location |
328 | @@ -10224,7 +10264,7 @@ | |||
329 | 10224 | #. module: base | 10264 | #. module: base |
330 | 10225 | #: model:ir.module.module,shortdesc:base.module_document_page | 10265 | #: model:ir.module.module,shortdesc:base.module_document_page |
331 | 10226 | msgid "Document Page" | 10266 | msgid "Document Page" |
333 | 10227 | msgstr "" | 10267 | msgstr "Gestion documentaire de pages Web" |
334 | 10228 | 10268 | ||
335 | 10229 | #. module: base | 10269 | #. module: base |
336 | 10230 | #: model:ir.module.module,shortdesc:base.module_l10n_ar | 10270 | #: model:ir.module.module,shortdesc:base.module_l10n_ar |
337 | @@ -10234,7 +10274,7 @@ | |||
338 | 10234 | #. module: base | 10274 | #. module: base |
339 | 10235 | #: field:ir.module.module,description_html:0 | 10275 | #: field:ir.module.module,description_html:0 |
340 | 10236 | msgid "Description HTML" | 10276 | msgid "Description HTML" |
342 | 10237 | msgstr "" | 10277 | msgstr "Description HTML" |
343 | 10238 | 10278 | ||
344 | 10239 | #. module: base | 10279 | #. module: base |
345 | 10240 | #: help:res.groups,implied_ids:0 | 10280 | #: help:res.groups,implied_ids:0 |
346 | @@ -10245,7 +10285,7 @@ | |||
347 | 10245 | #. module: base | 10285 | #. module: base |
348 | 10246 | #: model:ir.module.module,summary:base.module_note | 10286 | #: model:ir.module.module,summary:base.module_note |
349 | 10247 | msgid "Sticky notes, Collaborative, Memos" | 10287 | msgid "Sticky notes, Collaborative, Memos" |
351 | 10248 | msgstr "" | 10288 | msgstr "Notes repositionnables, collaboratif, mémos" |
352 | 10249 | 10289 | ||
353 | 10250 | #. module: base | 10290 | #. module: base |
354 | 10251 | #: model:ir.module.module,shortdesc:base.module_hr_attendance | 10291 | #: model:ir.module.module,shortdesc:base.module_hr_attendance |
355 | @@ -10392,7 +10432,7 @@ | |||
356 | 10392 | #. module: base | 10432 | #. module: base |
357 | 10393 | #: field:res.currency,position:0 | 10433 | #: field:res.currency,position:0 |
358 | 10394 | msgid "Symbol Position" | 10434 | msgid "Symbol Position" |
360 | 10395 | msgstr "" | 10435 | msgstr "Position du symbole" |
361 | 10396 | 10436 | ||
362 | 10397 | #. module: base | 10437 | #. module: base |
363 | 10398 | #: model:ir.module.module,description:base.module_l10n_de | 10438 | #: model:ir.module.module,description:base.module_l10n_de |
364 | @@ -10430,7 +10470,7 @@ | |||
365 | 10430 | #. module: base | 10470 | #. module: base |
366 | 10431 | #: view:base.language.export:0 | 10471 | #: view:base.language.export:0 |
367 | 10432 | msgid "documentation" | 10472 | msgid "documentation" |
369 | 10433 | msgstr "" | 10473 | msgstr "documentation" |
370 | 10434 | 10474 | ||
371 | 10435 | #. module: base | 10475 | #. module: base |
372 | 10436 | #: help:ir.model,osv_memory:0 | 10476 | #: help:ir.model,osv_memory:0 |
373 | @@ -10476,7 +10516,7 @@ | |||
374 | 10476 | #: code:addons/base/ir/ir_model.py:730 | 10516 | #: code:addons/base/ir/ir_model.py:730 |
375 | 10477 | #, python-format | 10517 | #, python-format |
376 | 10478 | msgid "Sorry, you are not allowed to delete this document." | 10518 | msgid "Sorry, you are not allowed to delete this document." |
378 | 10479 | msgstr "" | 10519 | msgstr "Désolé, vous n’êtes pas autorisé à supprimer ce document." |
379 | 10480 | 10520 | ||
380 | 10481 | #. module: base | 10521 | #. module: base |
381 | 10482 | #: constraint:ir.rule:0 | 10522 | #: constraint:ir.rule:0 |
382 | @@ -10549,7 +10589,7 @@ | |||
383 | 10549 | #. module: base | 10589 | #. module: base |
384 | 10550 | #: view:ir.attachment:0 | 10590 | #: view:ir.attachment:0 |
385 | 10551 | msgid "My Document(s)" | 10591 | msgid "My Document(s)" |
387 | 10552 | msgstr "" | 10592 | msgstr "Mes documents" |
388 | 10553 | 10593 | ||
389 | 10554 | #. module: base | 10594 | #. module: base |
390 | 10555 | #: help:ir.actions.act_window,res_model:0 | 10595 | #: help:ir.actions.act_window,res_model:0 |
391 | @@ -10626,12 +10666,12 @@ | |||
392 | 10626 | #. module: base | 10666 | #. module: base |
393 | 10627 | #: model:res.partner.category,name:base.res_partner_category_5 | 10667 | #: model:res.partner.category,name:base.res_partner_category_5 |
394 | 10628 | msgid "Silver" | 10668 | msgid "Silver" |
396 | 10629 | msgstr "" | 10669 | msgstr "Argent" |
397 | 10630 | 10670 | ||
398 | 10631 | #. module: base | 10671 | #. module: base |
399 | 10632 | #: field:res.partner.title,shortcut:0 | 10672 | #: field:res.partner.title,shortcut:0 |
400 | 10633 | msgid "Abbreviation" | 10673 | msgid "Abbreviation" |
402 | 10634 | msgstr "" | 10674 | msgstr "Abréviation" |
403 | 10635 | 10675 | ||
404 | 10636 | #. module: base | 10676 | #. module: base |
405 | 10637 | #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main | 10677 | #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main |
406 | @@ -11115,7 +11155,7 @@ | |||
407 | 11115 | #: code:addons/base/module/module.py:499 | 11155 | #: code:addons/base/module/module.py:499 |
408 | 11116 | #, python-format | 11156 | #, python-format |
409 | 11117 | msgid "The `base` module cannot be uninstalled" | 11157 | msgid "The `base` module cannot be uninstalled" |
411 | 11118 | msgstr "" | 11158 | msgstr "Le module \"base\" ne peut pas être désinstallé" |
412 | 11119 | 11159 | ||
413 | 11120 | #. module: base | 11160 | #. module: base |
414 | 11121 | #: code:addons/base/ir/ir_cron.py:254 | 11161 | #: code:addons/base/ir/ir_cron.py:254 |
415 | @@ -11142,7 +11182,7 @@ | |||
416 | 11142 | #: code:addons/base/ir/ir_model.py:729 | 11182 | #: code:addons/base/ir/ir_model.py:729 |
417 | 11143 | #, python-format | 11183 | #, python-format |
418 | 11144 | msgid "Sorry, you are not allowed to create this kind of document." | 11184 | msgid "Sorry, you are not allowed to create this kind of document." |
420 | 11145 | msgstr "" | 11185 | msgstr "Désolé, vous n'êtes pas autorisé à créer ce type de document." |
421 | 11146 | 11186 | ||
422 | 11147 | #. module: base | 11187 | #. module: base |
423 | 11148 | #: field:base.language.export,lang:0 | 11188 | #: field:base.language.export,lang:0 |
424 | @@ -11184,7 +11224,7 @@ | |||
425 | 11184 | #. module: base | 11224 | #. module: base |
426 | 11185 | #: field:ir.model.fields,on_delete:0 | 11225 | #: field:ir.model.fields,on_delete:0 |
427 | 11186 | msgid "On Delete" | 11226 | msgid "On Delete" |
429 | 11187 | msgstr "" | 11227 | msgstr "En cas de suppression" |
430 | 11188 | 11228 | ||
431 | 11189 | #. module: base | 11229 | #. module: base |
432 | 11190 | #: code:addons/base/ir/ir_model.py:348 | 11230 | #: code:addons/base/ir/ir_model.py:348 |
433 | 11191 | 11231 | ||
434 | === modified file 'openerp/addons/base/i18n/id.po' | |||
435 | --- openerp/addons/base/i18n/id.po 2013-05-10 05:51:58 +0000 | |||
436 | +++ openerp/addons/base/i18n/id.po 2013-05-16 08:48:42 +0000 | |||
437 | @@ -7,15 +7,26 @@ | |||
438 | 7 | msgstr "" | 7 | msgstr "" |
439 | 8 | "Project-Id-Version: openobject-addons\n" | 8 | "Project-Id-Version: openobject-addons\n" |
440 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
441 | 10 | <<<<<<< TREE | ||
442 | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 11 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
443 | 11 | "PO-Revision-Date: 2011-02-22 17:30+0000\n" | 12 | "PO-Revision-Date: 2011-02-22 17:30+0000\n" |
444 | 12 | "Last-Translator: Agus Purnomo <goesspoerr@gmail.com>\n" | 13 | "Last-Translator: Agus Purnomo <goesspoerr@gmail.com>\n" |
445 | 14 | ======= | ||
446 | 15 | "POT-Creation-Date: 2013-03-07 08:36+0000\n" | ||
447 | 16 | "PO-Revision-Date: 2013-05-13 05:49+0000\n" | ||
448 | 17 | "Last-Translator: David Leonardi <Unknown>\n" | ||
449 | 18 | >>>>>>> MERGE-SOURCE | ||
450 | 13 | "Language-Team: Indonesian <id@li.org>\n" | 19 | "Language-Team: Indonesian <id@li.org>\n" |
451 | 14 | "MIME-Version: 1.0\n" | 20 | "MIME-Version: 1.0\n" |
452 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 21 | "Content-Type: text/plain; charset=UTF-8\n" |
453 | 16 | "Content-Transfer-Encoding: 8bit\n" | 22 | "Content-Transfer-Encoding: 8bit\n" |
454 | 23 | <<<<<<< TREE | ||
455 | 17 | "X-Launchpad-Export-Date: 2013-05-10 05:44+0000\n" | 24 | "X-Launchpad-Export-Date: 2013-05-10 05:44+0000\n" |
456 | 18 | "X-Generator: Launchpad (build 16598)\n" | 25 | "X-Generator: Launchpad (build 16598)\n" |
457 | 26 | ======= | ||
458 | 27 | "X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n" | ||
459 | 28 | "X-Generator: Launchpad (build 16617)\n" | ||
460 | 29 | >>>>>>> MERGE-SOURCE | ||
461 | 19 | 30 | ||
462 | 20 | #. module: base | 31 | #. module: base |
463 | 21 | #: model:ir.module.module,description:base.module_account_check_writing | 32 | #: model:ir.module.module,description:base.module_account_check_writing |
464 | @@ -25,6 +36,9 @@ | |||
465 | 25 | "================================================\n" | 36 | "================================================\n" |
466 | 26 | " " | 37 | " " |
467 | 27 | msgstr "" | 38 | msgstr "" |
468 | 39 | "\n" | ||
469 | 40 | "Modul untuk menulis dan mencetak Cek\n" | ||
470 | 41 | " " | ||
471 | 28 | 42 | ||
472 | 29 | #. module: base | 43 | #. module: base |
473 | 30 | #: model:res.country,name:base.sh | 44 | #: model:res.country,name:base.sh |
474 | @@ -58,7 +72,7 @@ | |||
475 | 58 | #. module: base | 72 | #. module: base |
476 | 59 | #: model:ir.module.module,summary:base.module_sale_stock | 73 | #: model:ir.module.module,summary:base.module_sale_stock |
477 | 60 | msgid "Quotation, Sale Orders, Delivery & Invoicing Control" | 74 | msgid "Quotation, Sale Orders, Delivery & Invoicing Control" |
479 | 61 | msgstr "" | 75 | msgstr "Kontrol Penawaran, Pesanan Penjualan, Pengiriman & Faktur" |
480 | 62 | 76 | ||
481 | 63 | #. module: base | 77 | #. module: base |
482 | 64 | #: selection:ir.sequence,implementation:0 | 78 | #: selection:ir.sequence,implementation:0 |
483 | 65 | 79 | ||
484 | === modified file 'openerp/addons/base/i18n/lt.po' | |||
485 | --- openerp/addons/base/i18n/lt.po 2013-05-10 05:51:58 +0000 | |||
486 | +++ openerp/addons/base/i18n/lt.po 2013-05-16 08:48:42 +0000 | |||
487 | @@ -1,20 +1,41 @@ | |||
488 | 1 | <<<<<<< TREE | ||
489 | 1 | # Translation of OpenERP Server. | 2 | # Translation of OpenERP Server. |
490 | 2 | # This file contains the translation of the following modules: | 3 | # This file contains the translation of the following modules: |
491 | 3 | # * base | 4 | # * base |
492 | 5 | ======= | ||
493 | 6 | # Lithuanian translation for openobject-server | ||
494 | 7 | # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 | ||
495 | 8 | # This file is distributed under the same license as the openobject-server package. | ||
496 | 9 | # Giedrius Slavinskas <giedrius@inovera.lt>, 2012. | ||
497 | 10 | >>>>>>> MERGE-SOURCE | ||
498 | 4 | # | 11 | # |
499 | 5 | msgid "" | 12 | msgid "" |
500 | 6 | msgstr "" | 13 | msgstr "" |
501 | 14 | <<<<<<< TREE | ||
502 | 7 | "Project-Id-Version: OpenERP Server 5.0.0\n" | 15 | "Project-Id-Version: OpenERP Server 5.0.0\n" |
503 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 16 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
504 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 17 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
505 | 10 | "PO-Revision-Date: 2012-08-20 15:52+0000\n" | 18 | "PO-Revision-Date: 2012-08-20 15:52+0000\n" |
506 | 11 | "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n" | 19 | "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n" |
507 | 12 | "Language-Team: \n" | 20 | "Language-Team: \n" |
508 | 21 | ======= | ||
509 | 22 | "Project-Id-Version: openobject-server\n" | ||
510 | 23 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
511 | 24 | "POT-Creation-Date: 2013-03-07 08:36+0000\n" | ||
512 | 25 | "PO-Revision-Date: 2013-05-07 09:54+0000\n" | ||
513 | 26 | "Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n" | ||
514 | 27 | "Language-Team: Lithuanian <lt@li.org>\n" | ||
515 | 28 | >>>>>>> MERGE-SOURCE | ||
516 | 13 | "MIME-Version: 1.0\n" | 29 | "MIME-Version: 1.0\n" |
517 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 30 | "Content-Type: text/plain; charset=UTF-8\n" |
518 | 15 | "Content-Transfer-Encoding: 8bit\n" | 31 | "Content-Transfer-Encoding: 8bit\n" |
519 | 32 | <<<<<<< TREE | ||
520 | 16 | "X-Launchpad-Export-Date: 2013-05-10 05:46+0000\n" | 33 | "X-Launchpad-Export-Date: 2013-05-10 05:46+0000\n" |
521 | 17 | "X-Generator: Launchpad (build 16598)\n" | 34 | "X-Generator: Launchpad (build 16598)\n" |
522 | 35 | ======= | ||
523 | 36 | "X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n" | ||
524 | 37 | "X-Generator: Launchpad (build 16598)\n" | ||
525 | 38 | >>>>>>> MERGE-SOURCE | ||
526 | 18 | 39 | ||
527 | 19 | #. module: base | 40 | #. module: base |
528 | 20 | #: model:ir.module.module,description:base.module_account_check_writing | 41 | #: model:ir.module.module,description:base.module_account_check_writing |
529 | @@ -26,6 +47,14 @@ | |||
530 | 26 | msgstr "" | 47 | msgstr "" |
531 | 27 | 48 | ||
532 | 28 | #. module: base | 49 | #. module: base |
533 | 50 | <<<<<<< TREE | ||
534 | 51 | ======= | ||
535 | 52 | #: view:res.partner.bank:0 | ||
536 | 53 | msgid "e.g. GEBABEBB" | ||
537 | 54 | msgstr "pvz. GEBABEBB" | ||
538 | 55 | |||
539 | 56 | #. module: base | ||
540 | 57 | >>>>>>> MERGE-SOURCE | ||
541 | 29 | #: model:res.country,name:base.sh | 58 | #: model:res.country,name:base.sh |
542 | 30 | msgid "Saint Helena" | 59 | msgid "Saint Helena" |
543 | 31 | msgstr "Šv. Elenos sala" | 60 | msgstr "Šv. Elenos sala" |
544 | @@ -649,6 +678,14 @@ | |||
545 | 649 | msgstr "Pardavimai ir pirkimai" | 678 | msgstr "Pardavimai ir pirkimai" |
546 | 650 | 679 | ||
547 | 651 | #. module: base | 680 | #. module: base |
548 | 681 | <<<<<<< TREE | ||
549 | 682 | ======= | ||
550 | 683 | #: view:res.partner:0 | ||
551 | 684 | msgid "Put an internal note..." | ||
552 | 685 | msgstr "Įveskite vidines pastabas..." | ||
553 | 686 | |||
554 | 687 | #. module: base | ||
555 | 688 | >>>>>>> MERGE-SOURCE | ||
556 | 652 | #: view:ir.translation:0 | 689 | #: view:ir.translation:0 |
557 | 653 | msgid "Untranslated" | 690 | msgid "Untranslated" |
558 | 654 | msgstr "Neišversta" | 691 | msgstr "Neišversta" |
559 | @@ -977,6 +1014,18 @@ | |||
560 | 977 | msgstr "" | 1014 | msgstr "" |
561 | 978 | 1015 | ||
562 | 979 | #. module: base | 1016 | #. module: base |
563 | 1017 | <<<<<<< TREE | ||
564 | 1018 | ======= | ||
565 | 1019 | #: view:res.bank:0 | ||
566 | 1020 | #: view:res.company:0 | ||
567 | 1021 | #: view:res.partner:0 | ||
568 | 1022 | #: view:res.partner.bank:0 | ||
569 | 1023 | #: view:res.users:0 | ||
570 | 1024 | msgid "ZIP" | ||
571 | 1025 | msgstr "Pašto kodas" | ||
572 | 1026 | |||
573 | 1027 | #. module: base | ||
574 | 1028 | >>>>>>> MERGE-SOURCE | ||
575 | 980 | #: selection:base.language.install,lang:0 | 1029 | #: selection:base.language.install,lang:0 |
576 | 981 | msgid "Spanish (UY) / Español (UY)" | 1030 | msgid "Spanish (UY) / Español (UY)" |
577 | 982 | msgstr "" | 1031 | msgstr "" |
578 | @@ -2717,12 +2766,16 @@ | |||
579 | 2717 | #: field:ir.translation,res_id:0 | 2766 | #: field:ir.translation,res_id:0 |
580 | 2718 | #: field:ir.values,res_id:0 | 2767 | #: field:ir.values,res_id:0 |
581 | 2719 | msgid "Record ID" | 2768 | msgid "Record ID" |
582 | 2769 | <<<<<<< TREE | ||
583 | 2720 | msgstr "Įrašo ID" | 2770 | msgstr "Įrašo ID" |
584 | 2721 | 2771 | ||
585 | 2722 | #. module: base | 2772 | #. module: base |
586 | 2723 | #: view:ir.filters:0 | 2773 | #: view:ir.filters:0 |
587 | 2724 | msgid "My Filters" | 2774 | msgid "My Filters" |
588 | 2725 | msgstr "" | 2775 | msgstr "" |
589 | 2776 | ======= | ||
590 | 2777 | msgstr "Įrašo ID" | ||
591 | 2778 | >>>>>>> MERGE-SOURCE | ||
592 | 2726 | 2779 | ||
593 | 2727 | #. module: base | 2780 | #. module: base |
594 | 2728 | #: field:ir.actions.server,email:0 | 2781 | #: field:ir.actions.server,email:0 |
595 | @@ -3111,6 +3164,14 @@ | |||
596 | 3111 | msgstr "" | 3164 | msgstr "" |
597 | 3112 | 3165 | ||
598 | 3113 | #. module: base | 3166 | #. module: base |
599 | 3167 | <<<<<<< TREE | ||
600 | 3168 | ======= | ||
601 | 3169 | #: view:res.company:0 | ||
602 | 3170 | msgid "e.g. Global Business Solutions" | ||
603 | 3171 | msgstr "pvz. Global Business Solutions" | ||
604 | 3172 | |||
605 | 3173 | #. module: base | ||
606 | 3174 | >>>>>>> MERGE-SOURCE | ||
607 | 3114 | #: field:res.company,rml_header1:0 | 3175 | #: field:res.company,rml_header1:0 |
608 | 3115 | msgid "Company Tagline" | 3176 | msgid "Company Tagline" |
609 | 3116 | msgstr "Įmonės šūkis" | 3177 | msgstr "Įmonės šūkis" |
610 | @@ -5998,7 +6059,16 @@ | |||
611 | 5998 | #. module: base | 6059 | #. module: base |
612 | 5999 | #: model:res.country,name:base.um | 6060 | #: model:res.country,name:base.um |
613 | 6000 | msgid "USA Minor Outlying Islands" | 6061 | msgid "USA Minor Outlying Islands" |
615 | 6001 | msgstr "JAV smulkios atokios salos" | 6062 | <<<<<<< TREE |
616 | 6063 | msgstr "JAV smulkios atokios salos" | ||
617 | 6064 | ======= | ||
618 | 6065 | msgstr "JAV smulkios atokios salos" | ||
619 | 6066 | |||
620 | 6067 | #. module: base | ||
621 | 6068 | #: view:base.language.import:0 | ||
622 | 6069 | msgid "e.g. English" | ||
623 | 6070 | msgstr "pvz. English" | ||
624 | 6071 | >>>>>>> MERGE-SOURCE | ||
625 | 6002 | 6072 | ||
626 | 6003 | #. module: base | 6073 | #. module: base |
627 | 6004 | #: help:ir.cron,numbercall:0 | 6074 | #: help:ir.cron,numbercall:0 |
628 | @@ -6084,6 +6154,16 @@ | |||
629 | 6084 | msgstr "" | 6154 | msgstr "" |
630 | 6085 | 6155 | ||
631 | 6086 | #. module: base | 6156 | #. module: base |
632 | 6157 | <<<<<<< TREE | ||
633 | 6158 | ======= | ||
634 | 6159 | #: view:res.company:0 | ||
635 | 6160 | #: view:res.partner:0 | ||
636 | 6161 | #: view:res.users:0 | ||
637 | 6162 | msgid "e.g. www.openerp.com" | ||
638 | 6163 | msgstr "pvz. www.openerp.com" | ||
639 | 6164 | |||
640 | 6165 | #. module: base | ||
641 | 6166 | >>>>>>> MERGE-SOURCE | ||
642 | 6087 | #: selection:ir.cron,interval_type:0 | 6167 | #: selection:ir.cron,interval_type:0 |
643 | 6088 | msgid "Hours" | 6168 | msgid "Hours" |
644 | 6089 | msgstr "Valandos" | 6169 | msgstr "Valandos" |
645 | @@ -7296,7 +7376,16 @@ | |||
646 | 7296 | #. module: base | 7376 | #. module: base |
647 | 7297 | #: field:change.password.user,user_login:0 | 7377 | #: field:change.password.user,user_login:0 |
648 | 7298 | msgid "User Login" | 7378 | msgid "User Login" |
650 | 7299 | msgstr "Naudotojo registracijos vardas" | 7379 | <<<<<<< TREE |
651 | 7380 | msgstr "Naudotojo registracijos vardas" | ||
652 | 7381 | ======= | ||
653 | 7382 | msgstr "Naudotojo registracijos vardas" | ||
654 | 7383 | |||
655 | 7384 | #. module: base | ||
656 | 7385 | #: view:ir.filters:0 | ||
657 | 7386 | msgid "Filters created by myself" | ||
658 | 7387 | msgstr "" | ||
659 | 7388 | >>>>>>> MERGE-SOURCE | ||
660 | 7300 | 7389 | ||
661 | 7301 | #. module: base | 7390 | #. module: base |
662 | 7302 | #: model:ir.module.module,shortdesc:base.module_l10n_hn | 7391 | #: model:ir.module.module,shortdesc:base.module_l10n_hn |
663 | @@ -7515,6 +7604,15 @@ | |||
664 | 7515 | 7604 | ||
665 | 7516 | #. module: base | 7605 | #. module: base |
666 | 7517 | #: view:res.partner:0 | 7606 | #: view:res.partner:0 |
667 | 7607 | <<<<<<< TREE | ||
668 | 7608 | ======= | ||
669 | 7609 | #: view:res.users:0 | ||
670 | 7610 | msgid "Tags..." | ||
671 | 7611 | msgstr "Žymos..." | ||
672 | 7612 | |||
673 | 7613 | #. module: base | ||
674 | 7614 | #: view:res.partner:0 | ||
675 | 7615 | >>>>>>> MERGE-SOURCE | ||
676 | 7518 | msgid "at" | 7616 | msgid "at" |
677 | 7519 | msgstr "su" | 7617 | msgstr "su" |
678 | 7520 | 7618 | ||
679 | @@ -10168,6 +10266,17 @@ | |||
680 | 10168 | msgstr "" | 10266 | msgstr "" |
681 | 10169 | 10267 | ||
682 | 10170 | #. module: base | 10268 | #. module: base |
683 | 10269 | <<<<<<< TREE | ||
684 | 10270 | ======= | ||
685 | 10271 | #: view:res.bank:0 | ||
686 | 10272 | #: view:res.company:0 | ||
687 | 10273 | #: view:res.partner:0 | ||
688 | 10274 | #: view:res.users:0 | ||
689 | 10275 | msgid "Street..." | ||
690 | 10276 | msgstr "Gatvė..." | ||
691 | 10277 | |||
692 | 10278 | #. module: base | ||
693 | 10279 | >>>>>>> MERGE-SOURCE | ||
694 | 10171 | #: constraint:res.users:0 | 10280 | #: constraint:res.users:0 |
695 | 10172 | msgid "The chosen company is not in the allowed companies for this user" | 10281 | msgid "The chosen company is not in the allowed companies for this user" |
696 | 10173 | msgstr "" | 10282 | msgstr "" |
697 | @@ -11452,7 +11561,17 @@ | |||
698 | 11452 | #. module: base | 11561 | #. module: base |
699 | 11453 | #: field:res.partner,customer:0 | 11562 | #: field:res.partner,customer:0 |
700 | 11454 | msgid "Customer" | 11563 | msgid "Customer" |
702 | 11455 | msgstr "Pirkėjas" | 11564 | <<<<<<< TREE |
703 | 11565 | msgstr "Pirkėjas" | ||
704 | 11566 | ======= | ||
705 | 11567 | msgstr "Pirkėjas" | ||
706 | 11568 | |||
707 | 11569 | #. module: base | ||
708 | 11570 | #: view:res.partner:0 | ||
709 | 11571 | #: view:res.users:0 | ||
710 | 11572 | msgid "e.g. +32.81.81.37.00" | ||
711 | 11573 | msgstr "pvz. +32.81.81.37.00" | ||
712 | 11574 | >>>>>>> MERGE-SOURCE | ||
713 | 11456 | 11575 | ||
714 | 11457 | #. module: base | 11576 | #. module: base |
715 | 11458 | #: selection:base.language.install,lang:0 | 11577 | #: selection:base.language.install,lang:0 |
716 | @@ -14618,6 +14737,14 @@ | |||
717 | 14618 | msgstr "" | 14737 | msgstr "" |
718 | 14619 | 14738 | ||
719 | 14620 | #. module: base | 14739 | #. module: base |
720 | 14740 | <<<<<<< TREE | ||
721 | 14741 | ======= | ||
722 | 14742 | #: view:res.partner:0 | ||
723 | 14743 | msgid "e.g. Sales Director" | ||
724 | 14744 | msgstr "pvz. Pardavimų vadovas" | ||
725 | 14745 | |||
726 | 14746 | #. module: base | ||
727 | 14747 | >>>>>>> MERGE-SOURCE | ||
728 | 14621 | #: selection:base.language.install,lang:0 | 14748 | #: selection:base.language.install,lang:0 |
729 | 14622 | msgid "Czech / Čeština" | 14749 | msgid "Czech / Čeština" |
730 | 14623 | msgstr "" | 14750 | msgstr "" |
731 | @@ -14791,6 +14918,14 @@ | |||
732 | 14791 | msgstr "" | 14918 | msgstr "" |
733 | 14792 | 14919 | ||
734 | 14793 | #. module: base | 14920 | #. module: base |
735 | 14921 | <<<<<<< TREE | ||
736 | 14922 | ======= | ||
737 | 14923 | #: view:base.language.import:0 | ||
738 | 14924 | msgid "e.g. en_US" | ||
739 | 14925 | msgstr "pvz. en_US" | ||
740 | 14926 | |||
741 | 14927 | #. module: base | ||
742 | 14928 | >>>>>>> MERGE-SOURCE | ||
743 | 14794 | #: model:ir.module.module,description:base.module_l10n_hn | 14929 | #: model:ir.module.module,description:base.module_l10n_hn |
744 | 14795 | msgid "" | 14930 | msgid "" |
745 | 14796 | "\n" | 14931 | "\n" |
746 | 14797 | 14932 | ||
747 | === modified file 'openerp/addons/base/i18n/ro.po' | |||
748 | --- openerp/addons/base/i18n/ro.po 2013-05-10 05:51:58 +0000 | |||
749 | +++ openerp/addons/base/i18n/ro.po 2013-05-16 08:48:42 +0000 | |||
750 | @@ -4,17 +4,31 @@ | |||
751 | 4 | # | 4 | # |
752 | 5 | msgid "" | 5 | msgid "" |
753 | 6 | msgstr "" | 6 | msgstr "" |
754 | 7 | <<<<<<< TREE | ||
755 | 7 | "Project-Id-Version: OpenERP Server 5.0.4\n" | 8 | "Project-Id-Version: OpenERP Server 5.0.4\n" |
756 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
757 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
758 | 10 | "PO-Revision-Date: 2013-01-05 18:18+0000\n" | 11 | "PO-Revision-Date: 2013-01-05 18:18+0000\n" |
759 | 11 | "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n" | 12 | "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n" |
760 | 12 | "Language-Team: \n" | 13 | "Language-Team: \n" |
761 | 14 | ======= | ||
762 | 15 | "Project-Id-Version: openobject-server\n" | ||
763 | 16 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
764 | 17 | "POT-Creation-Date: 2013-03-07 08:36+0000\n" | ||
765 | 18 | "PO-Revision-Date: 2013-05-07 16:32+0000\n" | ||
766 | 19 | "Last-Translator: Dorin <dhongu@gmail.com>\n" | ||
767 | 20 | "Language-Team: Romanian <ro@li.org>\n" | ||
768 | 21 | >>>>>>> MERGE-SOURCE | ||
769 | 13 | "MIME-Version: 1.0\n" | 22 | "MIME-Version: 1.0\n" |
770 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 23 | "Content-Type: text/plain; charset=UTF-8\n" |
771 | 15 | "Content-Transfer-Encoding: 8bit\n" | 24 | "Content-Transfer-Encoding: 8bit\n" |
772 | 25 | <<<<<<< TREE | ||
773 | 16 | "X-Launchpad-Export-Date: 2013-05-10 05:47+0000\n" | 26 | "X-Launchpad-Export-Date: 2013-05-10 05:47+0000\n" |
774 | 17 | "X-Generator: Launchpad (build 16598)\n" | 27 | "X-Generator: Launchpad (build 16598)\n" |
775 | 28 | ======= | ||
776 | 29 | "X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n" | ||
777 | 30 | "X-Generator: Launchpad (build 16598)\n" | ||
778 | 31 | >>>>>>> MERGE-SOURCE | ||
779 | 18 | 32 | ||
780 | 19 | #. module: base | 33 | #. module: base |
781 | 20 | #: model:ir.module.module,description:base.module_account_check_writing | 34 | #: model:ir.module.module,description:base.module_account_check_writing |
782 | 21 | 35 | ||
783 | === modified file 'openerp/addons/base/i18n/tr.po' | |||
784 | --- openerp/addons/base/i18n/tr.po 2013-05-10 05:51:58 +0000 | |||
785 | +++ openerp/addons/base/i18n/tr.po 2013-05-16 08:48:42 +0000 | |||
786 | @@ -4,17 +4,31 @@ | |||
787 | 4 | # | 4 | # |
788 | 5 | msgid "" | 5 | msgid "" |
789 | 6 | msgstr "" | 6 | msgstr "" |
790 | 7 | <<<<<<< TREE | ||
791 | 7 | "Project-Id-Version: OpenERP Server 5.0.4\n" | 8 | "Project-Id-Version: OpenERP Server 5.0.4\n" |
792 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
793 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
794 | 10 | "PO-Revision-Date: 2012-11-28 08:41+0000\n" | 11 | "PO-Revision-Date: 2012-11-28 08:41+0000\n" |
795 | 11 | "Last-Translator: Ahmet Altınışık <Unknown>\n" | 12 | "Last-Translator: Ahmet Altınışık <Unknown>\n" |
796 | 12 | "Language-Team: \n" | 13 | "Language-Team: \n" |
797 | 14 | ======= | ||
798 | 15 | "Project-Id-Version: openobject-server\n" | ||
799 | 16 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
800 | 17 | "POT-Creation-Date: 2013-03-07 08:36+0000\n" | ||
801 | 18 | "PO-Revision-Date: 2013-05-05 17:30+0000\n" | ||
802 | 19 | "Last-Translator: Ayhan KIZILTAN <Unknown>\n" | ||
803 | 20 | "Language-Team: Turkish <tr@li.org>\n" | ||
804 | 21 | >>>>>>> MERGE-SOURCE | ||
805 | 13 | "MIME-Version: 1.0\n" | 22 | "MIME-Version: 1.0\n" |
806 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 23 | "Content-Type: text/plain; charset=UTF-8\n" |
807 | 15 | "Content-Transfer-Encoding: 8bit\n" | 24 | "Content-Transfer-Encoding: 8bit\n" |
808 | 25 | <<<<<<< TREE | ||
809 | 16 | "X-Launchpad-Export-Date: 2013-05-10 05:48+0000\n" | 26 | "X-Launchpad-Export-Date: 2013-05-10 05:48+0000\n" |
810 | 17 | "X-Generator: Launchpad (build 16598)\n" | 27 | "X-Generator: Launchpad (build 16598)\n" |
811 | 28 | ======= | ||
812 | 29 | "X-Launchpad-Export-Date: 2013-05-06 06:35+0000\n" | ||
813 | 30 | "X-Generator: Launchpad (build 16598)\n" | ||
814 | 31 | >>>>>>> MERGE-SOURCE | ||
815 | 18 | 32 | ||
816 | 19 | #. module: base | 33 | #. module: base |
817 | 20 | #: model:ir.module.module,description:base.module_account_check_writing | 34 | #: model:ir.module.module,description:base.module_account_check_writing |
818 | @@ -3281,6 +3295,14 @@ | |||
819 | 3281 | msgstr "" | 3295 | msgstr "" |
820 | 3282 | 3296 | ||
821 | 3283 | #. module: base | 3297 | #. module: base |
822 | 3298 | <<<<<<< TREE | ||
823 | 3299 | ======= | ||
824 | 3300 | #: view:res.company:0 | ||
825 | 3301 | msgid "e.g. Global Business Solutions" | ||
826 | 3302 | msgstr "e.g. Global İş Çözümleri" | ||
827 | 3303 | |||
828 | 3304 | #. module: base | ||
829 | 3305 | >>>>>>> MERGE-SOURCE | ||
830 | 3284 | #: field:res.company,rml_header1:0 | 3306 | #: field:res.company,rml_header1:0 |
831 | 3285 | msgid "Company Tagline" | 3307 | msgid "Company Tagline" |
832 | 3286 | msgstr "Firma Sloganı" | 3308 | msgstr "Firma Sloganı" |
833 | @@ -6766,6 +6788,14 @@ | |||
834 | 6766 | msgstr "ir.cron" | 6788 | msgstr "ir.cron" |
835 | 6767 | 6789 | ||
836 | 6768 | #. module: base | 6790 | #. module: base |
837 | 6791 | <<<<<<< TREE | ||
838 | 6792 | ======= | ||
839 | 6793 | #: model:ir.ui.menu,name:base.menu_sales_followup | ||
840 | 6794 | msgid "Payment Follow-up" | ||
841 | 6795 | msgstr "Ödeme Takibi" | ||
842 | 6796 | |||
843 | 6797 | #. module: base | ||
844 | 6798 | >>>>>>> MERGE-SOURCE | ||
845 | 6769 | #: model:res.country,name:base.cw | 6799 | #: model:res.country,name:base.cw |
846 | 6770 | msgid "Curaçao" | 6800 | msgid "Curaçao" |
847 | 6771 | msgstr "" | 6801 | msgstr "" |
848 | 6772 | 6802 | ||
849 | === modified file 'openerp/addons/base/ir/ir_ui_menu.py' | |||
850 | --- openerp/addons/base/ir/ir_ui_menu.py 2013-03-29 14:07:23 +0000 | |||
851 | +++ openerp/addons/base/ir/ir_ui_menu.py 2013-05-16 08:48:42 +0000 | |||
852 | @@ -299,8 +299,33 @@ | |||
853 | 299 | - the needaction counter of the related action, taking into account | 299 | - the needaction counter of the related action, taking into account |
854 | 300 | the action domain | 300 | the action domain |
855 | 301 | """ | 301 | """ |
856 | 302 | if context is None: | ||
857 | 303 | context = {} | ||
858 | 302 | res = {} | 304 | res = {} |
859 | 305 | menu_ids = set() | ||
860 | 303 | for menu in self.browse(cr, uid, ids, context=context): | 306 | for menu in self.browse(cr, uid, ids, context=context): |
861 | 307 | menu_ids.add(menu.id) | ||
862 | 308 | ctx = None | ||
863 | 309 | if menu.action and menu.action.type in ('ir.actions.act_window', 'ir.actions.client') and menu.action.context: | ||
864 | 310 | try: | ||
865 | 311 | # use magical UnquoteEvalContext to ignore undefined client-side variables such as `active_id` | ||
866 | 312 | eval_ctx = tools.UnquoteEvalContext(**context) | ||
867 | 313 | ctx = eval(menu.action.context, locals_dict=eval_ctx, nocopy=True) or None | ||
868 | 314 | except Exception: | ||
869 | 315 | # if the eval still fails for some reason, we'll simply skip this menu | ||
870 | 316 | pass | ||
871 | 317 | menu_ref = ctx and ctx.get('needaction_menu_ref') | ||
872 | 318 | if menu_ref: | ||
873 | 319 | if not isinstance(menu_ref, list): | ||
874 | 320 | menu_ref = [menu_ref] | ||
875 | 321 | model_data_obj = self.pool.get('ir.model.data') | ||
876 | 322 | for menu_data in menu_ref: | ||
877 | 323 | model, id = model_data_obj.get_object_reference(cr, uid, menu_data.split('.')[0], menu_data.split('.')[1]) | ||
878 | 324 | if (model == 'ir.ui.menu'): | ||
879 | 325 | menu_ids.add(id) | ||
880 | 326 | menu_ids = list(menu_ids) | ||
881 | 327 | |||
882 | 328 | for menu in self.browse(cr, uid, menu_ids, context=context): | ||
883 | 304 | res[menu.id] = { | 329 | res[menu.id] = { |
884 | 305 | 'needaction_enabled': False, | 330 | 'needaction_enabled': False, |
885 | 306 | 'needaction_counter': False, | 331 | 'needaction_counter': False, |
886 | 307 | 332 | ||
887 | === modified file 'openerp/addons/base/res/res_partner.py' | |||
888 | --- openerp/addons/base/res/res_partner.py 2013-04-24 13:19:36 +0000 | |||
889 | +++ openerp/addons/base/res/res_partner.py 2013-05-16 08:48:42 +0000 | |||
890 | @@ -74,7 +74,8 @@ | |||
891 | 74 | 74 | ||
892 | 75 | 75 | ||
893 | 76 | def _tz_get(self,cr,uid, context=None): | 76 | def _tz_get(self,cr,uid, context=None): |
895 | 77 | return [(x, x) for x in pytz.all_timezones] | 77 | # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728 |
896 | 78 | return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')] | ||
897 | 78 | 79 | ||
898 | 79 | class res_partner_category(osv.osv): | 80 | class res_partner_category(osv.osv): |
899 | 80 | 81 | ||
900 | @@ -462,7 +463,7 @@ | |||
901 | 462 | """ Sync commercial fields and address fields from company and to children after create/update, | 463 | """ Sync commercial fields and address fields from company and to children after create/update, |
902 | 463 | just as if those were all modeled as fields.related to the parent """ | 464 | just as if those were all modeled as fields.related to the parent """ |
903 | 464 | # 1. From UPSTREAM: sync from parent | 465 | # 1. From UPSTREAM: sync from parent |
905 | 465 | if update_values.get('parent_id') or update_values.get('use_company_address'): | 466 | if update_values.get('parent_id') or update_values.get('use_parent_address'): |
906 | 466 | # 1a. Commercial fields: sync if parent changed | 467 | # 1a. Commercial fields: sync if parent changed |
907 | 467 | if update_values.get('parent_id'): | 468 | if update_values.get('parent_id'): |
908 | 468 | self._commercial_sync_from_company(cr, uid, partner, context=context) | 469 | self._commercial_sync_from_company(cr, uid, partner, context=context) |
909 | 469 | 470 | ||
910 | === modified file 'openerp/addons/base/res/res_partner_view.xml' | |||
911 | --- openerp/addons/base/res/res_partner_view.xml 2013-04-22 09:36:55 +0000 | |||
912 | +++ openerp/addons/base/res/res_partner_view.xml 2013-05-16 08:48:42 +0000 | |||
913 | @@ -157,8 +157,8 @@ | |||
914 | 157 | <div> | 157 | <div> |
915 | 158 | <field name="use_parent_address" class="oe_edit_only oe_inline" | 158 | <field name="use_parent_address" class="oe_edit_only oe_inline" |
916 | 159 | on_change="onchange_address(use_parent_address, parent_id)" | 159 | on_change="onchange_address(use_parent_address, parent_id)" |
919 | 160 | attrs="{'invisible': [('parent_id','=', False)]}"/> | 160 | attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/> |
920 | 161 | <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False)]}"/> | 161 | <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/> |
921 | 162 | <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only" | 162 | <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only" |
922 | 163 | attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/> | 163 | attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/> |
923 | 164 | <field name="street" placeholder="Street..." attrs="{'readonly': [('use_parent_address','=',True)]}"/> | 164 | <field name="street" placeholder="Street..." attrs="{'readonly': [('use_parent_address','=',True)]}"/> |
924 | 165 | 165 | ||
925 | === modified file 'openerp/addons/base/tests/test_base.py' | |||
926 | --- openerp/addons/base/tests/test_base.py 2013-04-22 09:36:55 +0000 | |||
927 | +++ openerp/addons/base/tests/test_base.py 2013-05-16 08:48:42 +0000 | |||
928 | @@ -61,6 +61,24 @@ | |||
929 | 61 | self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync') | 61 | self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync') |
930 | 62 | self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync') | 62 | self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync') |
931 | 63 | self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync') | 63 | self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync') |
932 | 64 | |||
933 | 65 | # turn off sync | ||
934 | 66 | p1street = 'Different street, 42' | ||
935 | 67 | p1.write({'street': p1street, | ||
936 | 68 | 'use_parent_address': False}) | ||
937 | 69 | p1.refresh(), ghoststep.refresh() | ||
938 | 70 | self.assertEqual(p1.street, p1street, 'Address fields must not be synced after turning sync off') | ||
939 | 71 | self.assertNotEqual(ghoststep.street, p1street, 'Parent address must never be touched') | ||
940 | 72 | |||
941 | 73 | # turn on sync again | ||
942 | 74 | p1.write({'use_parent_address': True}) | ||
943 | 75 | p1.refresh() | ||
944 | 76 | self.assertEqual(p1.street, ghoststep.street, 'Address fields must be synced again') | ||
945 | 77 | self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync') | ||
946 | 78 | self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync') | ||
947 | 79 | self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync') | ||
948 | 80 | |||
949 | 81 | # Modify parent, sync to children | ||
950 | 64 | ghoststreet = 'South Street, 25' | 82 | ghoststreet = 'South Street, 25' |
951 | 65 | ghoststep.write({'street': ghoststreet}) | 83 | ghoststep.write({'street': ghoststreet}) |
952 | 66 | p1.refresh() | 84 | p1.refresh() |
953 | 67 | 85 | ||
954 | === added file 'openerp/addons/base_quality_interrogation.py.OTHER' | |||
955 | --- openerp/addons/base_quality_interrogation.py.OTHER 1970-01-01 00:00:00 +0000 | |||
956 | +++ openerp/addons/base_quality_interrogation.py.OTHER 2013-05-16 08:48:42 +0000 | |||
957 | @@ -0,0 +1,353 @@ | |||
958 | 1 | #!/usr/bin/env python | ||
959 | 2 | # -*- coding: utf-8 -*- | ||
960 | 3 | ############################################################################## | ||
961 | 4 | # | ||
962 | 5 | # OpenERP, Open Source Management Solution | ||
963 | 6 | # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). | ||
964 | 7 | # | ||
965 | 8 | # This program is free software: you can redistribute it and/or modify | ||
966 | 9 | # it under the terms of the GNU Affero General Public License as | ||
967 | 10 | # published by the Free Software Foundation, either version 3 of the | ||
968 | 11 | # License, or (at your option) any later version. | ||
969 | 12 | # | ||
970 | 13 | # This program is distributed in the hope that it will be useful, | ||
971 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
972 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
973 | 16 | # GNU Affero General Public License for more details. | ||
974 | 17 | # | ||
975 | 18 | # You should have received a copy of the GNU Affero General Public License | ||
976 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
977 | 20 | # | ||
978 | 21 | ############################################################################## | ||
979 | 22 | |||
980 | 23 | import xmlrpclib | ||
981 | 24 | import optparse | ||
982 | 25 | import sys | ||
983 | 26 | import threading | ||
984 | 27 | import os | ||
985 | 28 | import time | ||
986 | 29 | import base64 | ||
987 | 30 | import socket | ||
988 | 31 | import string | ||
989 | 32 | |||
990 | 33 | admin_passwd = 'admin' | ||
991 | 34 | waittime = 10 | ||
992 | 35 | wait_count = 0 | ||
993 | 36 | wait_limit = 12 | ||
994 | 37 | |||
995 | 38 | def to_decode(s): | ||
996 | 39 | try: | ||
997 | 40 | return s.encode('utf-8') | ||
998 | 41 | except UnicodeError: | ||
999 | 42 | try: | ||
1000 | 43 | return s.encode('latin') | ||
1001 | 44 | except UnicodeError: | ||
1002 | 45 | try: | ||
1003 | 46 | return s.decode('ascii') | ||
1004 | 47 | except UnicodeError: | ||
1005 | 48 | return s | ||
1006 | 49 | |||
1007 | 50 | def start_server(root_path, port, netport, addons_path): | ||
1008 | 51 | os.system('python2.5 %sopenerp-server --pidfile=openerp.pid --no-xmlrpcs --xmlrpc-port=%s --netrpc-port=%s --addons-path=%s' %(root_path, str(port),str(netport),addons_path)) | ||
1009 | 52 | def clean(): | ||
1010 | 53 | if os.path.isfile('openerp.pid'): | ||
1011 | 54 | ps = open('openerp.pid') | ||
1012 | 55 | if ps: | ||
1013 | 56 | pid = int(ps.read()) | ||
1014 | 57 | ps.close() | ||
1015 | 58 | if pid: | ||
1016 | 59 | os.kill(pid,9) | ||
1017 | 60 | |||
1018 | 61 | def execute(connector, method, *args): | ||
1019 | 62 | global wait_count | ||
1020 | 63 | res = False | ||
1021 | 64 | try: | ||
1022 | 65 | res = getattr(connector,method)(*args) | ||
1023 | 66 | except socket.error,e: | ||
1024 | 67 | if e.args[0] == 111: | ||
1025 | 68 | if wait_count > wait_limit: | ||
1026 | 69 | print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds." % wait_limit | ||
1027 | 70 | clean() | ||
1028 | 71 | sys.exit(1) | ||
1029 | 72 | print 'Please wait %d sec to start server....' % waittime | ||
1030 | 73 | wait_count += 1 | ||
1031 | 74 | time.sleep(waittime) | ||
1032 | 75 | res = execute(connector, method, *args) | ||
1033 | 76 | else: | ||
1034 | 77 | raise e | ||
1035 | 78 | wait_count = 0 | ||
1036 | 79 | return res | ||
1037 | 80 | |||
1038 | 81 | def login(uri, dbname, user, pwd): | ||
1039 | 82 | conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common') | ||
1040 | 83 | uid = execute(conn,'login',dbname, user, pwd) | ||
1041 | 84 | return uid | ||
1042 | 85 | |||
1043 | 86 | def import_translate(uri, user, pwd, dbname, translate_in): | ||
1044 | 87 | uid = login(uri, dbname, user, pwd) | ||
1045 | 88 | if uid: | ||
1046 | 89 | conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard') | ||
1047 | 90 | wiz_id = execute(conn,'create',dbname, uid, pwd, 'base.language.import') | ||
1048 | 91 | for trans_in in translate_in: | ||
1049 | 92 | lang,ext = os.path.splitext(trans_in.split('/')[-1]) | ||
1050 | 93 | state = 'init' | ||
1051 | 94 | datas = {'form':{}} | ||
1052 | 95 | while state!='end': | ||
1053 | 96 | res = execute(conn,'execute',dbname, uid, pwd, wiz_id, datas, state, {}) | ||
1054 | 97 | if 'datas' in res: | ||
1055 | 98 | datas['form'].update( res['datas'].get('form',{}) ) | ||
1056 | 99 | if res['type']=='form': | ||
1057 | 100 | for field in res['fields'].keys(): | ||
1058 | 101 | datas['form'][field] = res['fields'][field].get('value', False) | ||
1059 | 102 | state = res['state'][-1][0] | ||
1060 | 103 | trans_obj = open(trans_in) | ||
1061 | 104 | datas['form'].update({ | ||
1062 | 105 | 'name': lang, | ||
1063 | 106 | 'code': lang, | ||
1064 | 107 | 'data' : base64.encodestring(trans_obj.read()) | ||
1065 | 108 | }) | ||
1066 | 109 | trans_obj.close() | ||
1067 | 110 | elif res['type']=='action': | ||
1068 | 111 | state = res['state'] | ||
1069 | 112 | |||
1070 | 113 | |||
1071 | 114 | def check_quality(uri, user, pwd, dbname, modules, quality_logs): | ||
1072 | 115 | uid = login(uri, dbname, user, pwd) | ||
1073 | 116 | quality_logs += 'quality-logs' | ||
1074 | 117 | if uid: | ||
1075 | 118 | conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object') | ||
1076 | 119 | final = {} | ||
1077 | 120 | for module in modules: | ||
1078 | 121 | qualityresult = {} | ||
1079 | 122 | test_detail = {} | ||
1080 | 123 | quality_result = execute(conn,'execute', dbname, uid, pwd,'module.quality.check','check_quality',module) | ||
1081 | 124 | detail_html = '' | ||
1082 | 125 | html = '''<html><body><a name="TOP"></a>''' | ||
1083 | 126 | html +="<h1> Module: %s </h1>"%(quality_result['name']) | ||
1084 | 127 | html += "<h2> Final score: %s</h2>"%(quality_result['final_score']) | ||
1085 | 128 | html += "<div id='tabs'>" | ||
1086 | 129 | html += "<ul>" | ||
1087 | 130 | for x,y,detail in quality_result['check_detail_ids']: | ||
1088 | 131 | test = detail.get('name') | ||
1089 | 132 | msg = detail.get('message','') | ||
1090 | 133 | score = round(float(detail.get('score',0)),2) | ||
1091 | 134 | html += "<li><a href=\"#%s\">%s</a></li>"%(test.replace(' ','-'),test) | ||
1092 | 135 | detail_html +='''<div id=\"%s\"><h3>%s (Score : %s)</h3><font color=red><h5>%s</h5></font>%s</div>'''%(test.replace(' ', '-'), test, score, msg, detail.get('detail', '')) | ||
1093 | 136 | test_detail[test] = (score,msg,detail.get('detail','')) | ||
1094 | 137 | html += "</ul>" | ||
1095 | 138 | html += "%s"% detail_html | ||
1096 | 139 | html += "</div></body></html>" | ||
1097 | 140 | if not os.path.isdir(quality_logs): | ||
1098 | 141 | os.mkdir(quality_logs) | ||
1099 | 142 | fp = open('%s/%s.html'%(quality_logs,module),'wb') | ||
1100 | 143 | fp.write(to_decode(html)) | ||
1101 | 144 | fp.close() | ||
1102 | 145 | #final[quality_result['name']] = (quality_result['final_score'],html,test_detail) | ||
1103 | 146 | |||
1104 | 147 | #fp = open('quality_log.pck','wb') | ||
1105 | 148 | #pck_obj = pickle.dump(final,fp) | ||
1106 | 149 | #fp.close() | ||
1107 | 150 | #print "LOG PATH%s"%(os.path.realpath('quality_log.pck')) | ||
1108 | 151 | return True | ||
1109 | 152 | else: | ||
1110 | 153 | print 'Login Failed...' | ||
1111 | 154 | clean() | ||
1112 | 155 | sys.exit(1) | ||
1113 | 156 | |||
1114 | 157 | |||
1115 | 158 | |||
1116 | 159 | def wait(id,url=''): | ||
1117 | 160 | progress=0.0 | ||
1118 | 161 | sock2 = xmlrpclib.ServerProxy(url+'/xmlrpc/db') | ||
1119 | 162 | while not progress==1.0: | ||
1120 | 163 | progress,users = execute(sock2,'get_progress',admin_passwd, id) | ||
1121 | 164 | return True | ||
1122 | 165 | |||
1123 | 166 | |||
1124 | 167 | def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'): | ||
1125 | 168 | conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/db') | ||
1126 | 169 | obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object') | ||
1127 | 170 | wiz_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard') | ||
1128 | 171 | login_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common') | ||
1129 | 172 | db_list = execute(conn, 'list') | ||
1130 | 173 | if dbname in db_list: | ||
1131 | 174 | drop_db(uri, dbname) | ||
1132 | 175 | id = execute(conn,'create',admin_passwd, dbname, True, lang) | ||
1133 | 176 | wait(id,uri) | ||
1134 | 177 | install_module(uri, dbname, ['base_module_quality'],user=user,pwd=pwd) | ||
1135 | 178 | return True | ||
1136 | 179 | |||
1137 | 180 | def drop_db(uri, dbname): | ||
1138 | 181 | conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/db') | ||
1139 | 182 | db_list = execute(conn,'list') | ||
1140 | 183 | if dbname in db_list: | ||
1141 | 184 | execute(conn, 'drop', admin_passwd, dbname) | ||
1142 | 185 | return True | ||
1143 | 186 | |||
1144 | 187 | def make_links(uri, uid, dbname, source, destination, module, user, pwd): | ||
1145 | 188 | if module in ('base','quality_integration_server'): | ||
1146 | 189 | return True | ||
1147 | 190 | if os.path.islink(destination + '/' + module): | ||
1148 | 191 | os.unlink(destination + '/' + module) | ||
1149 | 192 | for path in source: | ||
1150 | 193 | if os.path.isdir(path + '/' + module): | ||
1151 | 194 | os.symlink(path + '/' + module, destination + '/' + module) | ||
1152 | 195 | obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object') | ||
1153 | 196 | execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'update_list') | ||
1154 | 197 | module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','=',module)]) | ||
1155 | 198 | if len(module_ids): | ||
1156 | 199 | data = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'read', module_ids[0],['name','dependencies_id']) | ||
1157 | 200 | dep_datas = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module.dependency', 'read', data['dependencies_id'],['name']) | ||
1158 | 201 | for dep_data in dep_datas: | ||
1159 | 202 | make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd) | ||
1160 | 203 | return False | ||
1161 | 204 | |||
1162 | 205 | def install_module(uri, dbname, modules, addons='', extra_addons='', user='admin', pwd='admin'): | ||
1163 | 206 | uid = login(uri, dbname, user, pwd) | ||
1164 | 207 | if extra_addons: | ||
1165 | 208 | extra_addons = extra_addons.split(',') | ||
1166 | 209 | if uid: | ||
1167 | 210 | if addons and extra_addons: | ||
1168 | 211 | for module in modules: | ||
1169 | 212 | make_links(uri, uid, dbname, extra_addons, addons, module, user, pwd) | ||
1170 | 213 | |||
1171 | 214 | obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object') | ||
1172 | 215 | wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard') | ||
1173 | 216 | module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)]) | ||
1174 | 217 | execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_install', module_ids) | ||
1175 | 218 | wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple') | ||
1176 | 219 | state = 'init' | ||
1177 | 220 | datas = {} | ||
1178 | 221 | #while state!='menu': | ||
1179 | 222 | while state!='end': | ||
1180 | 223 | res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {}) | ||
1181 | 224 | if state == 'init': | ||
1182 | 225 | state = 'start' | ||
1183 | 226 | elif state == 'start': | ||
1184 | 227 | state = 'end' | ||
1185 | 228 | return True | ||
1186 | 229 | |||
1187 | 230 | def upgrade_module(uri, dbname, modules, user='admin', pwd='admin'): | ||
1188 | 231 | uid = login(uri, dbname, user, pwd) | ||
1189 | 232 | if uid: | ||
1190 | 233 | obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object') | ||
1191 | 234 | wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard') | ||
1192 | 235 | module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)]) | ||
1193 | 236 | execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_upgrade', module_ids) | ||
1194 | 237 | wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple') | ||
1195 | 238 | state = 'init' | ||
1196 | 239 | datas = {} | ||
1197 | 240 | #while state!='menu': | ||
1198 | 241 | while state!='end': | ||
1199 | 242 | res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {}) | ||
1200 | 243 | if state == 'init': | ||
1201 | 244 | state = 'start' | ||
1202 | 245 | elif state == 'start': | ||
1203 | 246 | state = 'end' | ||
1204 | 247 | |||
1205 | 248 | return True | ||
1206 | 249 | |||
1207 | 250 | |||
1208 | 251 | |||
1209 | 252 | |||
1210 | 253 | |||
1211 | 254 | usage = """%prog command [options] | ||
1212 | 255 | |||
1213 | 256 | Basic Commands: | ||
1214 | 257 | start-server Start Server | ||
1215 | 258 | create-db Create new database | ||
1216 | 259 | drop-db Drop database | ||
1217 | 260 | install-module Install module | ||
1218 | 261 | upgrade-module Upgrade module | ||
1219 | 262 | install-translation Install translation file | ||
1220 | 263 | check-quality Calculate quality and dump quality result into quality_log.pck using pickle | ||
1221 | 264 | """ | ||
1222 | 265 | parser = optparse.OptionParser(usage) | ||
1223 | 266 | parser.add_option("--modules", dest="modules", | ||
1224 | 267 | help="specify modules to install or check quality") | ||
1225 | 268 | parser.add_option("--addons-path", dest="addons_path", help="specify the addons path") | ||
1226 | 269 | parser.add_option("--quality-logs", dest="quality_logs", help="specify the path of quality logs files which has to stores") | ||
1227 | 270 | parser.add_option("--root-path", dest="root_path", help="specify the root path") | ||
1228 | 271 | parser.add_option("-p", "--port", dest="port", help="specify the TCP port", type="int") | ||
1229 | 272 | parser.add_option("--net_port", dest="netport",help="specify the TCP port for netrpc") | ||
1230 | 273 | parser.add_option("-d", "--database", dest="db_name", help="specify the database name") | ||
1231 | 274 | parser.add_option("--login", dest="login", help="specify the User Login") | ||
1232 | 275 | parser.add_option("--password", dest="pwd", help="specify the User Password") | ||
1233 | 276 | parser.add_option("--translate-in", dest="translate_in", | ||
1234 | 277 | help="specify .po files to import translation terms") | ||
1235 | 278 | parser.add_option("--extra-addons", dest="extra_addons", | ||
1236 | 279 | help="specify extra_addons and trunkCommunity modules path ") | ||
1237 | 280 | |||
1238 | 281 | (opt, args) = parser.parse_args() | ||
1239 | 282 | if len(args) != 1: | ||
1240 | 283 | parser.error("incorrect number of arguments") | ||
1241 | 284 | command = args[0] | ||
1242 | 285 | if command not in ('start-server','create-db','drop-db','install-module','upgrade-module','check-quality','install-translation'): | ||
1243 | 286 | parser.error("incorrect command") | ||
1244 | 287 | |||
1245 | 288 | def die(cond, msg): | ||
1246 | 289 | if cond: | ||
1247 | 290 | print msg | ||
1248 | 291 | sys.exit(1) | ||
1249 | 292 | |||
1250 | 293 | die(opt.modules and (not opt.db_name), | ||
1251 | 294 | "the modules option cannot be used without the database (-d) option") | ||
1252 | 295 | |||
1253 | 296 | die(opt.translate_in and (not opt.db_name), | ||
1254 | 297 | "the translate-in option cannot be used without the database (-d) option") | ||
1255 | 298 | |||
1256 | 299 | options = { | ||
1257 | 300 | 'addons-path' : opt.addons_path or 'addons', | ||
1258 | 301 | 'quality-logs' : opt.quality_logs or '', | ||
1259 | 302 | 'root-path' : opt.root_path or '', | ||
1260 | 303 | 'translate-in': [], | ||
1261 | 304 | 'port' : opt.port or 8069, | ||
1262 | 305 | 'netport':opt.netport or 8070, | ||
1263 | 306 | 'database': opt.db_name or 'terp', | ||
1264 | 307 | 'modules' : map(string.strip, opt.modules.split(',')) if opt.modules else [], | ||
1265 | 308 | 'login' : opt.login or 'admin', | ||
1266 | 309 | 'pwd' : opt.pwd or '', | ||
1267 | 310 | 'extra-addons':opt.extra_addons or [] | ||
1268 | 311 | } | ||
1269 | 312 | # Hint:i18n-import=purchase:ar_AR.po+sale:fr_FR.po,nl_BE.po | ||
1270 | 313 | if opt.translate_in: | ||
1271 | 314 | translate = opt.translate_in | ||
1272 | 315 | for module_name,po_files in map(lambda x:tuple(x.split(':')),translate.split('+')): | ||
1273 | 316 | for po_file in po_files.split(','): | ||
1274 | 317 | if module_name == 'base': | ||
1275 | 318 | po_link = '%saddons/%s/i18n/%s'%(options['root-path'],module_name,po_file) | ||
1276 | 319 | else: | ||
1277 | 320 | po_link = '%s/%s/i18n/%s'%(options['addons-path'], module_name, po_file) | ||
1278 | 321 | options['translate-in'].append(po_link) | ||
1279 | 322 | |||
1280 | 323 | uri = 'http://localhost:' + str(options['port']) | ||
1281 | 324 | |||
1282 | 325 | server_thread = threading.Thread(target=start_server, | ||
1283 | 326 | args=(options['root-path'], options['port'],options['netport'], options['addons-path'])) | ||
1284 | 327 | try: | ||
1285 | 328 | server_thread.start() | ||
1286 | 329 | if command == 'create-db': | ||
1287 | 330 | create_db(uri, options['database'], options['login'], options['pwd']) | ||
1288 | 331 | if command == 'drop-db': | ||
1289 | 332 | drop_db(uri, options['database']) | ||
1290 | 333 | if command == 'install-module': | ||
1291 | 334 | install_module(uri, options['database'], options['modules'],options['addons-path'],options['extra-addons'],options['login'], options['pwd']) | ||
1292 | 335 | if command == 'upgrade-module': | ||
1293 | 336 | upgrade_module(uri, options['database'], options['modules'], options['login'], options['pwd']) | ||
1294 | 337 | if command == 'check-quality': | ||
1295 | 338 | check_quality(uri, options['login'], options['pwd'], options['database'], options['modules'], options['quality-logs']) | ||
1296 | 339 | if command == 'install-translation': | ||
1297 | 340 | import_translate(uri, options['login'], options['pwd'], options['database'], options['translate-in']) | ||
1298 | 341 | clean() | ||
1299 | 342 | sys.exit(0) | ||
1300 | 343 | |||
1301 | 344 | except xmlrpclib.Fault, e: | ||
1302 | 345 | print e.faultString | ||
1303 | 346 | clean() | ||
1304 | 347 | sys.exit(1) | ||
1305 | 348 | except Exception, e: | ||
1306 | 349 | print e | ||
1307 | 350 | clean() | ||
1308 | 351 | sys.exit(1) | ||
1309 | 352 | |||
1310 | 353 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: | ||
1311 | 0 | 354 | ||
1312 | === modified file 'openerp/cli/server.py' | |||
1313 | --- openerp/cli/server.py 2013-04-04 13:07:04 +0000 | |||
1314 | +++ openerp/cli/server.py 2013-05-16 08:48:42 +0000 | |||
1315 | @@ -1,4 +1,3 @@ | |||
1316 | 1 | #!/usr/bin/env python | ||
1317 | 2 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
1318 | 3 | ############################################################################## | 2 | ############################################################################## |
1319 | 4 | # | 3 | # |
1320 | 5 | 4 | ||
1321 | === modified file 'openerp/modules/loading.py' | |||
1322 | --- openerp/modules/loading.py 2013-04-11 07:30:17 +0000 | |||
1323 | +++ openerp/modules/loading.py 2013-05-16 08:48:42 +0000 | |||
1324 | @@ -96,10 +96,14 @@ | |||
1325 | 96 | 96 | ||
1326 | 97 | """ | 97 | """ |
1327 | 98 | for filename in package.data[kind]: | 98 | for filename in package.data[kind]: |
1328 | 99 | <<<<<<< TREE | ||
1329 | 99 | if kind == 'test': | 100 | if kind == 'test': |
1330 | 100 | _test_logger.info("module %s: loading %s", module_name, filename) | 101 | _test_logger.info("module %s: loading %s", module_name, filename) |
1331 | 101 | else: | 102 | else: |
1332 | 102 | _logger.info("module %s: loading %s", module_name, filename) | 103 | _logger.info("module %s: loading %s", module_name, filename) |
1333 | 104 | ======= | ||
1334 | 105 | _logger.info("module %s: loading %s", module_name, filename) | ||
1335 | 106 | >>>>>>> MERGE-SOURCE | ||
1336 | 103 | _, ext = os.path.splitext(filename) | 107 | _, ext = os.path.splitext(filename) |
1337 | 104 | pathname = os.path.join(module_name, filename) | 108 | pathname = os.path.join(module_name, filename) |
1338 | 105 | fp = tools.file_open(pathname) | 109 | fp = tools.file_open(pathname) |
1339 | 106 | 110 | ||
1340 | === modified file 'openerp/netsvc.py' | |||
1341 | --- openerp/netsvc.py 2013-04-04 13:07:04 +0000 | |||
1342 | +++ openerp/netsvc.py 2013-05-16 08:48:42 +0000 | |||
1343 | @@ -1,4 +1,3 @@ | |||
1344 | 1 | #!/usr/bin/env python | ||
1345 | 2 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
1346 | 3 | ############################################################################## | 2 | ############################################################################## |
1347 | 4 | # | 3 | # |
1348 | 5 | 4 | ||
1349 | === modified file 'openerp/osv/expression.py' | |||
1350 | --- openerp/osv/expression.py 2013-04-23 18:37:23 +0000 | |||
1351 | +++ openerp/osv/expression.py 2013-05-16 08:48:42 +0000 | |||
1352 | @@ -1,4 +1,3 @@ | |||
1353 | 1 | #!/usr/bin/env python | ||
1354 | 2 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
1355 | 3 | ############################################################################## | 2 | ############################################################################## |
1356 | 4 | # | 3 | # |
1357 | 5 | 4 | ||
1358 | === modified file 'openerp/report/render/rml2html/rml2html.py' | |||
1359 | --- openerp/report/render/rml2html/rml2html.py 2013-04-22 17:04:20 +0000 | |||
1360 | +++ openerp/report/render/rml2html/rml2html.py 2013-05-16 08:48:42 +0000 | |||
1361 | @@ -16,7 +16,7 @@ | |||
1362 | 16 | # | 16 | # |
1363 | 17 | # You should have received a copy of the GNU Lesser General Public | 17 | # You should have received a copy of the GNU Lesser General Public |
1364 | 18 | # License along with this library; if not, write to the Free Software | 18 | # License along with this library; if not, write to the Free Software |
1366 | 19 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1367 | 20 | # | 20 | # |
1368 | 21 | ############################################################################## | 21 | ############################################################################## |
1369 | 22 | 22 | ||
1370 | 23 | 23 | ||
1371 | === modified file 'openerp/report/render/rml2html/utils.py' | |||
1372 | --- openerp/report/render/rml2html/utils.py 2013-04-22 17:04:20 +0000 | |||
1373 | +++ openerp/report/render/rml2html/utils.py 2013-05-16 08:48:42 +0000 | |||
1374 | @@ -16,7 +16,7 @@ | |||
1375 | 16 | # | 16 | # |
1376 | 17 | # You should have received a copy of the GNU Lesser General Public | 17 | # You should have received a copy of the GNU Lesser General Public |
1377 | 18 | # License along with this library; if not, write to the Free Software | 18 | # License along with this library; if not, write to the Free Software |
1379 | 19 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1380 | 20 | # | 20 | # |
1381 | 21 | ############################################################################## | 21 | ############################################################################## |
1382 | 22 | 22 | ||
1383 | 23 | 23 | ||
1384 | === modified file 'openerp/report/render/rml2pdf/utils.py' | |||
1385 | --- openerp/report/render/rml2pdf/utils.py 2013-03-27 16:04:20 +0000 | |||
1386 | +++ openerp/report/render/rml2pdf/utils.py 2013-05-16 08:48:42 +0000 | |||
1387 | @@ -1,26 +1,8 @@ | |||
1388 | 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
1389 | 2 | ############################################################################## | 2 | ############################################################################## |
1390 | 3 | # | 3 | # |
1391 | 4 | # OpenERP, Open Source Management Solution | ||
1392 | 5 | # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). | ||
1393 | 6 | # | ||
1394 | 7 | # This program is free software: you can redistribute it and/or modify | ||
1395 | 8 | # it under the terms of the GNU Affero General Public License as | ||
1396 | 9 | # published by the Free Software Foundation, either version 3 of the | ||
1397 | 10 | # License, or (at your option) any later version. | ||
1398 | 11 | # | ||
1399 | 12 | # This program is distributed in the hope that it will be useful, | ||
1400 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1401 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1402 | 15 | # GNU Affero General Public License for more details. | ||
1403 | 16 | # | ||
1404 | 17 | # You should have received a copy of the GNU Affero General Public License | ||
1405 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1406 | 19 | # | ||
1407 | 20 | ############################################################################## | ||
1408 | 21 | |||
1409 | 22 | # trml2pdf - An RML to PDF converter | ||
1410 | 23 | # Copyright (C) 2003, Fabien Pinckaers, UCL, FSA | 4 | # Copyright (C) 2003, Fabien Pinckaers, UCL, FSA |
1411 | 5 | # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). | ||
1412 | 24 | # | 6 | # |
1413 | 25 | # This library is free software; you can redistribute it and/or | 7 | # This library is free software; you can redistribute it and/or |
1414 | 26 | # modify it under the terms of the GNU Lesser General Public | 8 | # modify it under the terms of the GNU Lesser General Public |
1415 | @@ -34,7 +16,9 @@ | |||
1416 | 34 | # | 16 | # |
1417 | 35 | # You should have received a copy of the GNU Lesser General Public | 17 | # You should have received a copy of the GNU Lesser General Public |
1418 | 36 | # License along with this library; if not, write to the Free Software | 18 | # License along with this library; if not, write to the Free Software |
1420 | 37 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1421 | 20 | # | ||
1422 | 21 | ############################################################################## | ||
1423 | 38 | 22 | ||
1424 | 39 | import copy | 23 | import copy |
1425 | 40 | import locale | 24 | import locale |
1426 | 41 | 25 | ||
1427 | === modified file 'openerp/service/cron.py' | |||
1428 | --- openerp/service/cron.py 2013-04-04 13:07:04 +0000 | |||
1429 | +++ openerp/service/cron.py 2013-05-16 08:48:42 +0000 | |||
1430 | @@ -1,4 +1,3 @@ | |||
1431 | 1 | #!/usr/bin/env python | ||
1432 | 2 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
1433 | 3 | ############################################################################## | 2 | ############################################################################## |
1434 | 4 | # | 3 | # |
1435 | 5 | 4 | ||
1436 | === modified file 'openerp/service/http_server.py' | |||
1437 | --- openerp/service/http_server.py 2013-02-12 14:24:10 +0000 | |||
1438 | +++ openerp/service/http_server.py 2013-05-16 08:48:42 +0000 | |||
1439 | @@ -23,7 +23,7 @@ | |||
1440 | 23 | # | 23 | # |
1441 | 24 | # You should have received a copy of the GNU General Public License | 24 | # You should have received a copy of the GNU General Public License |
1442 | 25 | # along with this program; if not, write to the Free Software | 25 | # along with this program; if not, write to the Free Software |
1444 | 26 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 26 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1445 | 27 | ############################################################################### | 27 | ############################################################################### |
1446 | 28 | 28 | ||
1447 | 29 | 29 | ||
1448 | 30 | 30 | ||
1449 | === modified file 'openerp/service/websrv_lib.py' | |||
1450 | --- openerp/service/websrv_lib.py 2013-02-12 14:24:10 +0000 | |||
1451 | +++ openerp/service/websrv_lib.py 2013-05-16 08:48:42 +0000 | |||
1452 | @@ -21,7 +21,7 @@ | |||
1453 | 21 | # | 21 | # |
1454 | 22 | # You should have received a copy of the GNU General Public License | 22 | # You should have received a copy of the GNU General Public License |
1455 | 23 | # along with this program; if not, write to the Free Software | 23 | # along with this program; if not, write to the Free Software |
1457 | 24 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 24 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1458 | 25 | ############################################################################### | 25 | ############################################################################### |
1459 | 26 | 26 | ||
1460 | 27 | 27 | ||
1461 | 28 | 28 | ||
1462 | === modified file 'openerp/tools/amount_to_text.py' | |||
1463 | --- openerp/tools/amount_to_text.py 2012-12-14 13:44:55 +0000 | |||
1464 | +++ openerp/tools/amount_to_text.py 2013-05-16 08:48:42 +0000 | |||
1465 | @@ -92,15 +92,15 @@ | |||
1466 | 92 | # Dutch | 92 | # Dutch |
1467 | 93 | #------------------------------------------------------------- | 93 | #------------------------------------------------------------- |
1468 | 94 | 94 | ||
1473 | 95 | to_19_nl = ( 'Nul', 'Een', 'Twee', 'Drie', 'Vier', 'Vijf', 'Zes', | 95 | to_19_nl = ( 'nul', 'een', 'twee', 'drie', 'vier', 'vijf', 'zes', |
1474 | 96 | 'Zeven', 'Acht', 'Negen', 'Tien', 'Elf', 'Twaalf', 'Dertien', | 96 | 'zeven', 'acht', 'negen', 'tien', 'elf', 'twaalf', 'dertien', |
1475 | 97 | 'Veertien', 'Vijftien', 'Zestien', 'Zeventien', 'Achttien', 'Negentien' ) | 97 | 'veertien', 'vijftien', 'zestien', 'zeventien', 'achttien', 'negentien' ) |
1476 | 98 | tens_nl = ( 'Twintig', 'Dertig', 'Veertig', 'Vijftig', 'Zestig', 'Zeventig', 'Tachtig', 'Negentig') | 98 | tens_nl = ( 'twintig', 'dertig', 'veertig', 'vijftig', 'zestig', 'zeventig', 'tachtig', 'negentig') |
1477 | 99 | denom_nl = ( '', | 99 | denom_nl = ( '', |
1482 | 100 | 'Duizend', 'Miljoen', 'Miljard', 'Triljoen', 'Quadriljoen', | 100 | 'duizend', ' miljoen', ' miljard', ' triljoen', ' quadriljoen', |
1483 | 101 | 'Quintillion', 'Sextiljoen', 'Septillion', 'Octillion', 'Nonillion', | 101 | ' quintillion', ' sextiljoen', ' septillion', ' octillion', ' nonillion', |
1484 | 102 | 'Decillion', 'Undecillion', 'Duodecillion', 'Tredecillion', 'Quattuordecillion', | 102 | ' decillion', ' undecillion', ' duodecillion', ' tredecillion', ' quattuordecillion', |
1485 | 103 | 'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Novemdecillion', 'Vigintillion' ) | 103 | ' sexdecillion', ' septendecillion', ' octodecillion', ' novemdecillion', ' vigintillion' ) |
1486 | 104 | 104 | ||
1487 | 105 | def _convert_nn_nl(val): | 105 | def _convert_nn_nl(val): |
1488 | 106 | """ convert a value < 100 to Dutch | 106 | """ convert a value < 100 to Dutch |
1489 | @@ -110,7 +110,7 @@ | |||
1490 | 110 | for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens_nl)): | 110 | for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens_nl)): |
1491 | 111 | if dval + 10 > val: | 111 | if dval + 10 > val: |
1492 | 112 | if val % 10: | 112 | if val % 10: |
1494 | 113 | return dcap + '-' + to_19_nl[val % 10] | 113 | return to_19_nl[val % 10] + 'en' + dcap |
1495 | 114 | return dcap | 114 | return dcap |
1496 | 115 | 115 | ||
1497 | 116 | def _convert_nnn_nl(val): | 116 | def _convert_nnn_nl(val): |
1498 | @@ -123,9 +123,7 @@ | |||
1499 | 123 | word = '' | 123 | word = '' |
1500 | 124 | (mod, rem) = (val % 100, val // 100) | 124 | (mod, rem) = (val % 100, val // 100) |
1501 | 125 | if rem > 0: | 125 | if rem > 0: |
1505 | 126 | word = to_19_nl[rem] + ' Honderd' | 126 | word = to_19_nl[rem] + 'honderd' |
1503 | 127 | if mod > 0: | ||
1504 | 128 | word += ' ' | ||
1506 | 129 | if mod > 0: | 127 | if mod > 0: |
1507 | 130 | word += _convert_nn_nl(mod) | 128 | word += _convert_nn_nl(mod) |
1508 | 131 | return word | 129 | return word |
1509 | @@ -140,9 +138,9 @@ | |||
1510 | 140 | mod = 1000 ** didx | 138 | mod = 1000 ** didx |
1511 | 141 | l = val // mod | 139 | l = val // mod |
1512 | 142 | r = val - (l * mod) | 140 | r = val - (l * mod) |
1514 | 143 | ret = _convert_nnn_nl(l) + ' ' + denom_nl[didx] | 141 | ret = _convert_nnn_nl(l) + denom_nl[didx] |
1515 | 144 | if r > 0: | 142 | if r > 0: |
1517 | 145 | ret = ret + ', ' + dutch_number(r) | 143 | ret = ret + ' ' + dutch_number(r) |
1518 | 146 | return ret | 144 | return ret |
1519 | 147 | 145 | ||
1520 | 148 | def amount_to_text_nl(number, currency): | 146 | def amount_to_text_nl(number, currency): |
1521 | @@ -153,7 +151,7 @@ | |||
1522 | 153 | end_word = dutch_number(int(list[1])) | 151 | end_word = dutch_number(int(list[1])) |
1523 | 154 | cents_number = int(list[1]) | 152 | cents_number = int(list[1]) |
1524 | 155 | cents_name = (cents_number > 1) and 'cent' or 'cent' | 153 | cents_name = (cents_number > 1) and 'cent' or 'cent' |
1526 | 156 | final_result = start_word +' '+units_name+' '+ end_word +' '+cents_name | 154 | final_result = " %s %s en %s %s" % (start_word, units_name, end_word, cents_name) |
1527 | 157 | return final_result | 155 | return final_result |
1528 | 158 | 156 | ||
1529 | 159 | #------------------------------------------------------------- | 157 | #------------------------------------------------------------- |
1530 | 160 | 158 | ||
1531 | === modified file 'setup.nsi' | |||
1532 | --- setup.nsi 2013-03-06 14:34:44 +0000 | |||
1533 | +++ setup.nsi 2013-05-16 08:48:42 +0000 | |||
1534 | @@ -21,7 +21,7 @@ | |||
1535 | 21 | # | 21 | # |
1536 | 22 | # You should have received a copy of the GNU General Public License | 22 | # You should have received a copy of the GNU General Public License |
1537 | 23 | # along with this program; if not, write to the Free Software | 23 | # along with this program; if not, write to the Free Software |
1539 | 24 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 24 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1540 | 25 | ##################################################################################### | 25 | ##################################################################################### |
1541 | 26 | 26 | ||
1542 | 27 | !include 'MUI2.nsh' | 27 | !include 'MUI2.nsh' |
1543 | 28 | 28 | ||
1544 | === modified file 'setup.py' (properties changed: +x to -x) | |||
1545 | --- setup.py 2013-05-06 07:48:25 +0000 | |||
1546 | +++ setup.py 2013-05-16 08:48:42 +0000 | |||
1547 | @@ -1,4 +1,3 @@ | |||
1548 | 1 | #!/usr/bin/env python | ||
1549 | 2 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
1550 | 3 | ############################################################################## | 2 | ############################################################################## |
1551 | 4 | # | 3 | # |
Diff has conflicts, did you mean to target lp:openobject-server/7.0?