diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index d0ecd869810..071d06f1483 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-11 15:54+0000\n" +"PO-Revision-Date: 2010-03-15 14:11+0000\n" "Last-Translator: Anders Wallenquist \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-03-12 04:51+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -813,7 +813,7 @@ msgstr "Flytta rader" #. module: account #: model:ir.model,name:account.model_account_config_wizard msgid "account.config.wizard" -msgstr "Kontokonfiguration guide" +msgstr "account.config.wizard" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree @@ -1555,7 +1555,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Statements" -msgstr "" +msgstr "Myndighetsrapporter" #. module: account #: field:account.tax.code,parent_id:0 @@ -2254,7 +2254,7 @@ msgstr "Öppna transaktionsjournal" #. module: account #: view:account.config.wizard:0 msgid "Create a Fiscal Year" -msgstr "Skapa nytt verksamhetsår" +msgstr "Skapa ett verksamhetsår" #. module: account #: field:product.template,taxes_id:0 @@ -3665,17 +3665,17 @@ msgstr "" #: wizard_view:account.invoice.refund,init:0 #: model:ir.actions.wizard,name:account.wizard_invoice_refund msgid "Credit Note" -msgstr "" +msgstr "Kreditnota" #. module: account #: model:ir.actions.todo,note:account.config_fiscalyear msgid "Define Fiscal Years and Select Charts of Account" -msgstr "" +msgstr "Definiera verksamhetsåren och välj kontoplan" #. module: account #: wizard_field:account.move.line.reconcile,addendum,period_id:0 msgid "Write-Off Period" -msgstr "" +msgstr "Avskrivningsperiod" #. module: account #: selection:account.config.wizard,period:0 @@ -3703,7 +3703,7 @@ msgstr "" #: selection:account.config.wizard,period:0 #: field:report.hr.timesheet.invoice.journal,name:0 msgid "Month" -msgstr "" +msgstr "Månad" #. module: account #: model:ir.model,name:account.model_account_subscription @@ -3737,7 +3737,7 @@ msgstr "" #: field:account.fiscalyear,date_start:0 #: field:account.subscription,date_start:0 msgid "Start Date" -msgstr "" +msgstr "Startdatum" #. module: account #: wizard_view:account.general.ledger.report,account_selection:0 @@ -3952,12 +3952,12 @@ msgstr "Importera från dina bankutdrag" #. module: account #: view:account.chart.template:0 msgid "Properties" -msgstr "" +msgstr "Egenskaper" #. module: account #: view:res.partner:0 msgid "Customer Accounting Properties" -msgstr "" +msgstr "Kundens bokföringsinställningar" #. module: account #: view:account.bank.statement:0 @@ -4021,7 +4021,7 @@ msgstr "" #: field:account.tax,account_paid_id:0 #: field:account.tax.template,account_paid_id:0 msgid "Refund Tax Account" -msgstr "" +msgstr "Skatteåterbäringskonto" #. module: account #: field:account.tax.code,child_ids:0 @@ -4038,17 +4038,17 @@ msgstr "" #: view:account.bank.statement:0 #: field:account.bank.statement,line_ids:0 msgid "Statement lines" -msgstr "" +msgstr "Verifikatrader" #. module: account #: field:account.move.line,amount_taxed:0 msgid "Taxed Amount" -msgstr "" +msgstr "Skatteunderlag" #. module: account #: field:account.invoice.line,price_subtotal:0 msgid "Subtotal w/o tax" -msgstr "" +msgstr "Nettobelopp" #. module: account #: field:account.invoice.line,invoice_id:0 @@ -4058,7 +4058,7 @@ msgstr "" #. module: account #: field:account.analytic.line,general_account_id:0 msgid "General Account" -msgstr "" +msgstr "Huvudkonton" #. module: account #: help:account.move.line,quantity:0 @@ -4114,12 +4114,12 @@ msgstr "" #. module: account #: field:wizard.multi.charts.accounts,seq_journal:0 msgid "Separated Journal Sequences" -msgstr "" +msgstr "Separerade nummerserier för böcker" #. module: account #: help:account.bank.statement.reconcile,total_second_currency:0 msgid "The currency of the journal" -msgstr "" +msgstr "Valuta för boken" #. module: account #: view:account.journal.column:0 @@ -4149,7 +4149,7 @@ msgstr "Klar" #: model:ir.ui.menu,name:account.menu_action_account_period_form #: model:ir.ui.menu,name:account.next_id_23 msgid "Periods" -msgstr "" +msgstr "Perioder" #. module: account #: rml:account.invoice:0 @@ -4166,7 +4166,7 @@ msgstr "Faktura" #: wizard_button:account.open_closed_fiscalyear,init,open:0 #: wizard_button:account_use_models,create,open_move:0 msgid "Open" -msgstr "" +msgstr "Öppen" #. module: account #: model:ir.ui.menu,name:account.next_id_29 @@ -4253,7 +4253,7 @@ msgstr "Ok" #. module: account #: rml:account.invoice:0 msgid "Taxes:" -msgstr "" +msgstr "Skatter:" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree7 @@ -4714,7 +4714,7 @@ msgstr "" #. module: account #: view:account.fiscalyear:0 msgid "Create Monthly Periods" -msgstr "" +msgstr "Skapa månatliga perioder" #. module: account #: wizard_button:account.aged.trial.balance,init,print:0 @@ -4841,7 +4841,7 @@ msgstr "Total:" #. module: account #: model:ir.model,name:account.model_account_analytic_journal msgid "account.analytic.journal" -msgstr "" +msgstr "account.analytic.journal" #. module: account #: view:account.fiscal.position:0 @@ -5478,7 +5478,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax_template msgid "account.tax.template" -msgstr "" +msgstr "account.tax.template" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 @@ -5746,7 +5746,7 @@ msgstr "Bokföringsegenskaper" #. module: account #: model:ir.model,name:account.model_account_sequence_fiscalyear msgid "account.sequence.fiscalyear" -msgstr "" +msgstr "account.sequence.fiscalyear" #. module: account #: wizard_field:account.print.journal.report,init,sort_selection:0 diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po index 481357d0db9..33077b537c0 100644 --- a/addons/account/i18n/th.po +++ b/addons/account/i18n/th.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-23 10:50+0000\n" +"PO-Revision-Date: 2010-03-15 03:12+0000\n" "Last-Translator: Songpon Phusing \n" "Language-Team: Thai \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -25,23 +25,23 @@ msgstr "ชื่อเรียกภายใน" #. module: account #: view:account.tax.code:0 msgid "Account Tax Code" -msgstr "" +msgstr "รหัสบัญชีภาษี" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree9 #: model:ir.ui.menu,name:account.menu_action_invoice_tree9 msgid "Unpaid Supplier Invoices" -msgstr "" +msgstr "ใบแจ้งหนี้ที่ยังไม่จ่าย" #. module: account #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Entries Encoding" -msgstr "" +msgstr "กรอกข้อมูล" #. module: account #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form msgid "Specify The Message for the Overdue Payment Report." -msgstr "" +msgstr "ระบุข้อความสำหรับรายงานของการจ่ายที่เกินกำหนด" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 @@ -66,7 +66,7 @@ msgstr "" #. module: account #: wizard_view:account_use_models,init_form:0 msgid "Select Message" -msgstr "" +msgstr "เลือกข้อความ" #. module: account #: help:product.category,property_account_income_categ:0 diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py index c89f87fd8e0..6bf415d0ca6 100755 --- a/addons/account/wizard/wizard_third_party_ledger.py +++ b/addons/account/wizard/wizard_third_party_ledger.py @@ -114,7 +114,7 @@ class wizard_report(wizard.interface): sql = """ SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """ - cr.execute(sql,(data['form']['date1'])) + cr.execute(sql,(data['form']['date1'],)) res = cr.dictfetchall() if res: if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']): diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 91ba7b8782c..1bea209cd78 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -111,15 +111,19 @@ class base_module_record(osv.osv): 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') + model_pool = self.pool.get(model) + record = doc.createElement('record') record.setAttribute("id", record_id) record.setAttribute("model", model) record_list = [record] - lids = self.pool.get('ir.model.data').search(cr, uid, [('model','=',model)]) - res = self.pool.get('ir.model.data').read(cr, uid, lids[:1], ['module']) + lids = data_pool.search(cr, uid, [('model','=',model)]) + res = data_pool.read(cr, uid, lids[:1], ['module']) if res: self.depends[res[0]['module']]=True - fields = self.pool.get(model).fields_get(cr, uid) + fields = model_pool.fields_get(cr, uid) for key,val in data.items(): if not (val or (fields[key]['type']=='boolean')): continue @@ -142,9 +146,11 @@ class base_module_record(osv.osv): id,update = self._get_id(cr, uid, fields[key]['relation'], val) noupdate = noupdate or update if not id: + relation_pool = self.pool.get(fields[key]['relation']) + field.setAttribute("model", fields[key]['relation']) - fld_nm = self.pool.get(fields[key]['relation'])._rec_name - name = self.pool.get(fields[key]['relation']).read(cr, uid, val,[fld_nm])[fld_nm] or False + fld_nm = relation_pool._rec_name + name = relation_pool.read(cr, uid, val,[fld_nm])[fld_nm] or False field.setAttribute("search", str([(str(fld_nm) ,'=', name)])) else: field.setAttribute("ref", id) @@ -152,10 +158,10 @@ class base_module_record(osv.osv): elif fields[key]['type'] in ('one2many',): for valitem in (val or []): if valitem[0] in (0,1): - if key in self.pool.get(model)._columns: - fname = self.pool.get(model)._columns[key]._fields_id + if key in model_pool._columns: + fname = model_pool._columns[key]._fields_id else: - fname = self.pool.get(model)._inherit_fields[key][2]._fields_id + fname = model_pool._inherit_fields[key][2]._fields_id valitem[2][fname] = record_id newid,update = self._get_id(cr, uid, fields[key]['relation'], valitem[1]) if not newid: @@ -190,14 +196,18 @@ class base_module_record(osv.osv): def _create_yaml_record(self, cr, uid, model, data, record_id): record={'model': model, 'id': str(record_id)} - lids = self.pool.get('ir.model.data').search(cr, uid, [('model','=',model)]) - res = self.pool.get('ir.model.data').read(cr, uid, lids[:1], ['module']) + + model_pool = self.pool.get(model) + data_pool = self.pool.get('ir.model.data') + + lids = data_pool.search(cr, uid, [('model','=',model)]) + res = data_pool.read(cr, uid, lids[:1], ['module']) attrs={} if res: self.depends[res[0]['module']]=True - fields = self.pool.get(model).fields_get(cr, uid) + fields = model_pool.fields_get(cr, uid) defaults={} - defaults[model] = self.pool.get(model).default_get(cr, uid, data) + defaults[model] = model_pool.default_get(cr, uid, data) for key,val in data.items(): if ((key in defaults[model]) and (val == defaults[model][key])) and not(fields[key].get('required',False)): continue @@ -210,19 +220,19 @@ class base_module_record(osv.osv): elif fields[key]['type'] in ('integer','float'): attrs[key] = val elif fields[key]['type'] in ('many2one',): - if type(val) in (type(''),type(u'')): + if type(val) in (type(''), type(u'')): id = val else: - id,update = self._get_id(cr, uid, fields[key]['relation'], val) + id, update = self._get_id(cr, uid, fields[key]['relation'], val) attrs[key] = str(id) elif fields[key]['type'] in ('one2many',): items=[[]] for valitem in (val or []): if valitem[0] in (0,1): - if key in self.pool.get(model)._columns: - fname = self.pool.get(model)._columns[key]._fields_id + if key in model_pool._columns: + fname = model_pool._columns[key]._fields_id else: - fname = self.pool.get(model)._inherit_fields[key][2]._fields_id + fname = model_pool._inherit_fields[key][2]._fields_id valitem[2][fname] = record_id newid,update = self._get_id(cr, uid, fields[key]['relation'], valitem[1]) if not newid: diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po index efdfca4d389..99f529889a6 100644 --- a/addons/document/i18n/sv.po +++ b/addons/document/i18n/sv.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-24 14:45+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-03-15 14:11+0000\n" +"Last-Translator: Anders Wallenquist \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-03-11 05:03+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document @@ -203,7 +203,7 @@ msgstr "" #. module: document #: model:ir.ui.menu,name:document.menu_document msgid "Document Management" -msgstr "" +msgstr "Dokumenthantering" #. module: document #: selection:ir.attachment,store_method:0 diff --git a/addons/event_project/wizard/project_wizard.py b/addons/event_project/wizard/project_wizard.py index d39c86f4d49..fe70db08e7b 100644 --- a/addons/event_project/wizard/project_wizard.py +++ b/addons/event_project/wizard/project_wizard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -43,7 +43,7 @@ def _create_duplicate(self, cr, uid, data, context): event_obj=pooler.get_pool(cr.dbname).get('event.event') project_obj = pooler.get_pool(cr.dbname).get('project.project') duplicate_project_id= project_obj.copy(cr, uid,data['form']['project_id'], {'active': True}) - project_obj.write(cr, uid, [duplicate_project_id], {'name': "copy of " + project_obj.browse(cr, uid, duplicate_project_id, context).name , 'date_start':time.strftime('%Y-%m-%d'),'date_end': event_obj.browse(cr, uid, [data['id']])[0].date_begin[0:10] }) + project_obj.write(cr, uid, [duplicate_project_id], {'name': "copy of " + project_obj.browse(cr, uid, duplicate_project_id, context).name , 'date_start':time.strftime('%Y-%m-%d'),'date': event_obj.browse(cr, uid, [data['id']])[0].date_begin[0:10] }) event_obj.write(cr, uid, [data['id']], {'project_id': duplicate_project_id }) return {} diff --git a/addons/idea/i18n/sv.po b/addons/idea/i18n/sv.po index 100c38ed817..f5fb413e351 100644 --- a/addons/idea/i18n/sv.po +++ b/addons/idea/i18n/sv.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-17 09:48+0000\n" -"Last-Translator: Jay (Open ERP) \n" +"PO-Revision-Date: 2010-03-15 14:12+0000\n" +"Last-Translator: Anders Wallenquist \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-03-11 04:54+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: idea @@ -157,7 +157,7 @@ msgstr "" #. module: idea #: model:ir.ui.menu,name:idea.menu_reporting msgid "Reporting" -msgstr "" +msgstr "Rapportering" #. module: idea #: model:ir.model,name:idea.model_idea_vote_stat diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po index eb3fd0464cd..720ebc1e012 100644 --- a/addons/membership/i18n/sv.po +++ b/addons/membership/i18n/sv.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-16 11:17+0000\n" -"Last-Translator: Treecko \n" +"PO-Revision-Date: 2010-03-15 14:14+0000\n" +"Last-Translator: Anders Wallenquist \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-03-11 04:45+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: membership @@ -179,7 +179,7 @@ msgstr "" #. module: membership #: model:ir.ui.menu,name:membership.menu_reporting msgid "Reporting" -msgstr "" +msgstr "Rapportering" #. module: membership #: view:res.partner:0 @@ -249,7 +249,7 @@ msgstr "" #: field:report.partner_member.year_new,canceled_amount:0 #: field:report.partner_member.year_new,canceled_number:0 msgid "Canceled" -msgstr "" +msgstr "Avbruten" #. module: membership #: model:product.pricelist,name:membership.list1m @@ -317,7 +317,7 @@ msgstr "" #: field:report.partner_member.year_new,paid_amount:0 #: field:report.partner_member.year_new,paid_number:0 msgid "Paid" -msgstr "" +msgstr "Betalad" #. module: membership #: selection:membership.membership_line,state:0 @@ -510,7 +510,7 @@ msgstr "" #. module: membership #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Fel: felaktig EAN-kod" #. module: membership #: field:report.partner_member.year,year:0 diff --git a/addons/project_caldav/__terp__.py b/addons/project_caldav/__terp__.py index 0cd26f06334..1ac69933623 100644 --- a/addons/project_caldav/__terp__.py +++ b/addons/project_caldav/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,22 +15,22 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## { - "name" : "Caldav task management", - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Others", - "description": """ Synchronize between Project task and Caldav Vtodo.""", - "depends" : ["project", "caldav"], - "init_xml" : ["project_caldav_data.xml"], - "demo_xml" : [], - "update_xml" : ["project_caldav_view.xml", - "project_caldav_wizard.xml"], - "active": False, - "website": "http://www.openerp.com", - "installable": True, + "name" : "Caldav task management", + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Others", + "description": """ Synchronize between Project task and Caldav Vtodo.""", + "depends" : ["project", "caldav", "base_calendar"], + "init_xml" : ["project_caldav_data.xml"], + "demo_xml" : [], + "update_xml" : ["project_caldav_view.xml", + "project_caldav_wizard.xml"], + "active": False, + "website": "http://www.openerp.com", + "installable": True, } diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml index d4fc7115491..541cc3c396e 100644 --- a/addons/project_caldav/project_caldav_view.xml +++ b/addons/project_caldav/project_caldav_view.xml @@ -1,7 +1,7 @@ - + project.task.caldav.form project.task @@ -46,8 +46,8 @@ - - + + project.task.caldav.form1 project.task @@ -58,8 +58,8 @@ - - + + project.task.caldav.form2 project.task @@ -68,8 +68,10 @@ - +-->