gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-818189-6.0-gpa into lp:openobject-server.
Requested reviews: Naresh(OpenERP) (nch-openerp) Related bugs: Bug #818189 in OpenERP Server: "tuple (5) to unlink all values in a many2many field doesn't work" https://bugs.launchpad.net/openobject-server/+bug/818189 For more details, see: https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-818189-6.0-gpa/+merge/71833 Fixed problem of tuple(5) unlink in many2many -- https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-818189-6.0-gpa/+merge/71833 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-bug-818189-6.0-gpa.
=== added file 'debian/po/da.po' --- debian/po/da.po 1970-01-01 00:00:00 +0000 +++ debian/po/da.po 2011-08-17 09:45:24 +0000 @@ -0,0 +1,42 @@ +# Danish translation for openobject-server +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-server package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"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" +"PO-Revision-Date: 2011-07-22 14:15+0000\n" +"Last-Translator: Mads L. Nielsen <Unknown>\n" +"Language-Team: Danish <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-07-23 05:36+0000\n" +"X-Generator: Launchpad (build 13405)\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "Dedicated system account for the Open ERP server:" +msgstr "Dedikeret system konto til Open ERP serveren" + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "" +"The Open ERP server must use a dedicated account for its operation so that " +"the system's security is not compromised by running it with superuser " +"privileges." +msgstr "" +"Open ERP serveren skal bruge en dedikeret konto til sine operationer, sÃ¥ " +"systemets sikkerhed ikke bliver kompromitteret ved at køre serveren med " +"superbruger privilegier" + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "Please choose that account's username." +msgstr "Vælg kontoens brugernavn" === renamed file 'debian/po/da.po' => 'debian/po/da.po.moved' === modified file 'openerp/addons/base/i18n/fi.po' --- openerp/addons/base/i18n/fi.po 2011-08-14 04:44:30 +0000 +++ openerp/addons/base/i18n/fi.po 2011-08-17 09:45:24 +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-08-10 08:24+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-08-14 04:39+0000\n" "X-Generator: Launchpad (build 13674)\n" +======= +"X-Launchpad-Export-Date: 2011-08-11 05:26+0000\n" +"X-Generator: Launchpad (build 13644)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/fr.po' --- openerp/addons/base/i18n/fr.po 2011-08-14 04:44:30 +0000 +++ openerp/addons/base/i18n/fr.po 2011-08-17 09:45:24 +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-18 12:43+0000\n" "Last-Translator: Aline (OpenERP) <Unknown>\n" +======= +"PO-Revision-Date: 2011-07-29 13:53+0000\n" +"Last-Translator: lolivier <[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-08-14 04:39+0000\n" "X-Generator: Launchpad (build 13674)\n" +======= +"X-Launchpad-Export-Date: 2011-07-30 05:30+0000\n" +"X-Generator: Launchpad (build 13405)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/pt.po' --- openerp/addons/base/i18n/pt.po 2011-08-14 04:44:30 +0000 +++ openerp/addons/base/i18n/pt.po 2011-08-17 09:45:24 +0000 @@ -7,14 +7,24 @@ "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-03-16 22:11+0000\n" "Last-Translator: Paulo Borges <Unknown>\n" +======= +"PO-Revision-Date: 2011-08-02 16:54+0000\n" +"Last-Translator: Paulo Borges <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-08-14 04:41+0000\n" "X-Generator: Launchpad (build 13674)\n" +======= +"X-Launchpad-Export-Date: 2011-08-03 05:12+0000\n" +"X-Generator: Launchpad (build 13573)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/zh_CN.po' --- openerp/addons/base/i18n/zh_CN.po 2011-08-14 04:44:30 +0000 +++ openerp/addons/base/i18n/zh_CN.po 2011-08-17 09:45:24 +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-08-15 12:49+0000\n" +"Last-Translator: openerp-china.black-jack <[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-08-14 04:43+0000\n" "X-Generator: Launchpad (build 13674)\n" +======= +"X-Launchpad-Export-Date: 2011-08-16 04:56+0000\n" +"X-Generator: Launchpad (build 13687)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 @@ -33,7 +43,7 @@ #. module: base #: view:ir.actions.report.xml:0 msgid "Other Configuration" -msgstr "å ¶ä»é ç½®" +msgstr "å ¶å®è®¾ç½®" #. module: base #: selection:ir.property,type:0 @@ -296,7 +306,7 @@ #. module: base #: view:ir.actions.todo:0 msgid "Config Wizard Steps" -msgstr "é ç½®å导æ¥éª¤" +msgstr "设置å导æ¥éª¤" #. module: base #: model:ir.model,name:base.model_ir_ui_view_sc @@ -840,7 +850,7 @@ #: model:ir.ui.menu,name:base.menu_workflow_transition #: view:workflow.activity:0 msgid "Transitions" -msgstr "转æ¢" +msgstr "转移" #. module: base #: code:addons/orm.py:4020 @@ -1041,7 +1051,7 @@ #: code:addons/base/publisher_warranty/publisher_warranty.py:163 #, python-format msgid "Error during communication with the publisher warranty server." -msgstr "å½ä¸åå¸è ä¿éæå¡å¨éä¿¡æ¶åçé误ã" +msgstr "å½ä¸ä¿éæå¡å¨éä¿¡æ¶åçé误ã" #. module: base #: help:ir.actions.server,email:0 @@ -1996,7 +2006,7 @@ #: model:ir.actions.act_window,name:base.ir_property_form #: model:ir.ui.menu,name:base.menu_ir_property_form_all msgid "Configuration Parameters" -msgstr "é ç½®åæ°" +msgstr "设置åæ°" #. module: base #: constraint:ir.cron:0 @@ -2046,7 +2056,7 @@ #. module: base #: view:ir.actions.server:0 msgid "Iteration Action Configuration" -msgstr "éå¤æ´»å¨é ç½®" +msgstr "éå¤æ´»å¨è®¾ç½®" #. module: base #: selection:publisher_warranty.contract,state:0 @@ -2262,7 +2272,7 @@ #: model:ir.actions.server,name:base.action_start_configurator #: model:ir.ui.menu,name:base.menu_view_base_module_configuration msgid "Start Configuration" -msgstr "å¼å§é ç½®" +msgstr "å¼å§è®¾ç½®" #. module: base #: model:res.country,name:base.mt @@ -2961,8 +2971,7 @@ "\n" "Click 'Continue' and enjoy your OpenERP experience..." msgstr "" -"æ¨çå¸å¥å·²ç»å ¨é¨é ç½®å®æ¯ã\n" -"\n" +"æ¨çå¸å¥å·²ç»å ¨é¨è®¾ç½®å®æ¯ã\n" "请åå»â继ç»âæé®å¼å§äº«åæ¨ç OpenERP ä½éª..." #. module: base @@ -3103,7 +3112,7 @@ #. module: base #: view:base.module.configuration:0 msgid "System Configuration Done" -msgstr "ç³»ç»é ç½®å®æ" +msgstr "ç³»ç»è®¾ç½®å®æ" #. module: base #: code:addons/orm.py:929 @@ -3372,7 +3381,7 @@ #: view:res.request:0 #: field:res.request,history:0 msgid "History" -msgstr "åå²è®°å½" +msgstr "æ¥å¿" #. module: base #: field:ir.attachment,create_uid:0 @@ -3430,7 +3439,7 @@ #: model:ir.actions.act_window,name:base.action_config_simple_view_form #: view:res.config.view:0 msgid "Configure Your Interface" -msgstr "é ç½®ä½ ççé¢" +msgstr "è®¾ç½®ä½ ççé¢" #. module: base #: field:ir.values,meta:0 @@ -3647,7 +3656,7 @@ #: view:ir.filters:0 #: view:res.request:0 msgid "Group By" -msgstr "åç»æ¹å¼" +msgstr "åç»" #. module: base #: view:res.config:0 @@ -3903,7 +3912,7 @@ #. module: base #: model:res.widget,title:base.currency_converter_widget msgid "Currency Converter" -msgstr "è´§å¸è½¬æ¢å¨" +msgstr "å¸å«å æ¢" #. module: base #: code:addons/orm.py:156 @@ -4113,7 +4122,7 @@ #. module: base #: field:ir.cron,doall:0 msgid "Repeat Missed" -msgstr "éå¤éè¿ç" +msgstr "éåéè¿çå¨ä½" #. module: base #: help:ir.actions.server,state:0 @@ -4129,7 +4138,7 @@ #: help:res.currency,rate:0 #: help:res.currency.rate,rate:0 msgid "The rate of the currency to the currency of rate 1" -msgstr "è´§å¸å°è´§å¸ç转æ¢æ±ç为 1" +msgstr "å¸å«å°å ¶ä»å¸å«çæ±ç为 1" #. module: base #: model:res.country,name:base.uk @@ -4203,7 +4212,7 @@ msgid "" "You cannot perform this operation. New Record Creation is not allowed for " "this object as this object is for reporting purpose." -msgstr "æ¨ä¸è½æ¯ææ¤æä½ãæ¤å¯¹è±¡ä¸å 许è¿è¡âå建æ°è®°å½âæä½ï¼å 为æ¤å¯¹è±¡æ¯ä¸ºæ¥è¡¨åå¤çã" +msgstr "æ¨ä¸è½æ§è¡æ¤æä½ãæ¤å¯¹è±¡ä¸å 许è¿è¡âå建æ°è®°å½âæä½ï¼å 为æ¤å¯¹è±¡æ¯ä¸ºæ¥ååå¤çã" #. module: base #: view:base.language.import:0 @@ -4507,7 +4516,9 @@ "The configuration wizards are used to help you configure a new instance of " "OpenERP. They are launched during the installation of new modules, but you " "can choose to restart some wizards manually from this menu." -msgstr "é ç½®å导å°å¸®å©æ¨é ç½®ä¸ä¸ªæ°ç OpenERP å®ä¾ãå导å°å¨å®è£ æ°æ¨¡åçæ¶åå¯å¨ï¼ä½æ¯æ¨ä¹å¯ä»¥å¨æ¤èåä¸æå·¥éæ°å¯å¨ä¸äºå导ã" +msgstr "" +"设置å导å°å¸®å©æ¨è®¾ç½®ä¸ä¸ªæ°ç OpenERP å®ä¾ã\r\n" +"å导å°å¨å®è£ æ°æ¨¡åçæ¶åå¯å¨ï¼ä½æ¯æ¨ä¹å¯ä»¥å¨æ¤èåä¸æå·¥éæ°å¯å¨ä¸äºå导ã" #. module: base #: code:addons/base/res/res_user.py:206 @@ -4625,7 +4636,7 @@ #. module: base #: view:publisher_warranty.contract:0 msgid "Publisher Warranty Contracts" -msgstr "åå¸è æ ä¿å约" +msgstr "æ ä¿å约" #. module: base #: help:res.log,name:0 @@ -5152,7 +5163,7 @@ #: sql_constraint:publisher_warranty.contract:0 msgid "" "Your publisher warranty contract is already subscribed in the system !" -msgstr "æ¨çåå¸è ä¿éå约已ç»å¨ç³»ç»ä¸è®¢é ã" +msgstr "æ¨çä¿éå约已ç»å¨ç³»ç»ä¸è®¢é ã" #. module: base #: help:ir.cron,nextcall:0 @@ -5525,7 +5536,7 @@ msgstr "" "å¦æç¨æ·å·²æä¾çµåé®ä»¶ï¼å°åé欢è¿é®ä»¶ç»ä»ä»¬.\\n\n" "\\n\n" -"è¦å:å¦æâemail_fromâåâsmtp_serverâï¼SMTPï¼æ²¡æé ç½®ï¼å°æ æ³åéé®ä»¶ç»æ°ç¨æ·ã" +"è¦å:å¦æâemail_fromâåâsmtp_serverâï¼SMTPï¼æ²¡æ设置ï¼å°æ æ³åéé®ä»¶ç»æ°ç¨æ·ã" #. module: base #: selection:base.language.install,lang:0 @@ -5803,7 +5814,7 @@ #: code:addons/base/res/res_config.py:421 #, python-format msgid "Click 'Continue' to configure the next addon..." -msgstr "请åå»â继ç»âæé®é ç½®ä¸ä¸ä¸ªæ¨¡å..." +msgstr "请åå»â继ç»âæé®è®¾ç½®ä¸ä¸ä¸ªæ¨¡å..." #. module: base #: field:ir.actions.server,record_id:0 @@ -5873,7 +5884,7 @@ #: view:res.partner.address:0 #: view:workflow.activity:0 msgid "Group By..." -msgstr "åç»äº" +msgstr "åç»..." #. module: base #: view:ir.model.fields:0 @@ -6008,7 +6019,7 @@ msgid "" "All pending configuration wizards have been executed. You may restart " "individual wizards via the list of configuration wizards." -msgstr "æææèµ·çé ç½®å导已被æ§è¡ï¼æ¨å¯ä»¥éè¿é ç½®å导å表éå¯å个å导ã" +msgstr "æææèµ·ç设置å导已被æ§è¡ï¼æ¨å¯ä»¥éè¿è®¾ç½®å导å表éå¯å个å导ã" #. module: base #: wizard_button:server.action.create,step_1,create:0 @@ -6441,7 +6452,7 @@ "No rate found \n" "for the currency: %s \n" "at the date: %s" -msgstr "æ¾ä¸å°è´§å¸ %s æ¥æ %s çæ¯çã" +msgstr "æ¾ä¸å°å¸å« %s æ¥æ %s çæ±çã" #. module: base #: model:ir.actions.act_window,help:base.action_ui_view_custom @@ -6634,7 +6645,7 @@ #: model:ir.ui.menu,name:base.next_id_73 #: model:ir.ui.menu,name:base.reporting_menu msgid "Reporting" -msgstr "æ¥è¡¨" +msgstr "æ¥å" #. module: base #: model:res.country,name:base.tg @@ -6718,7 +6729,7 @@ #. module: base #: field:workflow.activity,join_mode:0 msgid "Join Mode" -msgstr "èå模å¼" +msgstr "å并模å¼" #. module: base #: field:res.config.users,context_tz:0 @@ -7736,7 +7747,7 @@ #: field:res.partner,child_ids:0 #: field:res.request,ref_partner_id:0 msgid "Partner Ref." -msgstr "ä¸å¡ä¼ä¼´åç §" +msgstr "ä¸å¡ä¼ä¼´" #. module: base #: model:ir.actions.act_window,name:base.action_partner_supplier_form @@ -7753,12 +7764,12 @@ #. module: base #: field:res.request,ref_doc2:0 msgid "Document Ref 2" -msgstr "åæ®åç §2" +msgstr "åæ®2" #. module: base #: field:res.request,ref_doc1:0 msgid "Document Ref 1" -msgstr "åæ®åç §1" +msgstr "åæ®1" #. module: base #: model:res.country,name:base.ga @@ -7921,7 +7932,7 @@ #. module: base #: view:publisher_warranty.contract.wizard:0 msgid "Publisher warranty contract successfully registered!" -msgstr "åå¸è ä¿éåå注åæåï¼" +msgstr "ä¿éåå注åæåï¼" #. module: base #: model:res.country,name:base.ao @@ -7941,7 +7952,7 @@ #: field:res.currency,name:0 #: field:res.currency.rate,currency_id:0 msgid "Currency" -msgstr "è´§å¸" +msgstr "å¸å«" #. module: base #: field:res.partner.canal,name:0 @@ -8468,7 +8479,7 @@ #: code:addons/base/module/wizard/base_module_configuration.py:37 #, python-format msgid "System Configuration done" -msgstr "ç³»ç»é 置已å®æ" +msgstr "ç³»ç»è®¾ç½®å·²å®æ" #. module: base #: field:workflow.triggers,instance_id:0 @@ -8536,7 +8547,7 @@ #: code:addons/base/publisher_warranty/publisher_warranty.py:145 #, python-format msgid "Please check your publisher warranty contract name and validity." -msgstr "请æ£æ¥æ¨çåå¸è ä¿éååå称åæææ§ã" +msgstr "请æ£æ¥æ¨çä¿éååå称åæææ§ã" #. module: base #: model:res.country,name:base.sv @@ -8634,7 +8645,7 @@ #. module: base #: model:ir.model,name:base.model_res_currency_rate msgid "Currency Rate" -msgstr "å æ¢ç" +msgstr "æ±ç" #. module: base #: model:ir.actions.act_window,help:base.grant_menu_access @@ -8807,7 +8818,7 @@ #. module: base #: view:publisher_warranty.contract:0 msgid "Publisher Warranty Contract" -msgstr "åå¸è ä¿éåå" +msgstr "ä¿éåå" #. module: base #: selection:base.language.install,lang:0 @@ -9070,7 +9081,7 @@ #. module: base #: field:workflow.activity,split_mode:0 msgid "Split Mode" -msgstr "åå²æ¨¡å¼" +msgstr "æå模å¼" #. module: base #: view:base.module.upgrade:0 @@ -9218,7 +9229,7 @@ #: field:res.partner.address,function:0 #: selection:workflow.activity,kind:0 msgid "Function" -msgstr "èè½" +msgstr "åè½" #. module: base #: view:res.widget:0 === modified file 'openerp/osv/fields.py' --- openerp/osv/fields.py 2011-07-12 08:37:11 +0000 +++ openerp/osv/fields.py 2011-08-17 09:45:24 +0000 @@ -665,7 +665,7 @@ if not cr.fetchone(): cr.execute('insert into '+self._rel+' ('+self._id1+','+self._id2+') values (%s,%s)', (id, act[1])) elif act[0] == 5: - cr.execute('update '+self._rel+' set '+self._id2+'=null where '+self._id2+'=%s', (id,)) + cr.execute('delete from '+self._rel+' where ' + self._id1 + ' = %s', (id,)) elif act[0] == 6: d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context)
_______________________________________________ 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
