[MERGE]

bzr revid: nch@tinyerp.com-20100126102949-j728nd0dxudvaune bzr revid: nch@tinyerp.com-20100128044120-n5zaduo5yq955fop
2010-01-28 10:11:20 +05:30
parent 1683ae2bc3 740101d926
commit 329d401ddd
6 changed files with 69 additions and 62 deletions
@@ -60,6 +60,8 @@ ad_paths.append(_ad)    # for get_module_path
 # Modules already loaded
 loaded = []

+#Modules whch raised error
+not_loaded = []

 class Graph(dict):

@@ -318,9 +320,9 @@ def upgrade_graph(graph, cr, module_list, force=None):
        mod_path = get_module_path(module)
        terp_file = get_module_resource(module, '__terp__.py')
        if not mod_path or not terp_file:
+            not_loaded.append(module)
            logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: not installable' % (module))
-            cr.execute("update ir_module_module set state=%s where name=%s", ('uninstallable', module))
-            continue
+            raise osv.osv.except_osv('Error!',"Module '%s' was not found" % (module,))

        if os.path.isfile(terp_file) or zipfile.is_zipfile(mod_path+'.zip'):
            try:
@@ -685,7 +687,6 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
 def load_modules(db, force_demo=False, status=None, update_module=False):
    if not status:
        status = {}
-
    cr = db.cursor()
    if cr:
       cr.execute("SELECT relname FROM pg_class WHERE relkind='r' AND relname='ir_module_module'")
@@ -709,7 +710,9 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
        graph = create_graph(cr, ['base'], force)

        has_updates = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report)
-
+        if not_loaded:
+            #If some module is not loaded don't proceed further
+            return
        if update_module:
            modobj = pool.get('ir.module.module')
            logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list')
@@ -2,7 +2,7 @@
 <openerp>
    <data>
        <menuitem icon="terp-administration" id="menu_administration" name="Administration" sequence="20"/>
-        <menuitem id="custom_shortcuts" name="Custom Shortcuts" parent="base.menu_administration" sequence="20"/>        
+        <menuitem id="custom_shortcuts" name="Custom Shortcuts" parent="base.menu_administration" sequence="20"/>
        <menuitem id="next_id_4" name="Low Level Objects" parent="base.menu_administration" sequence="3"/>
        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
        <menuitem id="menu_custom" name="Customization" parent="base.menu_administration" sequence="2"/>
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-25 16:05+0000\n"
+"PO-Revision-Date: 2010-01-26 06:09+0000\n"
 "Last-Translator: Paul Korotkov <korotkov.paul@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-01-27 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-25 05:45+0000\n"
+"PO-Revision-Date: 2010-01-26 23:21+0000\n"
 "Last-Translator: Oktay Altunergil <oktaya@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-01-27 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base
@@ -170,7 +170,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Ortak Ara"

 #. module: base
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
@@ -572,7 +572,7 @@ msgstr "Papua Yeni Gine"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr ""
+msgstr "Temel Ortak"

 #. module: base
 #: rml:ir.module.reference:0
@@ -582,7 +582,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "My Partners"
-msgstr ""
+msgstr "Ortaklarım"

 #. module: base
 #: model:res.country,name:base.es
@@ -1852,12 +1852,12 @@ msgstr "Doğum günü"
 #: model:ir.actions.act_window,name:base.action_partner_title_contact
 #: model:ir.ui.menu,name:base.menu_partner_title_contact
 msgid "Contact Titles"
-msgstr ""
+msgstr "Bağlantı Ünvanları"

 #. module: base
 #: model:ir.model,name:base.model_res_partner_som
 msgid "res.partner.som"
-msgstr ""
+msgstr "res.partner.som"

 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
@@ -1882,7 +1882,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner_title
 msgid "res.partner.title"
-msgstr ""
+msgstr "res.partner.title"

 #. module: base
 #: field:ir.sequence,prefix:0
@@ -2323,7 +2323,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
-msgstr ""
+msgstr "Ortak müşteri ise bu kutuyu işaretleyiniz."

 #. module: base
 #: model:ir.actions.act_window,name:base.res_lang_act_window
@@ -2454,7 +2454,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Vatikan"

 #. module: base
 #: help:ir.actions.server,condition:0
@@ -2528,7 +2528,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.address:0
 msgid "Partner Address"
-msgstr ""
+msgstr "Ortak Adresi"

 #. module: base
 #: field:ir.module.module,license:0
@@ -2689,7 +2689,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_config_wizard_form
 #: model:ir.ui.menu,name:base.menu_config_module
 msgid "Configuration Wizard"
-msgstr ""
+msgstr "Yapılandırma Sihirbazı"

 #. module: base
 #: model:ir.model,name:base.model_res_roles
@@ -2756,7 +2756,7 @@ msgstr ""
 #: field:res.partner.event,som:0
 #: field:res.partner.som,name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "Ruh Hali"

 #. module: base
 #: model:res.country,name:base.bj
@@ -3062,7 +3062,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr ""
+msgstr "Ana Ortak"

 #. module: base
 #: view:ir.module.module:0
@@ -3140,7 +3140,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
 msgid "Starter Partner"
-msgstr ""
+msgstr "Başlangıç Ortak"

 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_view
@@ -3187,7 +3187,7 @@ msgstr ""
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in three chars.\n"
-msgstr ""
+msgstr "Üç karakterden oluşan eyalet kodu.\n"

 #. module: base
 #: model:res.country,name:base.sj
@@ -3255,7 +3255,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "SMS Configuration"
-msgstr ""
+msgstr "SMS Yapılandırma"

 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -3391,7 +3391,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_address_form
 #: view:res.partner.address:0
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Ortak Adresleri"

 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -3444,7 +3444,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
 #: view:res.partner:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Ortak Bağlantıları"

 #. module: base
 #: wizard_field:module.module.update,update,add:0
@@ -3489,7 +3489,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "Email Configuration"
-msgstr ""
+msgstr "E-Posta Yapılandırma"

 #. module: base
 #: model:ir.model,name:base.model_ir_cron
@@ -3701,7 +3701,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr ""
+msgstr "Ortak Ünvanları"

 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -3799,7 +3799,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.address,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Federal Eyalet"

 #. module: base
 #: model:res.country,name:base.io
@@ -3825,7 +3825,7 @@ msgstr ""
 #. module: base
 #: field:res.country.state,code:0
 msgid "State Code"
-msgstr ""
+msgstr "Eyalet Kodu"

 #. module: base
 #: field:ir.model.fields,on_delete:0
@@ -3975,7 +3975,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.som:0
 msgid "Partner State of Mind"
-msgstr ""
+msgstr "Ortak Ruh Hali"

 #. module: base
 #: selection:ir.ui.view,type:0
@@ -4387,7 +4387,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner_event
 msgid "res.partner.event"
-msgstr ""
+msgstr "res.partner.event"

 #. module: base
 #: field:res.company,user_ids:0
@@ -4471,7 +4471,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.next_id_14
 #: view:res.partner.event:0
 msgid "Partner Events"
-msgstr ""
+msgstr "Ortak Etkinlikleri"

 #. module: base
 #: model:ir.model,name:base.model_workflow_transition
@@ -4761,7 +4761,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.us
 msgid "United States"
-msgstr ""
+msgstr "Amerika Birleşik Devletleri (A.B.D.)"

 #. module: base
 #: rml:ir.module.reference:0
@@ -4944,7 +4944,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_partner_category
 #: model:ir.ui.menu,name:base.menu_partner_category_main
 msgid "Partners by Categories"
-msgstr ""
+msgstr "Kategorilere göre Ortaklar"

 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
@@ -5193,7 +5193,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.af
 msgid "Afghanistan, Islamic State of"
-msgstr ""
+msgstr "Afganistan"

 #. module: base
 #: code:addons/base/module/wizard/wizard_module_import.py:0
@@ -5314,7 +5314,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.res_partner_event_type-act
 #: model:ir.ui.menu,name:base.menu_res_partner_event_type-act
 msgid "Active Partner Events"
-msgstr ""
+msgstr "Faal Ortak Etkinlikler"

 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_function_form
@@ -5547,7 +5547,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_country_state
 msgid "Country state"
-msgstr ""
+msgstr "Ülke eyaleti"

 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form_all
@@ -5725,7 +5725,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Next Configuration Step"
-msgstr ""
+msgstr "Sonraki Yapılandırma Adımı"

 #. module: base
 #: field:res.groups,comment:0
@@ -5745,7 +5745,7 @@ msgstr ""
 #. module: base
 #: field:res.country.state,name:0
 msgid "State Name"
-msgstr ""
+msgstr "Eyalet Adı"

 #. module: base
 #: field:workflow.activity,join_mode:0
@@ -5790,7 +5790,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
 msgid "OpenERP Partners"
-msgstr ""
+msgstr "OpenERP Ortakları"

 #. module: base
 #: model:res.country,name:base.by
@@ -5864,7 +5864,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "Trigger Configuration"
-msgstr ""
+msgstr "Tetikleme Yapılandırması"

 #. module: base
 #: selection:server.action.create,init,type:0
@@ -5949,7 +5949,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.event,partner_type:0
 msgid "Partner Relation"
-msgstr ""
+msgstr "Ortak İlişkiler"

 #. module: base
 #: field:ir.actions.act_window,context:0
@@ -6026,13 +6026,13 @@ msgstr "Aylık"
 #: model:ir.actions.act_window,name:base.res_partner_som-act
 #: model:ir.ui.menu,name:base.menu_res_partner_som-act
 msgid "States of mind"
-msgstr ""
+msgstr "Ruh halleri"

 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
 #: model:ir.ui.menu,name:base.menu_country_state_partner
 msgid "Fed. States"
-msgstr ""
+msgstr "Federal Eyaletler"

 #. module: base
 #: view:ir.model:0
@@ -6114,7 +6114,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_config
 #: view:res.company:0
 msgid "Configuration"
-msgstr "Ayarlar"
+msgstr "Yapılandırma"

 #. module: base
 #: field:ir.actions.server,expression:0
@@ -6139,7 +6139,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
 msgid "Gold Partner"
-msgstr ""
+msgstr "Altın Ortak"

 #. module: base
 #: model:ir.model,name:base.model_res_partner
@@ -6336,7 +6336,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
-msgstr ""
+msgstr "Diğer Ortaklar"

 #. module: base
 #: view:ir.model:0
@@ -6509,7 +6509,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Ortak Kategorisi"

 #. module: base
 #: view:ir.actions.server:0
@@ -6565,7 +6565,7 @@ msgstr ""
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Ortak Ref."

 #. module: base
 #: field:ir.report.custom,print_format:0
@@ -6883,7 +6883,7 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-partner"
-msgstr ""
+msgstr "terp-partner"

 #. module: base
 #: field:ir.model.fields,field_description:0
@@ -6952,7 +6952,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.configuration.wizard,item_id:0
 msgid "Next Configuration Wizard"
-msgstr ""
+msgstr "Sonraki Yapılandırma Sihirbazı"

 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -7101,7 +7101,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "Other Actions Configuration"
-msgstr ""
+msgstr "Diğer İşlemleri Yapılandırma"

 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7145,6 +7145,7 @@ msgstr ""
 #: help:res.partner.address,partner_id:0
 msgid "Keep empty for a private address, not related to partner."
 msgstr ""
+"Herhangi bir ortakla bağlantısı olmayan özel adresler için boş bırakınız."

 #. module: base
 #: model:res.country,name:base.vu
@@ -7168,7 +7169,7 @@ msgstr ""
 #: wizard_button:module.upgrade,end,config:0
 #: wizard_button:module.upgrade,start,config:0
 msgid "Start configuration"
-msgstr ""
+msgstr "Yapılandırmaya başla"

 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -7202,6 +7203,8 @@ msgid ""
 "Check this box if the partner is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
+"Ortak tedarikçi ise bu kutuyu seçiniz. Aksi taktirde satınalma personeli "
+"alım emri girerken bu ortağı görmeyecektir."

 #. module: base
 #: field:ir.model.fields,relation_field:0
@@ -7679,7 +7682,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form_new
 msgid "New Partner"
-msgstr ""
+msgstr "Yeni Ortak"

 #. module: base
 #: selection:ir.report.custom,print_orientation:0
@@ -7725,7 +7728,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_11
 msgid "Configuration Wizards"
-msgstr ""
+msgstr "Yapılandırma Sihirbazları"

 #. module: base
 #: field:res.lang,code:0
@@ -7740,7 +7743,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localisation"
-msgstr ""
+msgstr "Yerelleştirme"

 #. module: base
 #: selection:res.config.view,view:0
@@ -7800,7 +7803,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 #: view:res.partner.category:0
 msgid "Partner Categories"
-msgstr ""
+msgstr "Ortak Kategorileri"

 #. module: base
 #: field:ir.sequence,code:0
@@ -7893,7 +7896,7 @@ msgstr ""
 #: code:addons/base/res/partner/partner.py:0
 #, python-format
 msgid "Partners: "
-msgstr ""
+msgstr "Ortaklar: "

 #. module: base
 #: model:res.country,name:base.kp
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-25 05:47+0000\n"
+"PO-Revision-Date: 2010-01-26 06:10+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-01-27 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base
@@ -2424,9 +2424,9 @@ class orm(orm_template):
    def _read_flat(self, cr, user, ids, fields_to_read, context=None, load='_classic_read'):
        if not context:
            context = {}
+        #ids = map(lambda x:int(x), ids)        
        if not ids:
            return []
-        ids = map(lambda x:int(x), ids)
        if fields_to_read == None:
            fields_to_read = self._columns.keys()

@@ -2520,6 +2520,7 @@ class orm(orm_template):
                res2 = self._columns[val[0]].get(cr, self, ids, val, user, context=context, values=res)
                for pos in val:
                    for record in res:
+                        if isinstance(res2[record['id']], str):res2[record['id']] = eval(res2[record['id']]) #TOCHECK : why got string instend of dict in python2.6
                        record[pos] = res2[record['id']][pos]
            else:
                for f in val: