int_treestore into lp:openobject-client

tfr (Openerp) Tue, 15 Mar 2011 03:19:57 -0700

tfr (Openerp) has proposed merging lp:~stan/openobject-client/int_treestore 
into lp:openobject-client.


Requested reviews:
  OpenERP sa GTK client R&D (openerp-dev-gtk)
Related bugs:
  Bug #718080 in OpenERP GTK Client: "TypeError: value is of the wrong type for 
this column"
  https://bugs.launchpad.net/openobject-client/+bug/718080

For more details, see:
https://code.launchpad.net/~stan/openobject-client/int_treestore/+merge/53393

fix the bug 718080
-- 
https://code.launchpad.net/~stan/openobject-client/int_treestore/+merge/53393
Your team OpenERP sa GTK client R&D is requested to review the proposed merge 
of lp:~stan/openobject-client/int_treestore into lp:openobject-client.

=== modified file 'bin/modules/gui/main.py'
--- bin/modules/gui/main.py	2011-01-27 06:31:03 +0000
+++ bin/modules/gui/main.py	2011-03-15 10:14:46 +0000
@@ -631,11 +631,9 @@
 
         if res == gtk.RESPONSE_OK:
             try:
-                if rpc.session.db_exec(url, 'db_exist', db_name):
-                    common.warning(_("Could not create database."),
-                                    _('Database already exists !'), parent=parent)
-                    return
-                
+                id = rpc.session.db_exec(url, 'list')
+                if db_name in id:
+                    raise Exception('DbExist')
                 id = rpc.session.db_exec(url, 'create', passwd, db_name, demo_data, langreal, user_pass)
                 win, pb = common.OpenERP_Progressbar(parent, title='OpenERP Database Installation')
                 self.timer = gobject.timeout_add(1000, self.progress_timeout, pb, url, passwd, id, win, db_name, parent)

=== modified file 'bin/modules/gui/window/form.py'
--- bin/modules/gui/window/form.py	2011-01-27 10:49:17 +0000
+++ bin/modules/gui/window/form.py	2011-03-15 10:14:46 +0000
@@ -299,8 +299,7 @@
         if autosave:
             if not self.modified_save():
                 return
-        if self.screen.current_view.view_type in ['calendar','graph']:
-            return
+        self.screen.create_new = True
         self.screen.new()
         self.message_state('')
 

=== modified file 'bin/modules/gui/window/view_tree/view_tree.py'
--- bin/modules/gui/window/view_tree/view_tree.py	2010-12-23 07:16:57 +0000
+++ bin/modules/gui/window/view_tree/view_tree.py	2011-03-15 10:14:46 +0000
@@ -180,7 +180,9 @@
         return len(self.fields)+1
 
     def on_get_column_type(self, index):
-        if index in self.pixbufs:
+        if index == 0:
+            return int
+        elif index in self.pixbufs:
             return gtk.gdk.Pixbuf
         return fields_list_type.get(self.fields_type[self.fields[index-1]]['type'],
                 gobject.TYPE_STRING)
@@ -373,7 +375,7 @@
         if not sel:
             return []
         (model, iters) = sel
-        return map(lambda x: int(model.get_value(model.get_iter(x), 0)), iters)
+        return [model.get_value(model.get_iter(x), 0) for x in iters]
 
     def sel_id_get(self):
         sel = self.view.get_selection().get_selected()

=== modified file 'bin/modules/gui/window/view_tree/view_tree_sc.py'
--- bin/modules/gui/window/view_tree/view_tree_sc.py	2011-01-10 15:24:02 +0000
+++ bin/modules/gui/window/view_tree/view_tree_sc.py	2011-03-15 10:14:46 +0000
@@ -50,7 +50,7 @@
 #        self.update()
 
     def update(self):
-        store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
+        store = gtk.ListStore(int, str, int)
         uid =  rpc.session.uid
         sc = rpc.session.rpc_exec_auth('/object', 'execute', 'ir.ui.view_sc', 'get_sc', uid, self.model, rpc.session.context) or []
         for s in sc:

=== modified file 'bin/po/bg.po'
--- bin/po/bg.po	2011-03-05 04:55:40 +0000
+++ bin/po/bg.po	2011-03-15 10:14:46 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-13 18:11+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-12-01 09:52+0000\n"
 "Last-Translator: Valentin Dimitrov <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-11 01:42+0000\n"
+"Last-Translator: Dimitar Markov <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Bulgarian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-05 04:52+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-12 06:05+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
 "Language: bg\n"
 
 #: bin/plugins/__init__.py:27

=== modified file 'bin/po/ca.po'
--- bin/po/ca.po	2011-03-05 04:55:40 +0000
+++ bin/po/ca.po	2011-03-15 10:14:46 +0000
@@ -8,15 +8,25 @@
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-13 18:11+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-10-25 18:36+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<[email protected]>\n"
+=======
+"PO-Revision-Date: 2011-01-26 22:50+0000\n"
+"Last-Translator: Esther Xaus (Zikzakmedia) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Catalan <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-05 04:52+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-27 05:44+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
 "Language: ca\n"
 
 #

=== modified file 'bin/po/en_GB.po'
--- bin/po/en_GB.po	2011-03-05 04:55:40 +0000
+++ bin/po/en_GB.po	2011-03-15 10:14:46 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-13 18:11+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-11-04 06:32+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-27 21:15+0000\n"
+"Last-Translator: Chris Woollard <[email protected]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: English (United Kingdom) <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-05 04:55+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-28 05:36+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
 "Language: \n"
 
 #: bin/plugins/__init__.py:27

=== modified file 'bin/po/fi.po'
--- bin/po/fi.po	2011-03-05 04:55:40 +0000
+++ bin/po/fi.po	2011-03-15 10:14:46 +0000
@@ -8,14 +8,19 @@
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-13 18:11+0100\n"
-"PO-Revision-Date: 2011-01-23 18:40+0000\n"
-"Last-Translator: Montasir <Unknown>\n"
+"PO-Revision-Date: 2011-01-30 22:28+0000\n"
+"Last-Translator: Sami Haahtinen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-05 04:53+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-31 06:08+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
 "Language: fi\n"
 
 #: bin/plugins/__init__.py:27
@@ -2621,429 +2626,3 @@
 #: bin/win_error.glade:404
 msgid "<i>_Details</i>"
 msgstr "<i>_Yksityiskohdat</i>"
-
-#~ msgid "Offset :"
-#~ msgstr "Siirros:"
-
-#~ msgid "Parameters :"
-#~ msgstr "Parametrit:"
-
-#~ msgid "Limit :"
-#~ msgstr "Raja:"
-
-#~ msgid "The content of the widget or excpetion if not valid"
-#~ msgstr "Widgetin tai poikkeuksen sisÃ¤ltÃ¶ jos ei validi"
-
-#~ msgid "This widget is readonly !"
-#~ msgstr "TÃ¤mÃ¤ widgetti on vainluku tilassa!"
-
-#~ msgid ""
-#~ "Thank you for the feedback !\n"
-#~ "Your comments have been sent to OpenERP.\n"
-#~ "You should now start by creating a new database or\n"
-#~ "connecting to an existing server through the \"File\" menu."
-#~ msgstr ""
-#~ "Kiitos palautteesta!\n"
-#~ "Kommenttisi on lÃ¤hetetty OpenERP:lle.\n"
-#~ "Aloita tekemÃ¤llÃ¤ uusi tietokanta tai\n"
-#~ "ota yhteys olemassaolevaan palvelimeen \"Tiedosto\" valikosta."
-
-#~ msgid "Print Workflow (Complex)"
-#~ msgstr "Tulosta tyÃ¶nkulku (Monimutkainen)"
-
-#~ msgid ""
-#~ "Thank you for testing OpenERP !\n"
-#~ "You should now start by creating a new database or\n"
-#~ "connecting to an existing server through the \"File\" menu."
-#~ msgstr ""
-#~ "Kiitos kun testasit OpenERP:iÃ¤!\n"
-#~ "Aloita tekemÃ¤llÃ¤ uusi tietokanta tai\n"
-#~ "ota yhteys olemassaolevaan palvelimeen \"Tiedosto\" valikosta."
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>An unknown error has been reported.</b>\n"
-#~ "\n"
-#~ "<b>You do not have a valid Open ERP maintenance contract !</b>\n"
-#~ "If you are using Open ERP in production, it is highly suggested to "
-#~ "subscribe\n"
-#~ "a maintenance program.\n"
-#~ "\n"
-#~ "The Open ERP maintenance contract provides you a bugfix guarantee and an\n"
-#~ "automatic migration system so that we can fix your problems within a few\n"
-#~ "hours. If you had a maintenance contract, this error would have been sent\n"
-#~ "to the quality team of the Open ERP editor.\n"
-#~ "\n"
-#~ "The maintenance program offers you:\n"
-#~ "* Automatic migrations on new versions,\n"
-#~ "* A bugfix guarantee,\n"
-#~ "* Monthly announces of potential bugs and their fixes,\n"
-#~ "* Security alerts by email and automatic migration,\n"
-#~ "* Access to the customer portal.\n"
-#~ "\n"
-#~ "You can use the link bellow for more information. The detail of the error\n"
-#~ "is displayed on the second tab.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Tuntematon virhe on raportoitu.</b>\n"
-#~ "\n"
-#~ "<b>Sinulle ei ole voimassaolevaa Open ERP huoltosopimusta!</b>\n"
-#~ "Jos kÃ¤ytÃ¤t Open ERP -ohjelmistoa tuotantokÃ¤ytÃ¶ssÃ¤, on hyvin suositeltavaa "
-#~ "ostaa\n"
-#~ "huoltosopimus.\n"
-#~ "\n"
-#~ "Open ERP -huoltosopimus sisÃ¤ltÃ¤Ã¤ bugikorjaustakuun ja automatisoidun "
-#~ "siirtymÃ¤jÃ¤rjestelmÃ¤n siten,\n"
-#~ "ettÃ¤ voimme korjata ongelman muutamassa tunnissa. Jos teillÃ¤ on "
-#~ "huoltosopimus, tÃ¤mÃ¤ virhe olisi\n"
-#~ "lÃ¤hetetty laadunvalvontaryhmÃ¤lle.\n"
-#~ "\n"
-#~ "Huoltosopimus tarjoaa sinulle:\n"
-#~ "* automaattisen siirtymisen uusiin versioihin\n"
-#~ "* bugikorjaustakuun\n"
-#~ "* kuukausittainen ilmoitus mahdollisista bugeista ja niiden korjauksista\n"
-#~ "* tietoturvahÃ¤lytykset sÃ¤hkÃ¶postilla ja automaattisen siirtymisen\n"
-#~ "* pÃ¤Ã¤syn asiakasportaaliin\n"
-#~ "\n"
-#~ "KÃ¤ytÃ¤ alla olevaa linkkiÃ¤ saadaksesi lisÃ¤tietoja. Virheen lisÃ¤tiedot\n"
-#~ "lÃ¶ytyvÃ¤t seuraavasta vÃ¤lilehdestÃ¤.\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "<b>An unknown error has been reported.</b>\n"
-#~ "\n"
-#~ "Your maintenance contract does not cover all modules installed in your "
-#~ "system !\n"
-#~ "If you are using Open ERP in production, it is highly suggested to upgrade "
-#~ "your\n"
-#~ "contract.\n"
-#~ "\n"
-#~ "If you have developped your own modules or installed third party module, we\n"
-#~ "can provide you an additional maintenance contract for these modules. After\n"
-#~ "having reviewed your modules, our quality team will ensure they will "
-#~ "migrate\n"
-#~ "automatically for all futur stable versions of Open ERP at no extra cost.\n"
-#~ "\n"
-#~ "Here is the list of modules not covered by your maintenance contract:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You can use the link bellow for more information. The detail of the error\n"
-#~ "is displayed on the second tab."
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Tuntematon virhe on raportoitu.</b>\n"
-#~ "\n"
-#~ "Huoltosopimuksesi ei kata kaikkia moduuleja, jotka ovat jÃ¤rjestelmÃ¤si "
-#~ "kÃ¤ytÃ¶ssÃ¤!\n"
-#~ "Jos kÃ¤ytÃ¤t Open ERP -ohjelmistoa tuotannossa, on hyvin suositeltavaa, ettÃ¤ "
-#~ "pÃ¤ivitÃ¤t\n"
-#~ "huoltosopimuksesi.\n"
-#~ "\n"
-#~ "Jos olet kehittÃ¤nyt omia moduuleja tai asentanut kolmannen osapuolen "
-#~ "moduuleja,\n"
-#~ "voimme tarjota sinulle huoltosopimuksen myÃ¶s nÃ¤ille moduuleille. "
-#~ "Moduuleiden\n"
-#~ "tarkistamisen jÃ¤lkeen laadunvalvontaryhmÃ¤mme takaa, ettÃ¤ ne siirtyvÃ¤t "
-#~ "automaattisesti\n"
-#~ "kaikissa tulevaisuuden vakaissa Open ERP -ohjelmistoversioissa ilman "
-#~ "lisÃ¤maksua.\n"
-#~ "\n"
-#~ "Alla lista moduuleista jotka eivÃ¤t ole huoltosopimuksen piirissÃ¤:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "KÃ¤ytÃ¤ alla olevaa linkkiÃ¤ saadaksesi lisÃ¤tietoja. Virheen lisÃ¤tiedot\n"
-#~ "lÃ¶ytyvÃ¤t seuraavasta vÃ¤lilehdestÃ¤."
-
-#, python-format
-#~ msgid ""
-#~ "Your problem could <u>NOT</u> be sent to the quality team !\n"
-#~ "Please report this error manually at %s"
-#~ msgstr ""
-#~ "Ongelmaasi <u>EI</u> voitu lÃ¤hettÃ¤Ã¤ laadunvalvonta ryhmÃ¤lle!\n"
-#~ "Raportoi tÃ¤mÃ¤ virhe manuaalisesti %s"
-
-#, python-format
-#~ msgid "Unable to set locale %s"
-#~ msgstr "Lokalisointia %s ei voitu valita"
-
-#~ msgid "specify the log level: INFO, DEBUG, WARNING, ERROR, CRITICAL"
-#~ msgstr "mÃ¤Ã¤ritÃ¤ lokin taso: INFO, DEBUG, WARNING, ERROR, CRITICAL"
-
-#~ msgid "specify channels to log"
-#~ msgstr "mÃ¤Ã¤ritÃ¤ kanavat jotka menevÃ¤t lokiin"
-
-#~ msgid "enable basic debugging"
-#~ msgstr "salli normaali debuggaus"
-
-#~ msgid "<b>Operation in progress</b>"
-#~ msgstr "<b>Operaatio kÃ¤ynnissÃ¤</b>"
-
-#~ msgid "OpenERP Database Installation"
-#~ msgstr "OpenERP tietokannan asennus"
-
-#, python-format
-#~ msgid " - %s request(s) sended"
-#~ msgstr " - %s pyyntÃ¶(Ã¤) lÃ¤hetetty"
-
-#~ msgid "The following users have been installed on your database:"
-#~ msgstr "Seuraavat kÃ¤yttÃ¤jÃ¤t on lisÃ¤tty tietokantaan:"
-
-#~ msgid "You can now connect to the database as an administrator."
-#~ msgstr "Voit nyt kirjautua tietokantaan pÃ¤Ã¤kÃ¤yttÃ¤jÃ¤nÃ¤."
-
-#~ msgid ""
-#~ "Connection error !\n"
-#~ "Bad username or password !"
-#~ msgstr ""
-#~ "Yhteysvirhe!\n"
-#~ "Virheellinen kÃ¤yttÃ¤jÃ¤tunnus tai salasana!"
-
-#~ msgid "Preference"
-#~ msgstr "Etusija"
-
-#~ msgid ""
-#~ "Function only available for MS Office !\n"
-#~ "Sorry, OOo users :("
-#~ msgstr ""
-#~ "Toimintoa voi kÃ¤yttÃ¤Ã¤ ainoastaan MS Officessa!\n"
-#~ "OOo kÃ¤yttÃ¤jÃ¤t; olemme todella pahoillamme :("
-
-#~ msgid "Error no report"
-#~ msgstr "Virhe, ei raporttia"
-
-#~ msgid "_Tips"
-#~ msgstr "V_inkit"
-
-#~ msgid "Country:"
-#~ msgstr "Maa:"
-
-#~ msgid "System:"
-#~ msgstr "JÃ¤rjestelmÃ¤:"
-
-#~ msgid "E-Mail:"
-#~ msgstr "SÃ¤hkÃ¶posti:"
-
-#~ msgid "Default Language:"
-#~ msgstr "Oletuskieli:"
-
-#~ msgid "Confirm Password:"
-#~ msgstr "Vahvista salasana:"
-
-#~ msgid "gtk-close"
-#~ msgstr "gtk-sulje"
-
-#~ msgid "Your Role:"
-#~ msgstr "Roolisi:"
-
-#~ msgid "Open Source:"
-#~ msgstr "Avoin lÃ¤hdekoodi"
-
-#~ msgid "OpenERP Survey"
-#~ msgstr "OpenERP kartoitus"
-
-#~ msgid "<b>OpenERP Survey</b>"
-#~ msgstr "<b>OpenERP kartoitus</b>"
-
-#~ msgid "How did you hear about us:"
-#~ msgstr "Miten kuulit meistÃ¤:"
-
-#~ msgid "We plan to use OpenERP"
-#~ msgstr "Aiomme kÃ¤yttÃ¤Ã¤ OpenERP:tÃ¤"
-
-#~ msgid "We plan to offer services on OpenERP"
-#~ msgstr "Aiomme tarjota palveluita OpenERP:iin"
-
-#~ msgid "Tell us why you try OpenERP and what are your current softwares:"
-#~ msgstr ""
-#~ "Kerro meille, miksi kokeilit OpenERP:iÃ¤ ja mitkÃ¤ ovat nykyiset ohjelmasi:"
-
-#~ msgid "<b>Your interrest:</b>"
-#~ msgstr "<b>Kiinnostuksesi:</b>"
-
-#~ msgid "I want to be contacted for a demonstration"
-#~ msgstr "Haluan, ettÃ¤ minuun otetaan yhteyttÃ¤ esittelyÃ¤ varten"
-
-#~ msgid "Phone / Mobile:"
-#~ msgstr "Puhelin / GSM:"
-
-#~ msgid "Your Name:"
-#~ msgstr "Nimesi:"
-
-#~ msgid "Your Company:"
-#~ msgstr "Yrityksesi:"
-
-#~ msgid "OpenERP Server:"
-#~ msgstr "OpenERP serveri:"
-
-#~ msgid "New Database Name:"
-#~ msgstr "Uuden tietokannan nimi:"
-
-#~ msgid "Administrator Password:"
-#~ msgstr "YllÃ¤pitÃ¤jÃ¤n Salasana:"
-
-#~ msgid "# Employees:"
-#~ msgstr "# TyÃ¶ntekijÃ¤t:"
-
-#~ msgid "Industry:"
-#~ msgstr "Toimiala:"
-
-#~ msgid ""
-#~ "<i>Please fill in the following form in order to help us to improve OpenERP "
-#~ "and better target new developments.</i>"
-#~ msgstr ""
-#~ "<i>TÃ¤ytÃ¤ oheinen kaavake auttaaksesi meitÃ¤ kehittÃ¤mÃ¤Ã¤n OpenEPR:iÃ¤ ja "
-#~ "kohdentamaan kehitystyÃ¶tÃ¤, kiitos.</i>"
-
-#~ msgid "<b>Database created successfully!</b>"
-#~ msgstr "<b>Tietokanta luotu onnistuneesti!</b>"
-
-#~ msgid "Database creation"
-#~ msgstr "Tietokannan luominen"
-
-#~ msgid "Load Demonstration Data:"
-#~ msgstr "Lataa esittely materiaali:"
-
-#~ msgid "Send to Maintenance Team"
-#~ msgstr "LÃ¤hetÃ¤ huoltoryhmÃ¤lle"
-
-#~ msgid "<b>Your company:</b>"
-#~ msgstr "<b>Yrityksesi:</b>"
-
-#~ msgid "<Shist> + <Tab>"
-#~ msgstr "<Shift> + <Tab>"
-
-#~ msgid ""
-#~ "This is the password of the '<i>admin</i>' user that will be created in your "
-#~ "new database."
-#~ msgstr ""
-#~ "TÃ¤mÃ¤ on salasana kÃ¤yttÃ¤jÃ¤lle '<i>admin</i>', joka luodaan uuteen "
-#~ "tietokantaan."
-
-#~ msgid ""
-#~ "This is the password of the '<i>admin</i>' user that will be created in your "
-#~ "new database. It has to be the same than the above field."
-#~ msgstr ""
-#~ "TÃ¤mÃ¤ on kÃ¤yttÃ¤jÃ¤n '<i>admin</i>' salasana. KÃ¤yttÃ¤jÃ¤ luodaan uuteen "
-#~ "tietokantaan. Sen on oltava sama, kuin yllÃ¤oleva kenttÃ¤."
-
-#~ msgid "<b>Keep Informed</b>"
-#~ msgstr "<b>PidÃ¤ ajantasalla</b>"
-
-#~ msgid "Click here for details about the maintenance proposition"
-#~ msgstr "Klikkaa tÃ¤stÃ¤ saadaksesi lisÃ¤tietoa yllÃ¤pitoehdotuksista"
-
-#~ msgid "<i>_Maintenance</i>"
-#~ msgstr "<i>_YllÃ¤pito</i>"
-
-#~ msgid ""
-#~ "<b>Maintenance Contract.</b>\n"
-#~ "<i>\n"
-#~ "Your request will be send to OpenERP and maintenance team will reply you "
-#~ "shortly.\n"
-#~ "</i>"
-#~ msgstr ""
-#~ "<b>YllÃ¤pitosopimus.</b>\n"
-#~ "<i>\n"
-#~ "Sinun pyyntÃ¶si lÃ¤hetetÃ¤Ã¤n OpenERP:lle ja yllÃ¤pitotiimi vastaa piakkoin.\n"
-#~ "</i>"
-
-#~ msgid ""
-#~ "You can connect to the new database using one of the following account:\n"
-#~ "\n"
-#~ "    Administrator: admin / admin "
-#~ msgstr ""
-#~ "Voit aina yhdistÃ¤Ã¤ uuteen tietokantaan kÃ¤yttÃ¤en seuraavaa tunnusta:\n"
-#~ "PÃ¤Ã¤kÃ¤yttÃ¤jÃ¤: admin / admin "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "<b>An unknown error has been reported.</b>\n"
-#~ "\n"
-#~ "Your maintenance contract does not cover all modules installed in your "
-#~ "system !\n"
-#~ "If you are using Open ERP in production, it is highly suggested to upgrade "
-#~ "your\n"
-#~ "contract.\n"
-#~ "\n"
-#~ "If you have developed your own modules or installed third party module, we\n"
-#~ "can provide you an additional maintenance contract for these modules. After\n"
-#~ "having reviewed your modules, our quality team will ensure they will "
-#~ "migrate\n"
-#~ "automatically for all future stable versions of Open ERP at no extra cost.\n"
-#~ "\n"
-#~ "Here is the list of modules not covered by your maintenance contract:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You can use the link bellow for more information. The detail of the error\n"
-#~ "is displayed on the second tab."
-#~ msgstr ""
-#~ "\n"
-#~ "<b>On havaittu tuntematon virhe.</b>\n"
-#~ "\n"
-#~ "YllÃ¤pitosopimuksesi ei kata kaikkia jÃ¤rjestelmÃ¤Ã¤si asennettuja moduuleja! "
-#~ "Jos kÃ¤ytÃ¤t OpenERP:iÃ¤ tuotantoympÃ¤ristÃ¶ssÃ¤, suosittelemme ettÃ¤ pÃ¤ivitÃ¤t "
-#~ "sopimuksen.\n"
-#~ "\n"
-#~ "Jos olet kehittÃ¤nyt omia tai asentanut kolmansien osapuolten moduuleja, "
-#~ "voimme tarjota sinulle yllÃ¤pidon lisÃ¤sopimusta nÃ¤ille moduuleille. Kun "
-#~ "olemme tarkastaneet moduulisi, laadusta vastaava tiimimme varmistaa ettÃ¤ ne "
-#~ "liitetÃ¤Ã¤n automaattisesti OpenERP:in uusiin vakaisiin versioihin ilman "
-#~ "lisÃ¤kustannuksia.\n"
-#~ "\n"
-#~ "TÃ¤ssÃ¤ on lista moduuleista joita yllÃ¤pitosopimuksesi ei kata:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Voit kÃ¤yttÃ¤Ã¤ alla olevaa linkkiÃ¤ saadaksesi lisÃ¤tietoja. Virheen "
-#~ "yksityiskohdat ovat nÃ¤kyvillÃ¤ toisessa vÃ¤lilehdessÃ¤."
-
-#~ msgid "Connect Later"
-#~ msgstr "YhdistÃ¤ myÃ¶hemmin"
-
-#~ msgid ""
-#~ "Please fill in the following form in order to help us to improve <b><span "
-#~ "foreground=\"red\"><i>Open</i></span> ERP</b> and better target new "
-#~ "developments."
-#~ msgstr ""
-#~ "Ole hyvÃ¤ ja tÃ¤ytÃ¤ seuraava lomake auttaaksesi meitÃ¤ parantamaan <b><span "
-#~ "foreground=\"red\"><i>Open</i></span> ERP</b>:iÃ¤ kohdentamaan kehitystyÃ¶tÃ¤ "
-#~ "paremmin."
-
-#~ msgid "Connect now"
-#~ msgstr "YhdistÃ¤ nyt"
-
-#~ msgid "Employees:"
-#~ msgstr "TyÃ¶ntekijÃ¤t:"
-
-#~ msgid "<b>Your company</b>"
-#~ msgstr "<b>Yrityksesi</b>"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancel"
-
-#~ msgid "We plan to use Open ERP"
-#~ msgstr "Aiomme kÃ¤yttÃ¤Ã¤ Open ERP:iÃ¤"
-
-#~ msgid "We plan to offer services on Open ERP"
-#~ msgstr "Aiomme tarjota palveluja Open ERP:iin"
-
-#~ msgid "City:"
-#~ msgstr "Kaupunki:"
-
-#~ msgid "<b>Your interrest</b>"
-#~ msgstr "<b>Mielenkiinnon kohteesi</b>"
-
-#~ msgid "E-mail:"
-#~ msgstr "SÃ¤hkÃ¶posti:"
-
-#~ msgid "Tell us why you try Open ERP and what are your current softwares:"
-#~ msgstr ""
-#~ "Kerro meille miksi kokeilet Open ERP:iÃ¤ ja mitÃ¤ ohjelmistoa kÃ¤ytÃ¤t tÃ¤llÃ¤ "
-#~ "hetkellÃ¤:"
-
-#~ msgid "I want to receive the Open ERP ebook (PDF) by email"
-#~ msgstr "Haluan Open ERP e-kirjan (PDF) sÃ¤hkÃ¶postilla"

=== modified file 'bin/po/hu.po'
--- bin/po/hu.po	2011-03-05 04:55:40 +0000
+++ bin/po/hu.po	2011-03-15 10:14:46 +0000
@@ -9,14 +9,24 @@
 "Project-Id-Version: Tiny ERP V2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-13 18:11+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-02-08 15:30+0000\n"
 "Last-Translator: JuhÃ¡sz KrisztiÃ¡n (Elastoffice) <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-02 11:14+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÃZ <[email protected]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Hungarian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-05 04:53+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-03 06:16+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
 "Language: hu\n"
 
 #: bin/plugins/__init__.py:27
@@ -2720,334 +2730,3 @@
 #: bin/win_error.glade:404
 msgid "<i>_Details</i>"
 msgstr "<i>_RÃ©szletek</i>"
-
-#~ msgid "Offset :"
-#~ msgstr "EltolÃ¡s"
-
-#~ msgid "Limit :"
-#~ msgstr "KorlÃ¡t"
-
-#~ msgid ""
-#~ "Thank you for the feedback !\n"
-#~ "Your comments have been sent to OpenERP.\n"
-#~ "You should now start by creating a new database or\n"
-#~ "connecting to an existing server through the \"File\" menu."
-#~ msgstr ""
-#~ "KÃ¶szÃ¶njÃ¼k visszajelzÃ©sÃ©t!\n"
-#~ "VÃ©lemÃ©nyÃ©t elkÃ¼ldtÃ¼k az OpenERP-nek.\n"
-#~ "Most mÃ¡r lÃ©trehozhat Ãºj adatbÃ¡zist vagy\n"
-#~ "kapcsolÃ³dhat egy mÃ¡r meglÃ©vÅ szerverhez a \"FÃ¡jl\" menÃ¼ben."
-
-#~ msgid "Parameters :"
-#~ msgstr "ParamÃ©terek :"
-
-#~ msgid ""
-#~ "Thank you for testing OpenERP !\n"
-#~ "You should now start by creating a new database or\n"
-#~ "connecting to an existing server through the \"File\" menu."
-#~ msgstr ""
-#~ "KÃ¶szÃ¶njÃ¼k hogy tesztelte az OpenERP-t!\n"
-#~ "Most mÃ¡r lÃ©trehozhat Ãºj adatbÃ¡zist vagy\n"
-#~ "kapcsolÃ³dhat egy mÃ¡r meglÃ©vÅ szerverhez a \"FÃ¡jl\" menÃ¼ben."
-
-#~ msgid ""
-#~ "Connection error !\n"
-#~ "Bad username or password !"
-#~ msgstr ""
-#~ "KapcsolÃ³dÃ¡si hiba!\n"
-#~ "Rossz felhasznÃ¡lÃ³nÃ©v vagy jelszÃ³!"
-
-#~ msgid "This widget is readonly !"
-#~ msgstr "Ez az alkalmazÃ¡s csak olvashatÃ³!"
-
-#~ msgid "Print Workflow (Complex)"
-#~ msgstr "Folyamatlista NyomtatÃ¡sa (Komplex)"
-
-#, python-format
-#~ msgid "Unable to set locale %s"
-#~ msgstr "Nem lehet beÃ¡llÃtani a %s nyelvet"
-
-#~ msgid "specify the log level: INFO, DEBUG, WARNING, ERROR, CRITICAL"
-#~ msgstr "adja meg a naplÃ³zÃ¡s szintjÃ©t: INFO, DEBUG, WARNING, ERROR, CRITICAL"
-
-#~ msgid "enable basic debugging"
-#~ msgstr "alap hibakÃ¶vetÃ©s engedÃ©lyezÃ©se"
-
-#~ msgid "OpenERP Database Installation"
-#~ msgstr "OpenERP AdatbÃ¡zis TelepÃtÃ©se"
-
-#~ msgid "The following users have been installed on your database:"
-#~ msgstr "A kÃ¶vetkezÅ felhasznÃ¡lÃ³k telepÃtÃ©sre kerÃ¼ltek az adatbÃ¡zisba:"
-
-#~ msgid "You can now connect to the database as an administrator."
-#~ msgstr "MostmÃ¡r kapcsolÃ³dhat az adatbÃ¡zishoz adminisztrÃ¡torkÃ©nt."
-
-#~ msgid "Preference"
-#~ msgstr "TestreszabÃ¡s"
-
-#~ msgid "_Tips"
-#~ msgstr "_Tippek"
-
-#~ msgid "<b>Operation in progress</b>"
-#~ msgstr "<b>MÅ±velet folyamatban van</b>"
-
-#~ msgid "Error no report"
-#~ msgstr "Hiba nincs jelentve"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>An unknown error has been reported.</b>\n"
-#~ "\n"
-#~ "<b>You do not have a valid Open ERP maintenance contract !</b>\n"
-#~ "If you are using Open ERP in production, it is highly suggested to "
-#~ "subscribe\n"
-#~ "a maintenance program.\n"
-#~ "\n"
-#~ "The Open ERP maintenance contract provides you a bugfix guarantee and an\n"
-#~ "automatic migration system so that we can fix your problems within a few\n"
-#~ "hours. If you had a maintenance contract, this error would have been sent\n"
-#~ "to the quality team of the Open ERP editor.\n"
-#~ "\n"
-#~ "The maintenance program offers you:\n"
-#~ "* Automatic migrations on new versions,\n"
-#~ "* A bugfix guarantee,\n"
-#~ "* Monthly announces of potential bugs and their fixes,\n"
-#~ "* Security alerts by email and automatic migration,\n"
-#~ "* Access to the customer portal.\n"
-#~ "\n"
-#~ "You can use the link bellow for more information. The detail of the error\n"
-#~ "is displayed on the second tab.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Ismeretlen hibÃ¡t jelentett be.</b>\n"
-#~ "\n"
-#~ "<b>Ãn nem rendelkezik Ã©rvÃ©nyes Open ERP karbantartÃ¡si szerzÅdÃ©ssel!</b>\n"
-#~ "Ha Ãn a termelÃ©sben hasznÃ¡lja az Open ERP-t, magasan ajÃ¡nlott\n"
-#~ "egy karbantartÃ¡si program elÅfizetÃ©se.\n"
-#~ "\n"
-#~ "Az Open ERP karbantartÃ¡si szerzÅdÃ©s hibaelhÃ¡rÃtÃ¡si garanciÃ¡t nyÃºjt Ãnnek Ã©s "
-#~ "egy\n"
-#~ "automatikus migrÃ¡ciÃ³s rendszert, azÃ©rt hogy nÃ©hÃ¡ny Ã³rÃ¡n belÃ¼l "
-#~ "meghatÃ¡rozhassuk az Ãn\n"
-#~ "problÃ©mÃ¡it. Ha Ãn rendelkezett volna karbantartÃ¡si szerzÅdÃ©ssel, ezt a hibÃ¡t "
-#~ "az Open ERP\n"
-#~ "szerkesztÅjÃ©nek minÅsÃ©gi csapatÃ¡nak kÃ¼ldtÃ©k volna el.\n"
-#~ "\n"
-#~ "A karbantartÃ¡si program a kÃ¶vetkezÅket nyÃºjtja Ãnnek:\n"
-#~ "* Automatikus migrÃ¡ciÃ³ az Ãºj verziÃ³kra,\n"
-#~ "* HibaelhÃ¡rÃtÃ¡si garancia,\n"
-#~ "* Havi jelentÃ©s a potenciÃ¡lis hibÃ¡krÃ³l Ã©s azok kijavÃtÃ¡sÃ¡rÃ³l,\n"
-#~ "* BiztonsÃ¡gi figyelmeztetÃ©sek e-mailben Ã©s automatikus migrÃ¡ciÃ³,\n"
-#~ "* HozzÃ¡fÃ©rÃ©s a vÃ¡sÃ¡rlÃ³i portÃ¡lhoz.\n"
-#~ "\n"
-#~ "TovÃ¡bbi informÃ¡ciÃ³kÃ©rt hasznÃ¡lja a lenti linket. A hiba rÃ©szleteit\n"
-#~ "megtekintheti a mÃ¡sodik fÃ¼lÃ¶n.\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "<b>An unknown error has been reported.</b>\n"
-#~ "\n"
-#~ "Your maintenance contract does not cover all modules installed in your "
-#~ "system !\n"
-#~ "If you are using Open ERP in production, it is highly suggested to upgrade "
-#~ "your\n"
-#~ "contract.\n"
-#~ "\n"
-#~ "If you have developed your own modules or installed third party module, we\n"
-#~ "can provide you an additional maintenance contract for these modules. After\n"
-#~ "having reviewed your modules, our quality team will ensure they will "
-#~ "migrate\n"
-#~ "automatically for all future stable versions of Open ERP at no extra cost.\n"
-#~ "\n"
-#~ "Here is the list of modules not covered by your maintenance contract:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You can use the link bellow for more information. The detail of the error\n"
-#~ "is displayed on the second tab."
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Ismeretlen hibÃ¡t jelentett be.</b>\n"
-#~ "\n"
-#~ "Az Ãn karbantartÃ¡si szerzÅdÃ©se nem foglalja magÃ¡ba az Ãn rendszerÃ©be "
-#~ "telepÃtett Ã¶sszes modult !\n"
-#~ "Ha Ãn a termelÃ©sben hasznÃ¡lja az Open ERP-t, magasan ajÃ¡nlott az Ãn "
-#~ "szerzÅdÃ©sÃ©nek\n"
-#~ "frissÃtÃ©se.\n"
-#~ "\n"
-#~ "Ha Ãn a sajÃ¡t moduljait fejlesztette vagy kÃ¼lsÅ modult telepÃtett,\n"
-#~ "mi adhatunk Ãnnek egy kiegÃ©szÃtÅ karbantartÃ¡si szerzÅdÃ©st ezekre a "
-#~ "modulokra. Az Ãn\n"
-#~ "moduljainak felÃ¼lvizsgÃ¡lata utÃ¡n, a mi minÅsÃ©gi csapatunk biztosÃtja ezek "
-#~ "automatikus\n"
-#~ "migrÃ¡ciÃ³jÃ¡t az Ã¶sszes jÃ¶vÅbeni Open ERP verziÃ³khoz extra kÃ¶ltsÃ©g nÃ©lkÃ¼l.\n"
-#~ "\n"
-#~ "Ãme a lista azokrÃ³l a modulokrÃ³l, amelyeket nem foglal magÃ¡ba az Ãn "
-#~ "karbantartÃ¡si szerzÅdÃ©se:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "TovÃ¡bbi informÃ¡ciÃ³khoz hasznÃ¡lja a lenti linket. A hiba rÃ©szleteit\n"
-#~ "megtekintheti a mÃ¡sodik fÃ¼lÃ¶n."
-
-#~ msgid ""
-#~ "Function only available for MS Office !\n"
-#~ "Sorry, OOo users :("
-#~ msgstr ""
-#~ "A funkciÃ³ csak MS Office-szal Ã©rhetÅ el !\n"
-#~ "SajnÃ¡ljuk, OpenOffice felhasznÃ¡lÃ³k :("
-
-#, python-format
-#~ msgid " - %s request(s) sended"
-#~ msgstr " - %s kÃ©rÃ©se elkÃ¼ldve"
-
-#~ msgid "OpenERP Server:"
-#~ msgstr "OpenERP Szerver:"
-
-#~ msgid "New Database Name:"
-#~ msgstr "Ãj adatbÃ¡zis neve:"
-
-#~ msgid "Default Language:"
-#~ msgstr "AlapÃ©rtelmezett nyelv:"
-
-#~ msgid ""
-#~ "This is the password of the '<i>admin</i>' user that will be created in your "
-#~ "new database."
-#~ msgstr ""
-#~ "Ez az '<i>admin</i>' felhasznÃ¡lÃ³ jelszava, ami lÃ©tre lesz hozva az Ãn Ãºj "
-#~ "adatbÃ¡zisÃ¡ban."
-
-#~ msgid "Administrator Password:"
-#~ msgstr "AdminisztrÃ¡tor jelszÃ³:"
-
-#~ msgid ""
-#~ "This is the password of the '<i>admin</i>' user that will be created in your "
-#~ "new database. It has to be the same than the above field."
-#~ msgstr ""
-#~ "Ez az '<i>admin</i>' felhasznÃ¡lÃ³ jelszava, ami lÃ©tre lesz hozva az Ãn Ãºj "
-#~ "adatbÃ¡zisÃ¡ban. Ennek meg kell egyeznie a fenti mezÅvel."
-
-#~ msgid "Confirm Password:"
-#~ msgstr "JelszÃ³ megerÅsÃtÃ©se:"
-
-#~ msgid "Load Demonstration Data:"
-#~ msgstr "DemonstrÃ¡iÃ³s adatok betÃ¶ltÃ©se:"
-
-#~ msgid "Database creation"
-#~ msgstr "AdatbÃ¡zis lÃ©trehozÃ¡s"
-
-#~ msgid "<b>Database created successfully!</b>"
-#~ msgstr "<b>AdatbÃ¡zis sikeresen lÃ©trehozva!</b>"
-
-#~ msgid ""
-#~ "You can connect to the new database using one of the following account:\n"
-#~ "\n"
-#~ "    Administrator: admin / admin "
-#~ msgstr ""
-#~ "A kÃ¶vetkezÅ azonosÃtÃ³ hasznÃ¡latÃ¡val kapcsolÃ³dhat az Ãºj adatbÃ¡zishoz:\n"
-#~ "\n"
-#~ "    AdminisztrÃ¡tor: admin / admin "
-
-#~ msgid "Connect Later"
-#~ msgstr "KapcsolÃ³dÃ¡s kÃ©sÅbb"
-
-#~ msgid "Connect now"
-#~ msgstr "KapcsolÃ³dÃ¡s most"
-
-#~ msgid "Click here for details about the maintenance proposition"
-#~ msgstr "Kattintson ide a karbantartÃ¡si javaslatok rÃ©szleteiÃ©rt"
-
-#~ msgid "<i>_Maintenance</i>"
-#~ msgstr "<i>_KarbantartÃ¡s</i>"
-
-#~ msgid ""
-#~ "<b>Maintenance Contract.</b>\n"
-#~ "<i>\n"
-#~ "Your request will be send to OpenERP and maintenance team will reply you "
-#~ "shortly.\n"
-#~ "</i>"
-#~ msgstr ""
-#~ "<b>KarbantartÃ¡si SzerzÅdÃ©s.</b>\n"
-#~ "<i>\n"
-#~ "KÃ©rÃ©sÃ©t elkÃ¼ldjÃ¼k az OpenErp Ã©s a karbantartÃ¡si csapat rÃ©szÃ©re Ã©s hamarosan "
-#~ "vÃ¡laszolunk Ãnnek.\n"
-#~ "</i>"
-
-#~ msgid "Send to Maintenance Team"
-#~ msgstr "KÃ¼ldÃ©s a KarbantartÃ³ csapatnak"
-
-#~ msgid "gtk-close"
-#~ msgstr "gtk-bezÃ¡rÃ¡s"
-
-#~ msgid ""
-#~ "Please fill in the following form in order to help us to improve <b><span "
-#~ "foreground=\"red\"><i>Open</i></span> ERP</b> and better target new "
-#~ "developments."
-#~ msgstr ""
-#~ "KÃ©rjÃ¼k, tÃ¶ltse ki a kÃ¶vetkezÅ Å±rlapot, hogy segÃtsen minket az <b><span "
-#~ "foreground=\"red\"><i>Open</i></span> ERP</b> tÃ¶kÃ©letesÃtÃ©sÃ©ben Ã©s "
-#~ "cÃ©lirÃ¡nyosabb fejlesztÃ©seiben."
-
-#~ msgid "<b>Your company</b>"
-#~ msgstr "<b>VÃ¡llalata</b>"
-
-#~ msgid "Open Source:"
-#~ msgstr "NyÃlt ForrÃ¡skÃ³d:"
-
-#~ msgid "Your Company:"
-#~ msgstr "VÃ¡llalata:"
-
-#~ msgid "Industry:"
-#~ msgstr "IparÃ¡g:"
-
-#~ msgid "Your Role:"
-#~ msgstr "FeladatkÃ¶re:"
-
-#~ msgid "Employees:"
-#~ msgstr "Alkalmazottak:"
-
-#~ msgid "Country:"
-#~ msgstr "OrszÃ¡g:"
-
-#~ msgid "City:"
-#~ msgstr "VÃ¡ros:"
-
-#~ msgid "System:"
-#~ msgstr "Rendszer:"
-
-#~ msgid "<b>Your interrest</b>"
-#~ msgstr "<b>Az Ãn Ã©rdeklÅdÃ©si kÃ¶re</b>"
-
-#~ msgid "How did you hear about us:"
-#~ msgstr "Hol hallott rÃ³lunk:"
-
-#~ msgid "We plan to use Open ERP"
-#~ msgstr "HasznÃ¡lni kÃvÃ¡njuk az Open ERP-t"
-
-#~ msgid "We plan to offer services on Open ERP"
-#~ msgstr "TervezzÃ¼k Open ERP szolgÃ¡ltatÃ¡s nyÃºjtÃ¡sÃ¡t"
-
-#~ msgid "Tell us why you try Open ERP and what are your current softwares:"
-#~ msgstr ""
-#~ "Mondja el, miÃ©rt prÃ³bÃ¡lja ki az Open ERP-t Ã©s hogy jelenleg milyen "
-#~ "szoftvereket hasznÃ¡l:"
-
-#~ msgid "<b>Keep Informed</b>"
-#~ msgstr "<b>Folyamatos tÃ¡jÃ©koztatÃ¡s</b>"
-
-#~ msgid "I want to receive the Open ERP ebook (PDF) by email"
-#~ msgstr "SzeretnÃ©m megkapni az Open ERP ekÃ¶nyvet (PDF) e-mailben"
-
-#~ msgid "Phone / Mobile:"
-#~ msgstr "Telefon / Mobil:"
-
-#~ msgid "E-mail:"
-#~ msgstr "E-mail:"
-
-#~ msgid "Your Name:"
-#~ msgstr "Neve:"
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-mÃ©gsem"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"

=== modified file 'bin/po/mn.po'
--- bin/po/mn.po	2011-03-05 04:55:40 +0000
+++ bin/po/mn.po	2011-03-15 10:14:46 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-13 18:11+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-11-14 07:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-07 08:16+0000\n"
+"Last-Translator: Jacara <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Mongolian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-05 04:54+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-08 05:58+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
 "Language: mn\n"
 
 #: bin/plugins/__init__.py:27

=== modified file 'bin/widget/model/record.py'
--- bin/widget/model/record.py	2011-02-04 06:19:22 +0000
+++ bin/widget/model/record.py	2011-03-15 10:14:46 +0000
@@ -98,11 +98,10 @@
             context.setdefault(CONCURRENCY_CHECK_FIELD, {})["%s,%s" % (self.resource, self.id)] = self._concurrency_check_data
         for name, field in self.mgroup.mfields.items():
             if isinstance(field, O2MField):
-                if field.name in self.value:
-                    v = self.value[field.name]
-                    from itertools import chain
-                    for m in chain(v.models, v.models_removed):
-                        m.update_context_with_concurrency(context)
+                v = self.value[field.name]
+                from itertools import chain
+                for m in chain(v.models, v.models_removed):
+                    m.update_context_with_concurrency(context)
 
     def get(self, get_readonly=True, includeid=False, check_load=True, get_modifiedonly=False):
         if check_load:

=== modified file 'bin/widget/screen/screen.py'
--- bin/widget/screen/screen.py	2011-01-27 12:43:03 +0000
+++ bin/widget/screen/screen.py	2011-03-15 10:14:46 +0000
@@ -738,9 +738,7 @@
         id = False
         if self.current_view.view_type == 'form' and self.current_model:
             id = self.current_model.id
-            if not id and unlink:
-                self.new()
-                return False
+
             idx = self.models.models.index(self.current_model)
             if not id:
                 self.models.models.remove(self.models.models[idx])

=== modified file 'bin/widget/view/calendar_gtk/parser.py'
--- bin/widget/view/calendar_gtk/parser.py	2011-01-27 05:59:39 +0000
+++ bin/widget/view/calendar_gtk/parser.py	2011-03-15 10:14:46 +0000
@@ -280,10 +280,11 @@
 
         for model in models:
             name = value = key = model.value[color_field]
+
             if isinstance(key, (tuple, list)):
                 value, name = key
                 key = tuple(key)
-                
+
             if key in colors:
                 # already present skip
                 continue
@@ -292,7 +293,7 @@
             # 'color' field
             field_color = None
             field_widget = model.mgroup.mfields.get(color_field, False)
-            if value and field_widget and field_widget.attrs['type'] == 'many2one':
+            if field_widget and field_widget.attrs['type'] == 'many2one':
                 fproxy = RPCProxy(field_widget.attrs['relation'])
                 try:
                     fdata = fproxy.read(value, [color_field_custom])

=== modified file 'bin/widget/view/screen_container.py'
--- bin/widget/view/screen_container.py	2011-01-10 11:59:36 +0000
+++ bin/widget/view/screen_container.py	2011-03-15 10:14:46 +0000
@@ -162,7 +162,7 @@
             hb2.pack_start(gtk.Label(''), expand=True, fill=True)
 
 # Limit combo
-        self.limit_combo = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+        self.limit_combo = gtk.ListStore(object, str)
         self.combo = gtk.ComboBox(self.limit_combo)
         cell = gtk.CellRendererText()
         self.combo.pack_start(cell, True)
@@ -228,7 +228,7 @@
     def get_limit(self):
         if hasattr(self,'limit_combo'):
             try:
-                return int(self.limit_combo.get_value(self.combo.get_active_iter(), 0))
+                return self.limit_combo.get_value(self.combo.get_active_iter(), 0)
             except:
                 return False
         else:

=== modified file 'bin/widget/view/tree_gtk/parser.py'
--- bin/widget/view/tree_gtk/parser.py	2011-03-04 12:04:50 +0000
+++ bin/widget/view/tree_gtk/parser.py	2011-03-15 10:14:46 +0000
@@ -609,7 +609,7 @@
     def __init__(self, *args):
         super(Selection, self).__init__(*args)
         self.renderer = gtk.CellRendererCombo()
-        selection_data = gtk.ListStore(str, str)
+        selection_data = gtk.ListStore(object, str)
         for x in self.attrs.get('selection', []):
             selection_data.append(x)
         self.renderer.set_property('model', selection_data)

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-gtk] [Merge] lp:~stan/openobject-client/int_treestore into lp:openobject-client

Reply via email to