diff options
| author | Mantavya Gajjar <mga@tinyerp.com> | 2010-04-20 02:36:35 +0530 |
|---|---|---|
| committer | Mantavya Gajjar <mga@tinyerp.com> | 2010-04-20 02:36:35 +0530 |
| commit | 5f197ef01f7f4224f5805b5dcdeecfee40aeb379 (patch) | |
| tree | a1d6a5b81bfe98800ef0c461b6594969f6c0b6d9 /addons/base_module_record | |
| parent | f2f2bde0f3c0a09c8eb0cb841d6f2171ad83c735 (diff) | |
| parent | e55d830a7c76e8390bd2f533370424368339da4d (diff) | |
[MERGE]: merging from same branch
bzr revid: mga@tinyerp.com-20100419210635-fv7bhc6474l4blc8
Diffstat (limited to 'addons/base_module_record')
| -rw-r--r-- | addons/base_module_record/__openerp__.py (renamed from addons/base_module_record/__terp__.py) | 0 | ||||
| -rw-r--r-- | addons/base_module_record/base_module_record.py | 16 | ||||
| -rw-r--r-- | addons/base_module_record/i18n/ru.po | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__openerp__.py index 51dceec5b70..51dceec5b70 100644 --- a/addons/base_module_record/__terp__.py +++ b/addons/base_module_record/__openerp__.py diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index cda1f4ebb82..97c0ada4bca 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -143,7 +143,7 @@ class base_module_record(osv.osv): obj = dt.browse(cr, uid, dtids[0]) self.depends[obj.module] = True return obj.module+'.'+obj.name, obj.noupdate - + def _create_record(self, cr, uid, doc, model, data, record_id, noupdate=False): data_pool = self.pool.get('ir.model.data') @@ -384,7 +384,7 @@ class base_module_record(osv.osv): elif rec[3]=='create': id = self._create_id(cr, uid, rec[2],rec[4]) record,noupdate = self._create_record(cr, uid, doc, rec[2], rec[4], id) - self.ids[(rec[3], result)] = id + self.ids[(rec[2], result)] = id record_list += record elif rec[3]=='copy': @@ -446,8 +446,8 @@ class base_module_record(osv.osv): terp.appendChild(data) wkf = doc.createElement('workflow') data.appendChild(wkf) - wkf.setAttribute("model", rec[1][3]) - wkf.setAttribute("action", rec[1][4]) + wkf.setAttribute("model", rec[1][2]) + wkf.setAttribute("action", rec[1][3]) if noupdate: data.setAttribute("noupdate", "1") wkf.setAttribute("ref", rec_id) @@ -482,10 +482,12 @@ class base_module_record(osv.osv): continue if self.mode == "workflow": record= self._generate_object_yaml(cr, uid, rec[1],rec[0]) + yaml_file+="!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n''' object=yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1')) - yaml_file += str(object) + '''\n''' + yaml_file += str(object) + '''\n\n''' else: record= self._generate_object_yaml(cr, uid, rec[1],rec[3]) + yaml_file+="!comment Creating an %s record"%(record['model']) + '''\n''' object= yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1')) yaml_file += str(object) + '''\n''' attrs=yaml.dump(object.attrs, default_flow_style=False) @@ -497,7 +499,9 @@ class base_module_record(osv.osv): if line.find('!record') == 0: line = "- \n" + " " + line elif line.find('!workflow') == 0: - line = "- \n" + " " + line + line = "- \n" + " " + line + elif line.find('!comment') == 0: + line=line.replace('!comment','- \n ') elif line.find('- -') != -1: line=line.replace('- -',' -') line = " " + line diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po index 3ea600a1700..b048d092d41 100644 --- a/addons/base_module_record/i18n/ru.po +++ b/addons/base_module_record/i18n/ru.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_record |