Merge lp:~ludo-neobis/openobject-server/fix_for_bug_1180692 into lp:openobject-server

[Ludo (Neobis)]

Fix for bug 1180692, concerning the amount_to_text file from tools.

Please review.

[Stefan Rijnhart (Opener) (stefan-opener)]

Diff has conflicts, did you mean to target lp:openobject-server/7.0?

Unmerged revisions

4976. By Ludo van Zuylen <ludo@neosws03> on 2013-05-15

[FIX] - Fixed the representation of the dutch text. Style according to the site from "Onze Taal" (onzetaal.nl).

=== modified file 'debian/copyright'
--- debian/copyright	2011-10-06 00:18:10 +0000
+++ debian/copyright	2013-05-16 08:48:42 +0000
@@ -40,7 +40,7 @@
  .
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  .
  On Debian systems, the complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-2 file.
@@ -93,7 +93,7 @@
  .
  You should have received a copy of the GNU Library General Public
  License along with this library; if not, write to the Free
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  .
  On Debian systems, the complete text of the GNU Library General Public License
  can be found in /usr/share/common-licenses/LGPL-2.1 file.
@@ -137,7 +137,7 @@
  .
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  .
  On Debian systems, the complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-2 file.
@@ -159,7 +159,7 @@
  .
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  .
  On Debian systems, the complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-2 file.

=== modified file 'history/check_profile_l10n_all.py'
--- history/check_profile_l10n_all.py	2011-11-07 15:45:01 +0000
+++ history/check_profile_l10n_all.py	2013-05-16 08:48:42 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #    

=== modified file 'history/gen_graph.sh'
--- history/gen_graph.sh	2011-09-26 00:54:44 +0000
+++ history/gen_graph.sh	2013-05-16 08:48:42 +0000
@@ -24,7 +24,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

=== modified file 'openerp-wsgi.py'
--- openerp-wsgi.py	2012-09-24 10:50:11 +0000
+++ openerp-wsgi.py	2013-05-16 08:48:42 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/python
 # WSGI Handler sample configuration file.
 #
 # Change the appropriate settings below, in order to provide the parameters

=== modified file 'openerp/addons/base/i18n/de.po'
--- openerp/addons/base/i18n/de.po	2013-05-10 05:51:58 +0000
+++ openerp/addons/base/i18n/de.po	2013-05-16 08:48:42 +0000
@@ -5,17 +5,32 @@
 # Ferdinand Gassauer <[e-mail]>, 2010.
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-22 01:32+0000\n"
 "Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-04-24 12:39+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+"Language-Team: German <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n"
 "X-Generator: Launchpad (build 16598)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

=== modified file 'openerp/addons/base/i18n/et.po'
--- openerp/addons/base/i18n/et.po	2013-05-10 05:51:58 +0000
+++ openerp/addons/base/i18n/et.po	2013-05-16 08:48:42 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 18:17+0000\n"
 "Last-Translator: Ahti Hinnov <[e-mail]>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-04-25 15:21+0000\n"
+"Last-Translator: Illimar Saatväli <[e-mail]>\n"
+"Language-Team: Estonian <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n"
 "X-Generator: Launchpad (build 16598)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-26 06:23+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

=== modified file 'openerp/addons/base/i18n/fr.po'
--- openerp/addons/base/i18n/fr.po	2013-05-10 05:51:58 +0000
+++ openerp/addons/base/i18n/fr.po	2013-05-16 08:48:42 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-06 10:07+0000\n"
 "Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-13 14:03+0000\n"
+"Last-Translator: WANTELLET Sylvain <[e-mail]>\n"
+"Language-Team: French <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-05-10 05:43+0000\n"
 "X-Generator: Launchpad (build 16598)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -601,7 +615,7 @@
 #. module: base
 #: model:ir.module.module,summary:base.module_hr
 msgid "Jobs, Departments, Employees Details"
-msgstr "Postes, Départements, Détail des Employés"
+msgstr "Postes, départements, coordonnées des employés"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic
@@ -1262,7 +1276,7 @@
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr "Gestion de flotte"
+msgstr "Parc automobile"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -6817,7 +6831,7 @@
 #. module: base
 #: model:ir.module.module,summary:base.module_mrp
 msgid "Manufacturing Orders, Bill of Materials, Routing"
-msgstr "Ordres de fabrication, Nomenclature, Gammes opératoire"
+msgstr "Ordres de fabrication, nomenclature, gammes opératoires"
 
 #. module: base
 #: field:ir.attachment,name:0
@@ -8961,7 +8975,16 @@
 #. module: base
 #: field:change.password.user,user_login:0
 msgid "User Login"
-msgstr "Identifiant"
+<<<<<<< TREE
+msgstr "Identifiant"
+=======
+msgstr "Identifiant"
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters created by myself"
+msgstr "Mes filtres"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -9136,7 +9159,7 @@
 #. module: base
 #: view:ir.cron:0
 msgid "Scheduled Action"
-msgstr ""
+msgstr "Action plannifiée"
 
 #. module: base
 #: model:res.country,name:base.bi
@@ -9184,6 +9207,15 @@
 
 #. module: base
 #: view:res.partner:0
+<<<<<<< TREE
+=======
+#: view:res.users:0
+msgid "Tags..."
+msgstr "Étiquettes..."
+
+#. module: base
+#: view:res.partner:0
+>>>>>>> MERGE-SOURCE
 msgid "at"
 msgstr ""
 
@@ -9208,6 +9240,14 @@
 msgstr "Format de fichier"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:ir.filters:0
+msgid "My filters"
+msgstr "Mes filtres"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: field:res.lang,iso_code:0
 msgid "ISO code"
 msgstr "Code ISO"
@@ -9451,7 +9491,7 @@
 #. module: base
 #: view:base.language.export:0
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. module: base
 #: help:res.currency.rate,currency_rate_type_id:0
@@ -9519,7 +9559,7 @@
 #. module: base
 #: model:ir.module.module,summary:base.module_account_accountant
 msgid "Financial and Analytic Accounting"
-msgstr ""
+msgstr "Comptabilité financière et analytique"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project
@@ -9542,7 +9582,7 @@
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendeur"
 
 #. module: base
 #: view:res.lang:0
@@ -9614,7 +9654,7 @@
 #: code:addons/base/ir/ir_model.py:728
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
-msgstr ""
+msgstr "Désolé, vous n’êtes pas autorisé à modifier ce document."
 
 #. module: base
 #: code:addons/base/res/res_config.py:350
@@ -9705,7 +9745,7 @@
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
 msgid "Distributor"
-msgstr ""
+msgstr "Distributeur"
 
 #. module: base
 #: help:ir.actions.server,subject:0
@@ -9962,7 +10002,7 @@
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Payment Follow-up Management"
-msgstr ""
+msgstr "Gestion des relances de paiement"
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
@@ -10204,7 +10244,7 @@
 #. module: base
 #: field:ir.translation,name:0
 msgid "Translated field"
-msgstr ""
+msgstr "Champ traduit"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_location
@@ -10224,7 +10264,7 @@
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Gestion documentaire de pages Web"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ar
@@ -10234,7 +10274,7 @@
 #. module: base
 #: field:ir.module.module,description_html:0
 msgid "Description HTML"
-msgstr ""
+msgstr "Description HTML"
 
 #. module: base
 #: help:res.groups,implied_ids:0
@@ -10245,7 +10285,7 @@
 #. module: base
 #: model:ir.module.module,summary:base.module_note
 msgid "Sticky notes, Collaborative, Memos"
-msgstr ""
+msgstr "Notes repositionnables, collaboratif, mémos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_attendance
@@ -10392,7 +10432,7 @@
 #. module: base
 #: field:res.currency,position:0
 msgid "Symbol Position"
-msgstr ""
+msgstr "Position du symbole"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_de
@@ -10430,7 +10470,7 @@
 #. module: base
 #: view:base.language.export:0
 msgid "documentation"
-msgstr ""
+msgstr "documentation"
 
 #. module: base
 #: help:ir.model,osv_memory:0
@@ -10476,7 +10516,7 @@
 #: code:addons/base/ir/ir_model.py:730
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
-msgstr ""
+msgstr "Désolé, vous n’êtes pas autorisé à supprimer ce document."
 
 #. module: base
 #: constraint:ir.rule:0
@@ -10549,7 +10589,7 @@
 #. module: base
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Mes documents"
 
 #. module: base
 #: help:ir.actions.act_window,res_model:0
@@ -10626,12 +10666,12 @@
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
 msgid "Silver"
-msgstr ""
+msgstr "Argent"
 
 #. module: base
 #: field:res.partner.title,shortcut:0
 msgid "Abbreviation"
-msgstr ""
+msgstr "Abréviation"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
@@ -11115,7 +11155,7 @@
 #: code:addons/base/module/module.py:499
 #, python-format
 msgid "The `base` module cannot be uninstalled"
-msgstr ""
+msgstr "Le module \"base\" ne peut pas être désinstallé"
 
 #. module: base
 #: code:addons/base/ir/ir_cron.py:254
@@ -11142,7 +11182,7 @@
 #: code:addons/base/ir/ir_model.py:729
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
-msgstr ""
+msgstr "Désolé, vous n'êtes pas autorisé à créer ce type de document."
 
 #. module: base
 #: field:base.language.export,lang:0
@@ -11184,7 +11224,7 @@
 #. module: base
 #: field:ir.model.fields,on_delete:0
 msgid "On Delete"
-msgstr ""
+msgstr "En cas de suppression"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:348

=== modified file 'openerp/addons/base/i18n/id.po'
--- openerp/addons/base/i18n/id.po	2013-05-10 05:51:58 +0000
+++ openerp/addons/base/i18n/id.po	2013-05-16 08:48:42 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-02-22 17:30+0000\n"
 "Last-Translator: Agus Purnomo <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-13 05:49+0000\n"
+"Last-Translator: David Leonardi <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Indonesian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-05-10 05:44+0000\n"
 "X-Generator: Launchpad (build 16598)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -25,6 +36,9 @@
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Modul untuk menulis dan mencetak Cek\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -58,7 +72,7 @@
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Kontrol Penawaran, Pesanan Penjualan, Pengiriman & Faktur"
 
 #. module: base
 #: selection:ir.sequence,implementation:0

=== modified file 'openerp/addons/base/i18n/lt.po'
--- openerp/addons/base/i18n/lt.po	2013-05-10 05:51:58 +0000
+++ openerp/addons/base/i18n/lt.po	2013-05-16 08:48:42 +0000
@@ -1,20 +1,41 @@
+<<<<<<< TREE
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
 #	* base
+=======
+# Lithuanian translation for openobject-server
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-server package.
+# Giedrius Slavinskas <[e-mail]>, 2012.
+>>>>>>> MERGE-SOURCE
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-20 15:52+0000\n"
 "Last-Translator: Paulius Sladkevičius <[e-mail]>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-07 09:54+0000\n"
+"Last-Translator: Paulius Sladkevičius <[e-mail]>\n"
+"Language-Team: Lithuanian <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-05-10 05:46+0000\n"
 "X-Generator: Launchpad (build 16598)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -26,6 +47,14 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.partner.bank:0
+msgid "e.g. GEBABEBB"
+msgstr "pvz. GEBABEBB"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
 msgstr "Šv. Elenos sala"
@@ -649,6 +678,14 @@
 msgstr "Pardavimai ir pirkimai"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "Put an internal note..."
+msgstr "Įveskite vidines pastabas..."
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: view:ir.translation:0
 msgid "Untranslated"
 msgstr "Neišversta"
@@ -977,6 +1014,18 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "ZIP"
+msgstr "Pašto kodas"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: selection:base.language.install,lang:0
 msgid "Spanish (UY) / Español (UY)"
 msgstr ""
@@ -2717,12 +2766,16 @@
 #: field:ir.translation,res_id:0
 #: field:ir.values,res_id:0
 msgid "Record ID"
+<<<<<<< TREE
 msgstr "Įrašo ID"
 
 #. module: base
 #: view:ir.filters:0
 msgid "My Filters"
 msgstr ""
+=======
+msgstr "Įrašo ID"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: field:ir.actions.server,email:0
@@ -3111,6 +3164,14 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.company:0
+msgid "e.g. Global Business Solutions"
+msgstr "pvz. Global Business Solutions"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: field:res.company,rml_header1:0
 msgid "Company Tagline"
 msgstr "Įmonės šūkis"
@@ -5998,7 +6059,16 @@
 #. module: base
 #: model:res.country,name:base.um
 msgid "USA Minor Outlying Islands"
-msgstr "JAV smulkios atokios salos"
+<<<<<<< TREE
+msgstr "JAV smulkios atokios salos"
+=======
+msgstr "JAV smulkios atokios salos"
+
+#. module: base
+#: view:base.language.import:0
+msgid "e.g. English"
+msgstr "pvz. English"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -6084,6 +6154,16 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.users:0
+msgid "e.g. www.openerp.com"
+msgstr "pvz. www.openerp.com"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: selection:ir.cron,interval_type:0
 msgid "Hours"
 msgstr "Valandos"
@@ -7296,7 +7376,16 @@
 #. module: base
 #: field:change.password.user,user_login:0
 msgid "User Login"
-msgstr "Naudotojo registracijos vardas"
+<<<<<<< TREE
+msgstr "Naudotojo registracijos vardas"
+=======
+msgstr "Naudotojo registracijos vardas"
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters created by myself"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -7515,6 +7604,15 @@
 
 #. module: base
 #: view:res.partner:0
+<<<<<<< TREE
+=======
+#: view:res.users:0
+msgid "Tags..."
+msgstr "Žymos..."
+
+#. module: base
+#: view:res.partner:0
+>>>>>>> MERGE-SOURCE
 msgid "at"
 msgstr "su"
 
@@ -10168,6 +10266,17 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.users:0
+msgid "Street..."
+msgstr "Gatvė..."
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
@@ -11452,7 +11561,17 @@
 #. module: base
 #: field:res.partner,customer:0
 msgid "Customer"
-msgstr "Pirkėjas"
+<<<<<<< TREE
+msgstr "Pirkėjas"
+=======
+msgstr "Pirkėjas"
+
+#. module: base
+#: view:res.partner:0
+#: view:res.users:0
+msgid "e.g. +32.81.81.37.00"
+msgstr "pvz. +32.81.81.37.00"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -14618,6 +14737,14 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "e.g. Sales Director"
+msgstr "pvz. Pardavimų vadovas"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
 msgstr ""
@@ -14791,6 +14918,14 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:base.language.import:0
+msgid "e.g. en_US"
+msgstr "pvz. en_US"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:ir.module.module,description:base.module_l10n_hn
 msgid ""
 "\n"

=== modified file 'openerp/addons/base/i18n/ro.po'
--- openerp/addons/base/i18n/ro.po	2013-05-10 05:51:58 +0000
+++ openerp/addons/base/i18n/ro.po	2013-05-16 08:48:42 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2013-01-05 18:18+0000\n"
 "Last-Translator: Fekete Mihai <[e-mail]>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-07 16:32+0000\n"
+"Last-Translator: Dorin <[e-mail]>\n"
+"Language-Team: Romanian <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-05-10 05:47+0000\n"
 "X-Generator: Launchpad (build 16598)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

=== modified file 'openerp/addons/base/i18n/tr.po'
--- openerp/addons/base/i18n/tr.po	2013-05-10 05:51:58 +0000
+++ openerp/addons/base/i18n/tr.po	2013-05-16 08:48:42 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-28 08:41+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-05 17:30+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-05-10 05:48+0000\n"
 "X-Generator: Launchpad (build 16598)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-06 06:35+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -3281,6 +3295,14 @@
 msgstr ""
 
 #. module: base
+<<<<<<< TREE
+=======
+#: view:res.company:0
+msgid "e.g. Global Business Solutions"
+msgstr "e.g. Global İş Çözümleri"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: field:res.company,rml_header1:0
 msgid "Company Tagline"
 msgstr "Firma Sloganı"
@@ -6766,6 +6788,14 @@
 msgstr "ir.cron"
 
 #. module: base
+<<<<<<< TREE
+=======
+#: model:ir.ui.menu,name:base.menu_sales_followup
+msgid "Payment Follow-up"
+msgstr "Ödeme Takibi"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
 #: model:res.country,name:base.cw
 msgid "Curaçao"
 msgstr ""

=== modified file 'openerp/addons/base/ir/ir_ui_menu.py'
--- openerp/addons/base/ir/ir_ui_menu.py	2013-03-29 14:07:23 +0000
+++ openerp/addons/base/ir/ir_ui_menu.py	2013-05-16 08:48:42 +0000
@@ -299,8 +299,33 @@
             - the needaction counter of the related action, taking into account
               the action domain
         """
+        if context is None:
+            context = {}
         res = {}
+        menu_ids = set()
         for menu in self.browse(cr, uid, ids, context=context):
+            menu_ids.add(menu.id)
+            ctx = None
+            if menu.action and menu.action.type in ('ir.actions.act_window', 'ir.actions.client') and menu.action.context:
+                try:
+                    # use magical UnquoteEvalContext to ignore undefined client-side variables such as `active_id`
+                    eval_ctx = tools.UnquoteEvalContext(**context)
+                    ctx = eval(menu.action.context, locals_dict=eval_ctx, nocopy=True) or None
+                except Exception:
+                    # if the eval still fails for some reason, we'll simply skip this menu
+                    pass
+            menu_ref = ctx and ctx.get('needaction_menu_ref')
+            if menu_ref:
+                if not isinstance(menu_ref, list):
+                    menu_ref = [menu_ref]
+                model_data_obj = self.pool.get('ir.model.data')
+                for menu_data in menu_ref:
+                    model, id = model_data_obj.get_object_reference(cr, uid, menu_data.split('.')[0], menu_data.split('.')[1])
+                    if (model == 'ir.ui.menu'):
+                        menu_ids.add(id)
+        menu_ids = list(menu_ids)
+
+        for menu in self.browse(cr, uid, menu_ids, context=context):
             res[menu.id] = {
                 'needaction_enabled': False,
                 'needaction_counter': False,

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2013-04-24 13:19:36 +0000
+++ openerp/addons/base/res/res_partner.py	2013-05-16 08:48:42 +0000
@@ -74,7 +74,8 @@
 
 
 def _tz_get(self,cr,uid, context=None):
-    return [(x, x) for x in pytz.all_timezones]
+    # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728
+    return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
 
 class res_partner_category(osv.osv):
 
@@ -462,7 +463,7 @@
         """ Sync commercial fields and address fields from company and to children after create/update,
         just as if those were all modeled as fields.related to the parent """
         # 1. From UPSTREAM: sync from parent
-        if update_values.get('parent_id') or update_values.get('use_company_address'):
+        if update_values.get('parent_id') or update_values.get('use_parent_address'):
             # 1a. Commercial fields: sync if parent changed
             if update_values.get('parent_id'):
                 self._commercial_sync_from_company(cr, uid, partner, context=context)

=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml	2013-04-22 09:36:55 +0000
+++ openerp/addons/base/res/res_partner_view.xml	2013-05-16 08:48:42 +0000
@@ -157,8 +157,8 @@
                             <div>
                                 <field name="use_parent_address" class="oe_edit_only oe_inline"
                                        on_change="onchange_address(use_parent_address, parent_id)"
-                                       attrs="{'invisible': [('parent_id','=', False)]}"/>
-                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False)]}"/>
+                                       attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
                                 <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
                                         attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
                                 <field name="street" placeholder="Street..."  attrs="{'readonly': [('use_parent_address','=',True)]}"/>

=== modified file 'openerp/addons/base/tests/test_base.py'
--- openerp/addons/base/tests/test_base.py	2013-04-22 09:36:55 +0000
+++ openerp/addons/base/tests/test_base.py	2013-05-16 08:48:42 +0000
@@ -61,6 +61,24 @@
         self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync')
         self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync')
         self.assertEqual(p1.email, '[e-mail]', 'Email should be preserved after sync')
+
+        # turn off sync
+        p1street = 'Different street, 42'
+        p1.write({'street': p1street,
+                  'use_parent_address': False})
+        p1.refresh(), ghoststep.refresh() 
+        self.assertEqual(p1.street, p1street, 'Address fields must not be synced after turning sync off')
+        self.assertNotEqual(ghoststep.street, p1street, 'Parent address must never be touched')
+
+        # turn on sync again       
+        p1.write({'use_parent_address': True})
+        p1.refresh()
+        self.assertEqual(p1.street, ghoststep.street, 'Address fields must be synced again')
+        self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync')
+        self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync')
+        self.assertEqual(p1.email, '[e-mail]', 'Email should be preserved after sync')
+
+        # Modify parent, sync to children
         ghoststreet = 'South Street, 25'
         ghoststep.write({'street': ghoststreet})
         p1.refresh()

=== added file 'openerp/addons/base_quality_interrogation.py.OTHER'
--- openerp/addons/base_quality_interrogation.py.OTHER	1970-01-01 00:00:00 +0000
+++ openerp/addons/base_quality_interrogation.py.OTHER	2013-05-16 08:48:42 +0000
@@ -0,0 +1,353 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import xmlrpclib
+import optparse
+import sys
+import threading
+import os
+import time
+import base64
+import socket
+import string
+
+admin_passwd = 'admin'
+waittime = 10
+wait_count = 0
+wait_limit = 12
+
+def to_decode(s):
+    try:
+        return s.encode('utf-8')
+    except UnicodeError:
+        try:
+            return s.encode('latin')
+        except UnicodeError:
+            try:
+                return s.decode('ascii')
+            except UnicodeError:
+                return s
+
+def start_server(root_path, port, netport, addons_path):
+    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))
+def clean():
+    if os.path.isfile('openerp.pid'):
+        ps = open('openerp.pid')
+        if ps:
+            pid = int(ps.read())
+            ps.close()
+            if pid:
+                os.kill(pid,9)
+
+def execute(connector, method, *args):
+    global wait_count
+    res = False
+    try:
+        res = getattr(connector,method)(*args)
+    except socket.error,e:
+        if e.args[0] == 111:
+            if wait_count > wait_limit:
+                print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds." % wait_limit
+                clean()
+                sys.exit(1)
+            print 'Please wait %d sec to start server....' % waittime
+            wait_count += 1
+            time.sleep(waittime)
+            res = execute(connector, method, *args)
+        else:
+            raise e
+    wait_count = 0
+    return res
+
+def login(uri, dbname, user, pwd):
+    conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common')
+    uid = execute(conn,'login',dbname, user, pwd)
+    return uid
+
+def import_translate(uri, user, pwd, dbname, translate_in):
+    uid = login(uri, dbname, user, pwd)
+    if uid:
+        conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+        wiz_id = execute(conn,'create',dbname, uid, pwd, 'base.language.import')
+        for trans_in in translate_in:
+            lang,ext = os.path.splitext(trans_in.split('/')[-1])
+            state = 'init'
+            datas = {'form':{}}
+            while state!='end':
+                res = execute(conn,'execute',dbname, uid, pwd, wiz_id, datas, state, {})
+                if 'datas' in res:
+                    datas['form'].update( res['datas'].get('form',{}) )
+                if res['type']=='form':
+                    for field in res['fields'].keys():
+                        datas['form'][field] = res['fields'][field].get('value', False)
+                    state = res['state'][-1][0]
+                    trans_obj = open(trans_in)
+                    datas['form'].update({
+                        'name': lang,
+                        'code': lang,
+                        'data' : base64.encodestring(trans_obj.read())
+                    })
+                    trans_obj.close()
+                elif res['type']=='action':
+                    state = res['state']
+
+
+def check_quality(uri, user, pwd, dbname, modules, quality_logs):
+    uid = login(uri, dbname, user, pwd)
+    quality_logs += 'quality-logs'
+    if uid:
+        conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+        final = {}
+        for module in modules:
+            qualityresult = {}
+            test_detail = {}
+            quality_result = execute(conn,'execute', dbname, uid, pwd,'module.quality.check','check_quality',module)
+            detail_html = ''
+            html = '''<html><body><a name="TOP"></a>'''
+            html +="<h1> Module: %s </h1>"%(quality_result['name'])
+            html += "<h2> Final score: %s</h2>"%(quality_result['final_score'])
+            html += "<div id='tabs'>"
+            html += "<ul>"
+            for x,y,detail in quality_result['check_detail_ids']:
+                test = detail.get('name')
+                msg = detail.get('message','')
+                score = round(float(detail.get('score',0)),2)
+                html += "<li><a href=\"#%s\">%s</a></li>"%(test.replace(' ','-'),test)
+                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', ''))
+                test_detail[test] = (score,msg,detail.get('detail',''))
+            html += "</ul>"
+            html += "%s"% detail_html
+            html += "</div></body></html>"
+            if not os.path.isdir(quality_logs):
+                os.mkdir(quality_logs)
+            fp = open('%s/%s.html'%(quality_logs,module),'wb')
+            fp.write(to_decode(html))
+            fp.close()
+            #final[quality_result['name']] = (quality_result['final_score'],html,test_detail)
+
+        #fp = open('quality_log.pck','wb')
+        #pck_obj = pickle.dump(final,fp)
+        #fp.close()
+        #print "LOG PATH%s"%(os.path.realpath('quality_log.pck'))
+        return True
+    else:
+        print 'Login Failed...'
+        clean()
+        sys.exit(1)
+
+
+
+def wait(id,url=''):
+    progress=0.0
+    sock2 = xmlrpclib.ServerProxy(url+'/xmlrpc/db')
+    while not progress==1.0:
+        progress,users = execute(sock2,'get_progress',admin_passwd, id)
+    return True
+
+
+def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
+    conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/db')
+    obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+    wiz_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+    login_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common')
+    db_list = execute(conn, 'list')
+    if dbname in db_list:
+        drop_db(uri, dbname)
+    id = execute(conn,'create',admin_passwd, dbname, True, lang)
+    wait(id,uri)    
+    install_module(uri, dbname, ['base_module_quality'],user=user,pwd=pwd)
+    return True
+
+def drop_db(uri, dbname):
+    conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/db')
+    db_list = execute(conn,'list')
+    if dbname in db_list:
+        execute(conn, 'drop', admin_passwd, dbname)
+    return True
+
+def make_links(uri, uid, dbname, source, destination, module, user, pwd):
+    if module in ('base','quality_integration_server'):
+        return True
+    if os.path.islink(destination + '/' + module):
+        os.unlink(destination + '/' + module)                
+    for path in source:
+        if os.path.isdir(path + '/' + module):
+            os.symlink(path + '/' + module, destination + '/' + module)
+            obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+            execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'update_list')
+            module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','=',module)])
+            if len(module_ids):
+                data = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'read', module_ids[0],['name','dependencies_id'])
+                dep_datas = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module.dependency', 'read', data['dependencies_id'],['name'])
+                for dep_data in dep_datas:
+                    make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd)
+    return False
+
+def install_module(uri, dbname, modules, addons='', extra_addons='',  user='admin', pwd='admin'):
+    uid = login(uri, dbname, user, pwd)
+    if extra_addons:
+        extra_addons = extra_addons.split(',')
+    if uid:
+        if addons and extra_addons:
+            for module in modules:
+                make_links(uri, uid, dbname, extra_addons, addons, module, user, pwd)
+
+        obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+        wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+        module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)])
+        execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_install', module_ids)
+        wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple')
+        state = 'init'
+        datas = {}
+        #while state!='menu':
+        while state!='end':
+            res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
+            if state == 'init':
+                state = 'start'
+            elif state == 'start':
+                state = 'end'
+    return True
+
+def upgrade_module(uri, dbname, modules, user='admin', pwd='admin'):
+    uid = login(uri, dbname, user, pwd)
+    if uid:
+        obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+        wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+        module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)])
+        execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_upgrade', module_ids)
+        wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple')
+        state = 'init'
+        datas = {}
+        #while state!='menu':
+        while state!='end':
+            res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
+            if state == 'init':
+                state = 'start'
+            elif state == 'start':
+                state = 'end'
+
+    return True
+
+
+
+
+
+usage = """%prog command [options]
+
+Basic Commands:
+    start-server         Start Server
+    create-db            Create new database
+    drop-db              Drop database
+    install-module       Install module
+    upgrade-module       Upgrade module
+    install-translation  Install translation file
+    check-quality        Calculate quality and dump quality result into quality_log.pck using pickle
+"""
+parser = optparse.OptionParser(usage)
+parser.add_option("--modules", dest="modules",
+                     help="specify modules to install or check quality")
+parser.add_option("--addons-path", dest="addons_path", help="specify the addons path")
+parser.add_option("--quality-logs", dest="quality_logs", help="specify the path of quality logs files which has to stores")
+parser.add_option("--root-path", dest="root_path", help="specify the root path")
+parser.add_option("-p", "--port", dest="port", help="specify the TCP port", type="int")
+parser.add_option("--net_port", dest="netport",help="specify the TCP port for netrpc")
+parser.add_option("-d", "--database", dest="db_name", help="specify the database name")
+parser.add_option("--login", dest="login", help="specify the User Login")
+parser.add_option("--password", dest="pwd", help="specify the User Password")
+parser.add_option("--translate-in", dest="translate_in",
+                     help="specify .po files to import translation terms")
+parser.add_option("--extra-addons", dest="extra_addons",
+                     help="specify extra_addons and trunkCommunity modules path ")
+
+(opt, args) = parser.parse_args()
+if len(args) != 1:
+    parser.error("incorrect number of arguments")
+command = args[0]
+if command not in ('start-server','create-db','drop-db','install-module','upgrade-module','check-quality','install-translation'):
+    parser.error("incorrect command")
+
+def die(cond, msg):
+    if cond:
+        print msg
+        sys.exit(1)
+
+die(opt.modules and (not opt.db_name),
+        "the modules option cannot be used without the database (-d) option")
+
+die(opt.translate_in and (not opt.db_name),
+        "the translate-in option cannot be used without the database (-d) option")
+
+options = {
+    'addons-path' : opt.addons_path or 'addons',
+    'quality-logs' : opt.quality_logs or '',
+    'root-path' : opt.root_path or '',
+    'translate-in': [],
+    'port' : opt.port or 8069,
+    'netport':opt.netport or 8070,
+    'database': opt.db_name or 'terp',
+    'modules' : map(string.strip, opt.modules.split(',')) if opt.modules else [],
+    'login' : opt.login or 'admin',
+    'pwd' : opt.pwd or '',
+    'extra-addons':opt.extra_addons or []
+}
+# Hint:i18n-import=purchase:ar_AR.po+sale:fr_FR.po,nl_BE.po
+if opt.translate_in:
+    translate = opt.translate_in
+    for module_name,po_files in map(lambda x:tuple(x.split(':')),translate.split('+')):
+        for po_file in po_files.split(','):
+            if module_name == 'base':
+                po_link = '%saddons/%s/i18n/%s'%(options['root-path'],module_name,po_file)
+            else:
+                po_link = '%s/%s/i18n/%s'%(options['addons-path'], module_name, po_file)
+            options['translate-in'].append(po_link)
+
+uri = 'http://localhost:' + str(options['port'])
+
+server_thread = threading.Thread(target=start_server,
+                args=(options['root-path'], options['port'],options['netport'], options['addons-path']))
+try:
+    server_thread.start()
+    if command == 'create-db':
+        create_db(uri, options['database'], options['login'], options['pwd'])
+    if command == 'drop-db':
+        drop_db(uri, options['database'])
+    if command == 'install-module':
+        install_module(uri, options['database'], options['modules'],options['addons-path'],options['extra-addons'],options['login'], options['pwd'])
+    if command == 'upgrade-module':
+        upgrade_module(uri, options['database'], options['modules'], options['login'], options['pwd'])
+    if command == 'check-quality':
+        check_quality(uri, options['login'], options['pwd'], options['database'], options['modules'], options['quality-logs'])
+    if command == 'install-translation':
+        import_translate(uri, options['login'], options['pwd'], options['database'], options['translate-in'])
+    clean()
+    sys.exit(0)
+
+except xmlrpclib.Fault, e:
+    print e.faultString
+    clean()
+    sys.exit(1)
+except Exception, e:
+    print e
+    clean()
+    sys.exit(1)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'openerp/cli/server.py'
--- openerp/cli/server.py	2013-04-04 13:07:04 +0000
+++ openerp/cli/server.py	2013-05-16 08:48:42 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py	2013-04-11 07:30:17 +0000
+++ openerp/modules/loading.py	2013-05-16 08:48:42 +0000
@@ -96,10 +96,14 @@
 
         """
         for filename in package.data[kind]:
+<<<<<<< TREE
             if kind == 'test':
                 _test_logger.info("module %s: loading %s", module_name, filename)
             else:
                 _logger.info("module %s: loading %s", module_name, filename)
+=======
+            _logger.info("module %s: loading %s", module_name, filename)
+>>>>>>> MERGE-SOURCE
             _, ext = os.path.splitext(filename)
             pathname = os.path.join(module_name, filename)
             fp = tools.file_open(pathname)

=== modified file 'openerp/netsvc.py'
--- openerp/netsvc.py	2013-04-04 13:07:04 +0000
+++ openerp/netsvc.py	2013-05-16 08:48:42 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py	2013-04-23 18:37:23 +0000
+++ openerp/osv/expression.py	2013-05-16 08:48:42 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'openerp/report/render/rml2html/rml2html.py'
--- openerp/report/render/rml2html/rml2html.py	2013-04-22 17:04:20 +0000
+++ openerp/report/render/rml2html/rml2html.py	2013-05-16 08:48:42 +0000
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

=== modified file 'openerp/report/render/rml2html/utils.py'
--- openerp/report/render/rml2html/utils.py	2013-04-22 17:04:20 +0000
+++ openerp/report/render/rml2html/utils.py	2013-05-16 08:48:42 +0000
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

=== modified file 'openerp/report/render/rml2pdf/utils.py'
--- openerp/report/render/rml2pdf/utils.py	2013-03-27 16:04:20 +0000
+++ openerp/report/render/rml2pdf/utils.py	2013-05-16 08:48:42 +0000
@@ -1,26 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-# trml2pdf - An RML to PDF converter
 # Copyright (C) 2003, Fabien Pinckaers, UCL, FSA
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -34,7 +16,9 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+##############################################################################
 
 import copy
 import locale

=== modified file 'openerp/service/cron.py'
--- openerp/service/cron.py	2013-04-04 13:07:04 +0000
+++ openerp/service/cron.py	2013-05-16 08:48:42 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'openerp/service/http_server.py'
--- openerp/service/http_server.py	2013-02-12 14:24:10 +0000
+++ openerp/service/http_server.py	2013-05-16 08:48:42 +0000
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ###############################################################################
 
 

=== modified file 'openerp/service/websrv_lib.py'
--- openerp/service/websrv_lib.py	2013-02-12 14:24:10 +0000
+++ openerp/service/websrv_lib.py	2013-05-16 08:48:42 +0000
@@ -21,7 +21,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ###############################################################################
 
 

=== modified file 'openerp/tools/amount_to_text.py'
--- openerp/tools/amount_to_text.py	2012-12-14 13:44:55 +0000
+++ openerp/tools/amount_to_text.py	2013-05-16 08:48:42 +0000
@@ -92,15 +92,15 @@
 # Dutch
 #-------------------------------------------------------------
 
-to_19_nl = ( 'Nul',  'Een',   'Twee',  'Drie', 'Vier',   'Vijf',   'Zes',
-          'Zeven', 'Acht', 'Negen', 'Tien',   'Elf', 'Twaalf', 'Dertien',
-          'Veertien', 'Vijftien', 'Zestien', 'Zeventien', 'Achttien', 'Negentien' )
-tens_nl  = ( 'Twintig', 'Dertig', 'Veertig', 'Vijftig', 'Zestig', 'Zeventig', 'Tachtig', 'Negentig')
+to_19_nl = ( 'nul',  'een',   'twee',  'drie', 'vier',   'vijf',   'zes',
+          'zeven', 'acht', 'negen', 'tien',   'elf', 'twaalf', 'dertien',
+          'veertien', 'vijftien', 'zestien', 'zeventien', 'achttien', 'negentien' )
+tens_nl  = ( 'twintig', 'dertig', 'veertig', 'vijftig', 'zestig', 'zeventig', 'tachtig', 'negentig')
 denom_nl = ( '',
-          'Duizend', 'Miljoen', 'Miljard', 'Triljoen', 'Quadriljoen',
-           'Quintillion', 'Sextiljoen', 'Septillion', 'Octillion', 'Nonillion',
-           'Decillion', 'Undecillion', 'Duodecillion', 'Tredecillion', 'Quattuordecillion',
-           'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Novemdecillion', 'Vigintillion' )
+          'duizend', ' miljoen', ' miljard', ' triljoen', ' quadriljoen',
+           ' quintillion', ' sextiljoen', ' septillion', ' octillion', ' nonillion',
+           ' decillion', ' undecillion', ' duodecillion', ' tredecillion', ' quattuordecillion',
+           ' sexdecillion', ' septendecillion', ' octodecillion', ' novemdecillion', ' vigintillion' )
 
 def _convert_nn_nl(val):
     """ convert a value < 100 to Dutch
@@ -110,7 +110,7 @@
     for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens_nl)):
         if dval + 10 > val:
             if val % 10:
-                return dcap + '-' + to_19_nl[val % 10]
+                return to_19_nl[val % 10] + 'en' + dcap
             return dcap
 
 def _convert_nnn_nl(val):
@@ -123,9 +123,7 @@
     word = ''
     (mod, rem) = (val % 100, val // 100)
     if rem > 0:
-        word = to_19_nl[rem] + ' Honderd'
-        if mod > 0:
-            word += ' '
+        word = to_19_nl[rem] + 'honderd'
     if mod > 0:
         word += _convert_nn_nl(mod)
     return word
@@ -140,9 +138,9 @@
             mod = 1000 ** didx
             l = val // mod
             r = val - (l * mod)
-            ret = _convert_nnn_nl(l) + ' ' + denom_nl[didx]
+            ret = _convert_nnn_nl(l) + denom_nl[didx]
             if r > 0:
-                ret = ret + ', ' + dutch_number(r)
+                ret = ret + ' ' + dutch_number(r)
             return ret
 
 def amount_to_text_nl(number, currency):
@@ -153,7 +151,7 @@
     end_word = dutch_number(int(list[1]))
     cents_number = int(list[1])
     cents_name = (cents_number > 1) and 'cent' or 'cent'
-    final_result = start_word +' '+units_name+' '+ end_word +' '+cents_name
+    final_result = " %s %s en %s %s" % (start_word, units_name, end_word, cents_name)
     return final_result
 
 #-------------------------------------------------------------

=== modified file 'setup.nsi'
--- setup.nsi	2013-03-06 14:34:44 +0000
+++ setup.nsi	2013-05-16 08:48:42 +0000
@@ -21,7 +21,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #####################################################################################
 
 !include 'MUI2.nsh'

=== modified file 'setup.py' (properties changed: +x to -x)
--- setup.py	2013-05-06 07:48:25 +0000
+++ setup.py	2013-05-16 08:48:42 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #