openerp-community-reviewer team mailing list archive

[David BEAL <beald@xxxxxxx>]

David BEAL has proposed merging lp:~akretion-team/ocb-server/openobject-server-fix-ir_model-field_description into lp:ocb-server.

Requested reviews:
  OpenERP Community Backports Team (ocb)

For more details, see:
https://code.launchpad.net/~akretion-team/ocb-server/openobject-server-fix-ir_model-field_description/+merge/188060

see

https://bugs.launchpad.net/openobject-server/+bug/1231900
and
https://code.launchpad.net/~akretion-team/openobject-server/openobject-server-fix-ir_model-field_description/+merge/188005

this is the same changes
-- 
https://code.launchpad.net/~akretion-team/ocb-server/openobject-server-fix-ir_model-field_description/+merge/188060
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~akretion-team/ocb-server/openobject-server-fix-ir_model-field_description into lp:ocb-server.

=== modified file 'openerp/addons/base/i18n/hr.po'
--- openerp/addons/base/i18n/hr.po	2013-09-26 05:54:16 +0000
+++ openerp/addons/base/i18n/hr.po	2013-09-27 14:05:46 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2013-09-25 09:16+0000\n"
-"Last-Translator: Marko Carevic <Unknown>\n"
+"PO-Revision-Date: 2013-09-26 11:42+0000\n"
+"Last-Translator: Krešimir Jeđud <kresimir.jedud@xxxxxxxxxx>\n"
 "Language-Team: Croatian <hr@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-26 05:54+0000\n"
-"X-Generator: Launchpad (build 16771)\n"
+"X-Launchpad-Export-Date: 2013-09-27 06:16+0000\n"
+"X-Generator: Launchpad (build 16774)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -1080,7 +1080,7 @@
 #: view:res.partner.bank:0
 #: view:res.users:0
 msgid "ZIP"
-msgstr ""
+msgstr "Poštanski broj"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1090,7 +1090,7 @@
 #. module: base
 #: field:res.partner,mobile:0
 msgid "Mobile"
-msgstr "Mobilni"
+msgstr "Mobitel"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1846,7 +1846,7 @@
 #: code:addons/base/ir/ir_model.py:85
 #, python-format
 msgid "Invalid Search Criteria"
-msgstr ""
+msgstr "Neispravan uvjet pretrage"
 
 #. module: base
 #: field:res.users,login:0
@@ -3908,7 +3908,7 @@
 #: field:res.partner,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
-msgstr "Naslov"
+msgstr "Titula"
 
 #. module: base
 #: help:ir.property,res_id:0
@@ -6224,7 +6224,7 @@
 #. module: base
 #: view:base.language.import:0
 msgid "e.g. English"
-msgstr ""
+msgstr "npr. Croatian / hrvatski jezik"
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -7566,7 +7566,7 @@
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_intrastat
 msgid "Intrastat Reporting"
-msgstr ""
+msgstr "Intrastat izvještaj"
 
 #. module: base
 #: code:addons/base/res/res_users.py:131
@@ -7788,7 +7788,7 @@
 #. module: base
 #: view:res.partner:0
 msgid "at"
-msgstr ""
+msgstr "na"
 
 #. module: base
 #: view:ir.rule:0
@@ -7935,7 +7935,7 @@
 #. module: base
 #: view:ir.mail_server:0
 msgid "Test Connection"
-msgstr ""
+msgstr "Testiraj Vezu"
 
 #. module: base
 #: model:res.country,name:base.mm
@@ -8256,7 +8256,7 @@
 #. module: base
 #: model:ir.actions.report.xml,name:base.res_partner_address_report
 msgid "Labels"
-msgstr "Labele"
+msgstr "Etikete"
 
 #. module: base
 #: help:res.partner,use_parent_address:0
@@ -8804,7 +8804,7 @@
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Stranica dokumenta"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ar
@@ -8863,6 +8863,9 @@
 "If the selected language is loaded in the system, all documents related to "
 "this contact will be printed in this language. If not, it will be English."
 msgstr ""
+"Ako je odabrani jezik instaliran, tada će se svi dokumenti povezani sa ovim "
+"kontaktom ispisivati na tom jeziku. U suprotnom koristiti će se engleski "
+"jezik."
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_evaluation
@@ -8914,7 +8917,7 @@
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account
 msgid "eInvoicing"
-msgstr ""
+msgstr "eFakturiranje"
 
 #. module: base
 #: code:addons/base/res/res_users.py:171
@@ -10191,7 +10194,7 @@
 #. module: base
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Pohranjeni naziv datoteke"
 
 #. module: base
 #: field:res.partner,use_parent_address:0
@@ -10248,6 +10251,14 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za kreiranje novog kontakta u adresaru.\n"
+"              </p><p>\n"
+"                Pomoću OpenERP-a moguće je jednostavno pratiti sve \n"
+"                aktivnosti povezane sa dobavljačima: diskusije, povijest \n"
+"                nabave, dokumenti i sl.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:res.country,name:base.lr
@@ -10552,7 +10563,7 @@
 #: view:res.partner:0
 #: view:res.users:0
 msgid "Street..."
-msgstr ""
+msgstr "Ulica..."
 
 #. module: base
 #: constraint:res.users:0
@@ -10665,7 +10676,7 @@
 #. module: base
 #: field:ir.actions.report.xml,header:0
 msgid "Add RML Header"
-msgstr ""
+msgstr "Dodaj RML zaglavlje"
 
 #. module: base
 #: help:res.company,rml_footer:0
@@ -10675,7 +10686,7 @@
 #. module: base
 #: field:ir.module.module,icon:0
 msgid "Icon URL"
-msgstr ""
+msgstr "URL ikone"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
@@ -11119,7 +11130,7 @@
 #. module: base
 #: help:res.partner,ean13:0
 msgid "BarCode"
-msgstr ""
+msgstr "Barkod"
 
 #. module: base
 #: help:ir.model.fields,model_id:0
@@ -11391,7 +11402,7 @@
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
-msgstr ""
+msgstr "Pozdrav"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -11611,6 +11622,17 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za kreiranje nove kategorije partnera.\n"
+"              </p><p>\n"
+"                Definirajte kategorije partnera kako bi ih mogli "
+"kvalitetnije rpatiti i analizirati.\n"
+"                Partner može pripadati nekoliko kategorija, a kategorije "
+"imaju hijerarhijsku strukturu: \n"
+"                partner koji pripada određenoj kategoriji, također pripada i "
+"nadređenoj kategoriji.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: field:ir.actions.act_window,filter:0
@@ -11830,7 +11852,7 @@
 #: model:ir.actions.client,name:base.modules_updates_act_cl
 #: model:ir.ui.menu,name:base.menu_module_updates
 msgid "Updates"
-msgstr ""
+msgstr "Nadogradnja"
 
 #. module: base
 #: field:ir.actions.act_window.view,sequence:0
@@ -12144,7 +12166,7 @@
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_16
 msgid "Retailer"
-msgstr ""
+msgstr "Trgovac"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -14281,7 +14303,7 @@
 #. module: base
 #: model:ir.model,name:base.model_change_password_wizard
 msgid "Change Password Wizard"
-msgstr ""
+msgstr "Čarobnjak za promjenu lozinke"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
@@ -14361,7 +14383,7 @@
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_voucher
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "eRačuni i Plaćanja"
 
 #. module: base
 #: view:ir.rule:0
@@ -14486,7 +14508,7 @@
 #. module: base
 #: field:ir.module.module,name:0
 msgid "Technical Name"
-msgstr ""
+msgstr "Tehnički naziv"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -14523,7 +14545,7 @@
 #. module: base
 #: view:res.country:0
 msgid "Address format..."
-msgstr ""
+msgstr "Format adrese ..."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_et
@@ -14732,7 +14754,7 @@
 #: code:addons/base/module/wizard/base_module_import.py:58
 #, python-format
 msgid "File is not a zip file!"
-msgstr ""
+msgstr "Datoteka nij eu zip formatu !"
 
 #. module: base
 #: model:res.country,name:base.ar
@@ -15160,7 +15182,7 @@
 #. module: base
 #: view:base.language.import:0
 msgid "e.g. en_US"
-msgstr ""
+msgstr "npr. hr_HR"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_hn
@@ -15341,7 +15363,7 @@
 #: code:addons/base/module/module.py:669
 #, python-format
 msgid "Module not found"
-msgstr ""
+msgstr "Modul nije pronađen"
 
 #. module: base
 #: help:res.currency,rate:0
@@ -15706,6 +15728,14 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za kreiranje novog kontakta u adresaru.\n"
+"              </p><p>\n"
+"                Pomoću OpenERP-a moguće je jednostavno pratiti sve \n"
+"                aktivnosti povezane sa kupcima: diskusije, povijest \n"
+"                prilika, dokumenti i sl.\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2

=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py	2013-07-30 11:46:45 +0000
+++ openerp/addons/base/ir/ir_model.py	2013-09-27 14:05:46 +0000
@@ -381,7 +381,7 @@
 
         # static table of properties
         model_props = [ # (our-name, fields.prop, set_fn)
-            ('field_description', 'string', str),
+            ('field_description', 'string', unicode),
             ('required', 'required', bool),
             ('readonly', 'readonly', bool),
             ('domain', '_domain', eval),
@@ -504,7 +504,7 @@
     def _module_data_uninstall(self, cr, uid, ids, context=None):
         """
         Delete PostgreSQL foreign keys and constraints tracked by this model.
-        """ 
+        """
 
         if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
             raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
@@ -565,7 +565,7 @@
     def _module_data_uninstall(self, cr, uid, ids, context=None):
         """
         Delete PostgreSQL many2many relations tracked by this model.
-        """ 
+        """
 
         if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
             raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
@@ -1020,11 +1020,11 @@
         ``ids`` along with their corresponding database backed (including
         dropping tables, columns, FKs, etc, as long as there is no other
         ir.model.data entry holding a reference to them (which indicates that
-        they are still owned by another module). 
+        they are still owned by another module).
         Attempts to perform the deletion in an appropriate order to maximize
         the chance of gracefully deleting all records.
         This step is performed as part of the full uninstallation of a module.
-        """ 
+        """
 
         ids = self.search(cr, uid, [('module', 'in', modules_to_remove)])