Amit Dodiya (OpenERP) has proposed merging lp:~openerp-dev/openobject-server/6.0-opw-5801-ado into lp:openobject-server.
Requested reviews: Jay Vora (OpenERP) (jvo-openerp) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-server/6.0-opw-5801-ado/+merge/67029 Hello Sir, I have change the size of csv file while loading the data at the time of Synchronize Translation. Thanks, Amit -- https://code.launchpad.net/~openerp-dev/openobject-server/6.0-opw-5801-ado/+merge/67029 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/6.0-opw-5801-ado.
=== modified file 'debian/po/nb.po' --- debian/po/nb.po 2011-07-02 05:05:53 +0000 +++ debian/po/nb.po 2011-07-06 12:28:33 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-24 22:41+0300\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-16 05:12+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-09 11:52+0000\n" +"Last-Translator: Rolv RÃ¥en (adEgo) <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Norwegian Bokmal <[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-07-02 05:05+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-10 05:38+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. Type: string #. Description === modified file 'openerp/addons/base/i18n/ar.po' --- openerp/addons/base/i18n/ar.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/ar.po 2011-07-06 12:28:33 +0000 @@ -7,14 +7,24 @@ "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2009-11-30 07:54+0000\n" "Last-Translator: Fabien (Open ERP) <[email protected]>\n" +======= +"PO-Revision-Date: 2011-07-01 18:03+0000\n" +"Last-Translator: kifcaliph <[email protected]>\n" +>>>>>>> MERGE-SOURCE "Language-Team: \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-07-02 04:54+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-07-02 05:50+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/cs.po' --- openerp/addons/base/i18n/cs.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/cs.po 2011-07-06 12:28:33 +0000 @@ -1,20 +1,30 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * base +# * base # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-06-06 04:19+0000\n" "Last-Translator: VladimÃr Burian <[email protected]>\n" +======= +"PO-Revision-Date: 2011-06-24 01:18+0000\n" +"Last-Translator: Chronos <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: \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-07-02 04:55+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-25 06:19+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 @@ -9388,6 +9398,7 @@ #. module: base #: selection:base.language.install,lang:0 msgid "Russian / ÑÑÑÑкий ÑзÑк" +<<<<<<< TREE msgstr "RuÅ¡tina / ÑÑÑÑкий ÑзÑк" #~ msgid "Outgoing transitions" @@ -9760,3 +9771,6 @@ #~ msgid "STOCK_CONNECT" #~ msgstr "STOCK_PÅIPOJENO" +======= +msgstr "RuÅ¡tina / ÑÑÑÑкий ÑзÑк" +>>>>>>> MERGE-SOURCE === modified file 'openerp/addons/base/i18n/da.po' --- openerp/addons/base/i18n/da.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/da.po 2011-07-06 12:28:33 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-02-07 05:09+0000\n" "Last-Translator: Fabien (Open ERP) <[email protected]>\n" +======= +"PO-Revision-Date: 2011-05-29 20:17+0000\n" +"Last-Translator: Henning Dinsen <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Danish <[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-07-02 04:56+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-05-30 05:40+0000\n" +"X-Generator: Launchpad (build 12959)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/en_GB.po' --- openerp/addons/base/i18n/en_GB.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/en_GB.po 2011-07-06 12:28:33 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-06-30 15:19+0000\n" "Last-Translator: John Bradshaw <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-20 11:22+0000\n" +"Last-Translator: John Bradshaw <Unknown>\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-07-02 05:03+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-21 06:07+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/fi.po' --- openerp/addons/base/i18n/fi.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/fi.po 2011-07-06 12:28:33 +0000 @@ -7,14 +7,24 @@ "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-01-26 13:00+0000\n" "Last-Translator: Ville Lindfors <[email protected]>\n" +======= +"PO-Revision-Date: 2011-06-08 09:33+0000\n" +"Last-Translator: Juha Kotamäki <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: \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-07-02 04:56+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-09 05:43+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/it.po' --- openerp/addons/base/i18n/it.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/it.po 2011-07-06 12:28:33 +0000 @@ -7,15 +7,25 @@ "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-04-28 13:32+0000\n" "Last-Translator: Lorenzo Battistini - Agile BG - Domsense " +======= +"PO-Revision-Date: 2011-06-06 09:35+0000\n" +"Last-Translator: Lorenzo Battistini - Agile BG - Domsense " +>>>>>>> MERGE-SOURCE "<[email protected]>\n" "Language-Team: \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-07-02 04:58+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-07 05:51+0000\n" +"X-Generator: Launchpad (build 12959)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/nb.po' --- openerp/addons/base/i18n/nb.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/nb.po 2011-07-06 12:28:33 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-11 05:06+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-09 11:51+0000\n" +"Last-Translator: Rolv RÃ¥en (adEgo) <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Norwegian Bokmal <[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-07-02 04:59+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-10 05:38+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/ru.po' --- openerp/addons/base/i18n/ru.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/ru.po 2011-07-06 12:28:33 +0000 @@ -7,14 +7,24 @@ "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-05-26 04:57+0000\n" "Last-Translator: Pomazan Bogdan <Unknown>\n" +======= +"PO-Revision-Date: 2011-07-04 08:04+0000\n" +"Last-Translator: Chertykov Denis <[email protected]>\n" +>>>>>>> MERGE-SOURCE "Language-Team: \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-07-02 05:00+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-07-05 05:07+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 @@ -585,7 +595,7 @@ #. module: base #: field:res.partner,title:0 msgid "Partner Form" -msgstr "ФоÑма ÑобÑÑвенноÑÑи" +msgstr "ÐÑг. ÑоÑма" #. module: base #: selection:base.language.install,lang:0 === modified file 'openerp/addons/base/i18n/tr.po' --- openerp/addons/base/i18n/tr.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/tr.po 2011-07-06 12:28:33 +0000 @@ -7,14 +7,24 @@ "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-05-26 05:01+0000\n" "Last-Translator: Ahmet AltınıÅık <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-27 06:13+0000\n" +"Last-Translator: Ahmet AltınıÅık <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: \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-07-02 05:02+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-28 05:29+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/vi.po' --- openerp/addons/base/i18n/vi.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/vi.po 2011-07-06 12:28:33 +0000 @@ -8,14 +8,23 @@ "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-06-14 10:07+0000\n" +======= +"PO-Revision-Date: 2011-06-04 22:17+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Phong Nguyen-Thanh <Unknown>\n" "Language-Team: Vietnamese <[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-07-02 05:03+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-05 06:14+0000\n" +"X-Generator: Launchpad (build 12959)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 @@ -24,7 +33,11 @@ #: field:ir.rule,domain_force:0 #: field:res.partner.title,domain:0 msgid "Domain" +<<<<<<< TREE msgstr "Miá»n giá trá»" +======= +msgstr "Miá»n" +>>>>>>> MERGE-SOURCE #. module: base #: model:res.country,name:base.sh @@ -130,9 +143,15 @@ "specified as a Python expression defining a list of triplets. For example: " "[('color','=','red')]" msgstr "" +<<<<<<< TREE "Miá»n giá trá» tùy chá»n dùng Äá» giá»i hạn các giá trá» có thá» Äá»i vá»i các trÆ°á»ng " "quan há», Äược chá» Äá»nh bá»i má»t biá»u thức Python Äá»nh nghÄ©a má»t danh sách của " "các bá» ba. Và dụ: [('mà u'='Äá»')]" +======= +"Miá»n tùy chá»n dùng Äá» giá»i hạn các giá trá» có thá» Äá»i vá»i các trÆ°á»ng quan " +"há», Äược chá» Äá»nh bá»i má»t biá»u thức Python Äá»nh nghÄ©a má»t danh sách của các " +"bá» ba. Và dụ: [('mà u'='Äá»')]" +>>>>>>> MERGE-SOURCE #. module: base #: field:res.partner,ref:0 === modified file 'openerp/addons/base/i18n/zh_CN.po' --- openerp/addons/base/i18n/zh_CN.po 2011-07-02 05:05:53 +0000 +++ openerp/addons/base/i18n/zh_CN.po 2011-07-06 12:28:33 +0000 @@ -7,14 +7,24 @@ "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-01-28 03:33+0000\n" "Last-Translator: Wei \"oldrev\" Li <[email protected]>\n" +======= +"PO-Revision-Date: 2011-07-02 14:55+0000\n" +"Last-Translator: Wei \"oldrev\" Li <[email protected]>\n" +>>>>>>> MERGE-SOURCE "Language-Team: \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-07-02 05:04+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-07-03 05:27+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/ir/ir_rule.py' --- openerp/addons/base/ir/ir_rule.py 2011-06-01 13:55:26 +0000 +++ openerp/addons/base/ir/ir_rule.py 2011-07-06 12:28:33 +0000 @@ -125,8 +125,13 @@ rule_domain = self.read(cr, uid, rule.id, ['domain'])['domain'] dom = expression.normalize(rule_domain) for group in rule.groups: +<<<<<<< TREE if group in user.groups_id: group_domains.setdefault(group, []).append(dom) +======= + if uid in [u.id for u in group.users]: + group_rule.setdefault(group.id, []).append(rule.id) +>>>>>>> MERGE-SOURCE if not rule.groups: global_domains.append(dom) # combine global domains and group domains === modified file 'openerp/addons/base/ir/ir_sequence.py' --- openerp/addons/base/ir/ir_sequence.py 2010-12-10 22:42:58 +0000 +++ openerp/addons/base/ir/ir_sequence.py 2011-07-06 12:28:33 +0000 @@ -75,15 +75,15 @@ def get_id(self, cr, uid, sequence_id, test='id', context=None): assert test in ('code','id') - company_id = self.pool.get('res.users').read(cr, uid, uid, ['company_id'], context=context)['company_id'][0] or None + company_ids = self.pool.get('res.company').search(cr, uid, [], context=context) cr.execute('''SELECT id, number_next, prefix, suffix, padding FROM ir_sequence WHERE %s=%%s AND active=true - AND (company_id = %%s or company_id is NULL) + AND (company_id in %%s or company_id is NULL) ORDER BY company_id, id FOR UPDATE NOWAIT''' % test, - (sequence_id, company_id)) + (sequence_id, tuple(company_ids))) res = cr.dictfetchone() if res: cr.execute('UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s AND active=true', (res['id'],)) === modified file 'openerp/addons/base/res/partner/partner.py' --- openerp/addons/base/res/partner/partner.py 2011-04-21 06:15:44 +0000 +++ openerp/addons/base/res/partner/partner.py 2011-07-06 12:28:33 +0000 @@ -222,8 +222,10 @@ return True def address_get(self, cr, uid, ids, adr_pref=['default']): - cr.execute('select type,id from res_partner_address where partner_id IN %s',(tuple(ids),)) - res = cr.fetchall() + address_obj = self.pool.get('res.partner.address') + address_ids = address_obj.search(cr, uid, [('partner_id', '=', ids)]) + address_rec = address_obj.read(cr, uid, address_ids, ['type']) + res = list(tuple(addr.values()) for addr in address_rec) adr = dict(res) # get the id of the (first) default address if there is one, # otherwise get the id of the first address in the list === modified file 'openerp/addons/base/res/partner/partner_view.xml' --- openerp/addons/base/res/partner/partner_view.xml 2011-04-28 16:04:34 +0000 +++ openerp/addons/base/res/partner/partner_view.xml 2011-07-06 12:28:33 +0000 @@ -77,6 +77,7 @@ <form string="Address"> <group colspan="4" col="6"> <field name="partner_id" colspan="2"/> + <field name="active"/> <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="2"/> <newline/> <field name="name"/> === modified file 'openerp/addons/base/res/res_lang.py' --- openerp/addons/base/res/res_lang.py 2011-06-23 14:10:03 +0000 +++ openerp/addons/base/res/res_lang.py 2011-07-06 12:28:33 +0000 @@ -51,6 +51,7 @@ return False lang_ids = self.search(cr, uid, [('code','=', lang)]) if not lang_ids: +<<<<<<< TREE self.load_lang(cr, uid, lang) ir_values_obj = self.pool.get('ir.values') default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.partner']) @@ -59,6 +60,12 @@ default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.users']) if not default_value: ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], lang) +======= + lang_id = self.load_lang(cr, uid, lang) + default_value = values_obj.get(cr, uid, 'default', False, ['res.partner']) + if not default_value: + values_obj.set(cr, uid, 'default', False, 'lang', ['res.partner'], lang) +>>>>>>> MERGE-SOURCE return True def load_lang(self, cr, uid, lang, lang_name=None): === modified file 'openerp/osv/orm.py' --- openerp/osv/orm.py 2011-07-05 12:22:22 +0000 +++ openerp/osv/orm.py 2011-07-06 12:28:33 +0000 @@ -667,6 +667,7 @@ 'translate': (f.translate and 1) or 0, 'relation_field': (f._type=='one2many' and isinstance(f, fields.one2many)) and f._fields_id or '', } + # When its a custom field,it does not contain f.select if context.get('field_state', 'base') == 'manual': if context.get('field_name', '') == k: === modified file 'openerp/report/printscreen/ps_form.py' --- openerp/report/printscreen/ps_form.py 2011-06-23 09:04:57 +0000 +++ openerp/report/printscreen/ps_form.py 2011-07-06 12:28:33 +0000 @@ -56,15 +56,15 @@ if not context: context={} datas['ids'] = ids + pool = pooler.get_pool(cr.dbname) model = pool.get(datas['model']) - pool = pooler.get_pool(cr.dbname) # title come from description of model which are specified in py file. self.title = model._description result = model.fields_view_get(cr, uid, view_type='form', context=context) fields_order = self._parse_string(result['arch']) rows = model.read(cr, uid, datas['ids'], result['fields'].keys() ) - res = self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model._description) + self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model._description) return (self.obj.get(), 'pdf') === modified file 'openerp/report/report_sxw.py' --- openerp/report/report_sxw.py 2011-05-09 08:46:41 +0000 +++ openerp/report/report_sxw.py 2011-07-06 12:28:33 +0000 @@ -231,16 +231,6 @@ self.lang_dict_called = False for obj in self.objects: obj._context['lang'] = lang - for table in obj._cache: - for id in obj._cache[table]: - self._lang_cache.setdefault(obj._context['lang'], {}).setdefault(table, - {}).update(obj._cache[table][id]) - if lang in self._lang_cache \ - and table in self._lang_cache[lang] \ - and id in self._lang_cache[lang][table]: - obj._cache[table][id] = self._lang_cache[lang][table][id] - else: - obj._cache[table][id] = {'id': id} def _get_lang_dict(self): pool_lang = self.pool.get('res.lang') === modified file 'openerp/tools/translate.py' --- openerp/tools/translate.py 2011-06-14 14:22:26 +0000 +++ openerp/tools/translate.py 2011-07-06 12:28:33 +0000 @@ -33,6 +33,7 @@ import tarfile import tempfile import threading +import sys from os.path import join from datetime import datetime @@ -877,6 +878,8 @@ # now, the serious things: we read the language file fileobj.seek(0) if fileformat == 'csv': + #Setting the limit of data while loading a CSV + csv.field_size_limit(sys.maxint) reader = csv.reader(fileobj, quotechar='"', delimiter=',') # read the first line of the file (it contains columns titles) for row in reader: === modified file 'openerp/tools/yaml_import.py'
_______________________________________________ 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
