openerp-dev-web team mailing list archive

["Rucha \(Open ERP\)" <rpa@xxxxxxxxxxx>]

Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-temporal-db-rpa into lp:~openerp-dev/openobject-server/trunk-temporal-db.

Requested reviews:
  qdp (OpenERP) (qdp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-temporal-db-rpa/+merge/59450

Fixed wrong operation for args, adding tuple in list was causing problem as it was adding items of tuple directly in the list
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-temporal-db-rpa/+merge/59450
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-temporal-db.

=== modified file 'bin/addons/base/i18n/vi.po'
--- bin/addons/base/i18n/vi.po	2011-04-19 04:50:43 +0000
+++ bin/addons/base/i18n/vi.po	2011-04-29 05:42:28 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-11 08:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-26 05:28+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:37+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
@@ -118,6 +118,8 @@
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
+"Bạn không thể viết trong tà i liệu nà y (% s) ! Hãy chắc chắn người dùng của "
+"bạn thuộc một trong các nhóm: %s."
 
 #. module: base
 #: help:ir.model.fields,domain:0

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2011-04-28 17:38:18 +0000
+++ openerp/osv/orm.py	2011-04-29 05:42:28 +0000
@@ -4333,7 +4333,7 @@
                 a, b, c = item
                 if a == 'id':
                     new_args += ['|', ('temporal_parent_id', b, c)]
-            new_args += item
+            new_args.append(item)
 
         #add the time constraint
         timenow = time.strftime('%Y-%m-%d %H:%M:%S')