diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 8f873065014..cce7d22d673 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -306,9 +306,9 @@ class account_invoice(osv.osv):
view_id = view_id[0]
res = super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
- type = context.get('journal_type', 'sale')
+ type = context.get('journal_type', False)
for field in res['fields']:
- if field == 'journal_id':
+ if field == 'journal_id' and type:
journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
res['fields'][field]['selection'] = journal_select
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index bca024793fd..0ac7a51405d 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -199,15 +199,15 @@
- 111
+ 12
Current Liabilities
-
+
view
- 1111
+ 120
Creditors
payable
@@ -216,7 +216,7 @@
- 1112
+ 121
Tax Received
other
@@ -224,7 +224,7 @@
- 1113
+ 122
Reserve and Profit/Loss Account
other
@@ -233,7 +233,7 @@
- 1114
+ 123
Opening Expense Account
other
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 448a89899b9..64893f3533f 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-11-01 21:03+0000\n"
+"PO-Revision-Date: 2011-11-08 11:58+0000\n"
"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2439,7 +2439,7 @@ msgstr "Bankafstemning"
#. module: account
#: report:account.invoice:0
msgid "Disc.(%)"
-msgstr ""
+msgstr "Rabatprocent"
#. module: account
#: report:account.general.ledger:0
@@ -2744,6 +2744,8 @@ msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
+"Vælg: Hvis afgiftsbeløbet, skal indgå i beregningsgrundlaget for beregning "
+"af de følgende afgifter"
#. module: account
#: help:account.journal,user_id:0
@@ -4789,7 +4791,7 @@ msgstr ""
#. module: account
#: report:account.partner.balance:0
msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "(Konto / Kontakt) Navn"
#. module: account
#: view:account.bank.statement:0
@@ -7125,7 +7127,7 @@ msgstr ""
#. module: account
#: field:account.tax.code,sum_period:0
msgid "Period Sum"
-msgstr ""
+msgstr "Periode sum"
#. module: account
#: help:account.tax,sequence:0
@@ -7257,7 +7259,7 @@ msgstr ""
#: field:account.subscription,state:0
#: field:report.invoice.created,state:0
msgid "State"
-msgstr "Stat"
+msgstr "Tilstand"
#. module: account
#: help:account.open.closed.fiscalyear,fyear_id:0
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index ec9ded68a12..b185c8ab10a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -44,8 +44,8 @@
-
-
+
+
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 7b9bdfa03b3..0c4e633ec15 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -296,7 +296,7 @@
| [[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ '..'*(a['level']-1) ]][[ a['name'] ]] |
[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] |
[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]] |
- [[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance'], currency_obj=company.currency_id) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance'], currency = company.currency_id) ]] |
+ [[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance'], currency_obj=company.currency_id) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance'], currency_obj=company.currency_id) ]] |
diff --git a/addons/account_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po
index 43a16e89f86..5b199bb2909 100644
--- a/addons/account_accountant/i18n/da.po
+++ b/addons/account_accountant/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-17 08:53+0000\n"
-"Last-Translator: Martin Pihl \n"
+"PO-Revision-Date: 2011-11-08 10:35+0000\n"
+"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: account_accountant
#: model:ir.module.module,description:account_accountant.module_meta_information
@@ -27,8 +27,8 @@ msgid ""
" "
msgstr ""
"\n"
-"Dette modul giver administrator brugeren adgang til alle de regnskabsmæssige "
-"funktioner som bogføringsjournaler og kontoplaner.\n"
+"Dette modul giver brugeren admin adgang til alle regnskabsfunktioner som "
+"bogføringsjournaler og kontoplaner.\n"
" "
#. module: account_accountant
diff --git a/addons/account_analytic_analysis/i18n/da.po b/addons/account_analytic_analysis/i18n/da.po
index 545c570647c..95f24a21b1f 100644
--- a/addons/account_analytic_analysis/i18n/da.po
+++ b/addons/account_analytic_analysis/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-22 07:38+0000\n"
-"Last-Translator: Martin Pihl \n"
+"PO-Revision-Date: 2011-11-08 21:41+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_invoiced:0
@@ -134,7 +134,7 @@ msgstr "Bruger"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_to_invoice:0
msgid "Uninvoiced Amount"
-msgstr ""
+msgstr "Ufaktureret beløb"
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin:0
diff --git a/addons/account_analytic_default/i18n/da.po b/addons/account_analytic_default/i18n/da.po
index 2cb76cfc57e..7e1a64488e0 100644
--- a/addons/account_analytic_default/i18n/da.po
+++ b/addons/account_analytic_default/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-29 12:18+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:24+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: account_analytic_default
#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -65,7 +65,7 @@ msgstr "Plukseddel"
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Conditions"
-msgstr ""
+msgstr "Betingelser"
#. module: account_analytic_default
#: help:account.analytic.default,company_id:0
diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv
index 112fe2fcbf4..f92a9fd4dfa 100644
--- a/addons/account_analytic_default/security/ir.model.access.csv
+++ b/addons/account_analytic_default/security/ir.model.access.csv
@@ -2,3 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
access_account_analytic_default_manager,account.analytic.default.manager,model_account_analytic_default,account.group_account_manager,1,1,1,1
access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1
+access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1
diff --git a/addons/account_anglo_saxon/i18n/da.po b/addons/account_anglo_saxon/i18n/da.po
new file mode 100644
index 00000000000..bf144945725
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/da.po
@@ -0,0 +1,107 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-09 21:36+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordre reference skal være unik !"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Fejl ! Du kan ikke oprette rekusive katagorier."
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinie"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Indkøbsordre"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Produkt katagori"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Plukliste"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+" changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+" and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+" Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+" This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+" when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+" Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 2f8c8b5d27b..9ea8c819984 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -204,12 +204,13 @@
+
-
+
diff --git a/addons/account_budget/i18n/da.po b/addons/account_budget/i18n/da.po
index 4657e9c8f94..90ba071a726 100644
--- a/addons/account_budget/i18n/da.po
+++ b/addons/account_budget/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-09-23 06:03+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:25+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: account_budget
#: field:crossovered.budget,creating_user_id:0
@@ -25,7 +25,7 @@ msgstr ""
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "Bekræftet"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -47,7 +47,7 @@ msgstr ""
#. module: account_budget
#: view:crossovered.budget:0
msgid "Confirm"
-msgstr ""
+msgstr "Godkend"
#. module: account_budget
#: field:crossovered.budget,validating_user_id:0
diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po
index 12dea22e2d0..8fa64b04a48 100644
--- a/addons/account_cancel/i18n/da.po
+++ b/addons/account_cancel/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-20 07:57+0000\n"
-"Last-Translator: Martin Pihl \n"
+"PO-Revision-Date: 2011-11-08 10:42+0000\n"
+"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: account_cancel
#: model:ir.module.module,description:account_cancel.module_meta_information
@@ -25,8 +25,13 @@ msgid ""
"journal. If set to true it allows user to cancel entries & invoices.\n"
" "
msgstr ""
+"\n"
+" Modulet tilføjer feltet \"Tillad annullering af poster\" til formular "
+"visning af bogføringsjournalen. Hvis feltet er afkrydset tillader det "
+"brugeren at annullere poster og fakturaer.\n"
+" "
#. module: account_cancel
#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
msgid "Account Cancel"
-msgstr ""
+msgstr "Annuller post"
diff --git a/addons/account_chart/i18n/da.po b/addons/account_chart/i18n/da.po
index 033ca634ec8..21f9528cfe6 100644
--- a/addons/account_chart/i18n/da.po
+++ b/addons/account_chart/i18n/da.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-20 07:54+0000\n"
-"Last-Translator: Martin Pihl \n"
+"PO-Revision-Date: 2011-11-08 22:06+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: account_chart
#: model:ir.module.module,description:account_chart.module_meta_information
msgid "Remove minimal account chart"
-msgstr "Fjern minimal kontoplan"
+msgstr "Fjern kontoplan"
#. module: account_chart
#: model:ir.module.module,shortdesc:account_chart.module_meta_information
diff --git a/addons/account_invoice_layout/i18n/da.po b/addons/account_invoice_layout/i18n/da.po
index cda7b3b0d94..a7321fbf92c 100644
--- a/addons/account_invoice_layout/i18n/da.po
+++ b/addons/account_invoice_layout/i18n/da.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-09-12 17:17+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:26+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Sub Total"
-msgstr ""
+msgstr "Sub total"
#. module: account_invoice_layout
#: report:account.invoice.layout:0
diff --git a/addons/account_sequence/i18n/da.po b/addons/account_sequence/i18n/da.po
new file mode 100644
index 00000000000..d7604035633
--- /dev/null
+++ b/addons/account_sequence/i18n/da.po
@@ -0,0 +1,221 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-09 21:40+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Næste nummer"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+" This module maintains internal sequence number for accounting entries.\n"
+" "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurationsfremgang"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Forkert kredit eller debet værdi i posteringerne!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Konfigurer"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Suffiks"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Billede"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/da.po b/addons/analytic_journal_billing_rate/i18n/da.po
new file mode 100644
index 00000000000..3ad40b63e32
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/da.po
@@ -0,0 +1,95 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-11-09 21:41+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"\n"
+"\n"
+" This module allows you to define what is the default invoicing rate for "
+"a specific journal on a given account. This is mostly used when a user "
+"encodes his timesheet: the values are retrieved and the fields are auto-"
+"filled... but the possibility to change these values is still available.\n"
+"\n"
+" Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the account data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
diff --git a/addons/auction/i18n/da.po b/addons/auction/i18n/da.po
index 21f42c50265..8ff7a76f6fc 100644
--- a/addons/auction/i18n/da.po
+++ b/addons/auction/i18n/da.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-09-23 14:47+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:27+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: auction
#: model:ir.ui.menu,name:auction.auction_report_menu
msgid "Reporting"
-msgstr ""
+msgstr "Rapportering"
#. module: auction
#: model:ir.model,name:auction.model_auction_taken
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po
index 9424977f407..06244915efc 100644
--- a/addons/base_action_rule/i18n/da.po
+++ b/addons/base_action_rule/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-09-26 15:35+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:29+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -46,7 +46,7 @@ msgstr ""
#. module: base_action_rule
#: field:base.action.rule,model_id:0
msgid "Object"
-msgstr ""
+msgstr "Objekt"
#. module: base_action_rule
#: field:base.action.rule,act_mail_to_email:0
@@ -66,7 +66,7 @@ msgstr "E-mail fra"
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Email Body"
-msgstr ""
+msgstr "Email indhold"
#. module: base_action_rule
#: selection:base.action.rule,trg_date_range_type:0
diff --git a/addons/base_contact/i18n/da.po b/addons/base_contact/i18n/da.po
index fb1ca893595..da5f890c185 100644
--- a/addons/base_contact/i18n/da.po
+++ b/addons/base_contact/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-29 12:07+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:31+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: base_contact
#: field:res.partner.contact,title:0
@@ -25,7 +25,7 @@ msgstr "Titel"
#. module: base_contact
#: view:res.partner.address:0
msgid "# of Contacts"
-msgstr ""
+msgstr "# kontakter"
#. module: base_contact
#: field:res.partner.job,fax:0
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index ff3ff65cf8c..e6c165e4cf3 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-11-02 16:15+0000\n"
+"PO-Revision-Date: 2011-11-08 10:30+0000\n"
"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: base_setup
#: field:base.setup.company,city:0
@@ -35,7 +35,7 @@ msgstr "Fakturering"
#. module: base_setup
#: field:base.setup.installer,hr:0
msgid "Human Resources"
-msgstr "Human Resources"
+msgstr "Personale (HR)"
#. module: base_setup
#: field:base.setup.company,email:0
@@ -45,7 +45,7 @@ msgstr "E-mail"
#. module: base_setup
#: field:base.setup.company,account_no:0
msgid "Bank Account No"
-msgstr "Bank konto nr."
+msgstr "Bankkonto nr."
#. module: base_setup
#: field:base.setup.installer,profile_tools:0
@@ -55,7 +55,7 @@ msgstr "Ekstra værktøjer"
#. module: base_setup
#: field:base.setup.company,rml_footer1:0
msgid "Report Footer 1"
-msgstr "Rapport fod 1"
+msgstr "Rapport sidefod 1"
#. module: base_setup
#: help:base.setup.installer,mrp:0
@@ -63,6 +63,7 @@ msgid ""
"Helps you manage your manufacturing processes and generate reports on those "
"processes."
msgstr ""
+"Hjælper med at styre produktionsprocesser og lave rapporter over disse."
#. module: base_setup
#: help:base.setup.installer,marketing:0
@@ -72,17 +73,17 @@ msgstr "Hjælper dig med din maketingskampagne skridt for skridt"
#. module: base_setup
#: view:base.setup.config:0
msgid "Your database is now created."
-msgstr "Din database er ny oprettet"
+msgstr "Din database er nu oprettet"
#. module: base_setup
#: field:base.setup.installer,point_of_sale:0
msgid "Point of Sale"
-msgstr ""
+msgstr "Salgssted"
#. module: base_setup
#: field:base.setup.installer,association:0
msgid "Associations"
-msgstr "Foreninger"
+msgstr "Organisationer"
#. module: base_setup
#: help:base.setup.installer,account_accountant:0
@@ -90,23 +91,25 @@ msgid ""
"Helps you handle your accounting needs, if you are not an accountant, we "
"suggest you to install only the Invoicing "
msgstr ""
+"Hjælper dig med at håndtere dine regnskabsmæssige behov. Hvis du ikke er "
+"revisor, foreslår vi dig kun at installere faktureringsmodulet "
#. module: base_setup
#: code:addons/base_setup/__init__.py:50
#, python-format
msgid "The following users have been installed : \n"
-msgstr "Følgende brugere er installeret \n"
+msgstr "Følgende brugere er installeret: \n"
#. module: base_setup
#: field:base.setup.company,progress:0
#: field:base.setup.installer,progress:0
msgid "Configuration Progress"
-msgstr "Konfigurations fremskridt"
+msgstr "Konfigurationsfremgang"
#. module: base_setup
#: field:base.setup.company,rml_footer2:0
msgid "Report Footer 2"
-msgstr "Rapport sidefod"
+msgstr "Rapport sidefod 2"
#. module: base_setup
#: field:base.setup.company,currency:0
@@ -117,7 +120,7 @@ msgstr "Valuta"
#. module: base_setup
#: field:base.setup.company,state_id:0
msgid "Fed. State"
-msgstr ""
+msgstr "Delstat"
#. module: base_setup
#: field:base.setup.installer,marketing:0
@@ -127,12 +130,12 @@ msgstr "Markedsføring"
#. module: base_setup
#: field:base.setup.company,company_id:0
msgid "Company"
-msgstr "Virksomhed"
+msgstr "Firma"
#. module: base_setup
#: field:base.setup.installer,sale:0
msgid "Sales Management"
-msgstr "Salgsledelse"
+msgstr "Salgsstyring"
#. module: base_setup
#: help:base.setup.installer,profile_tools:0
@@ -140,8 +143,8 @@ msgid ""
"Lets you install various interesting but non-essential tools like Survey, "
"Lunch and Ideas box."
msgstr ""
-"Lader dig installere forskellige interessante, men ikke-væsentlige værktøjer "
-"som f.eks. idé boks."
+"Du kan installere forskellige interessante, men ikke afgørende værktøjer som "
+"meningsmåling, frokost og idéer."
#. module: base_setup
#: view:base.setup.config:0
@@ -150,7 +153,7 @@ msgid ""
"an administrator."
msgstr ""
"Du kan starte med at konfigurere systemet eller tilslutte dig direkte til "
-"databasen som en administrator."
+"databasen som administrator."
#. module: base_setup
#: field:base.setup.installer,report_designer:0
@@ -160,12 +163,12 @@ msgstr "Avanceret rapportering"
#. module: base_setup
#: field:base.setup.company,phone:0
msgid "Phone"
-msgstr "Tlf. nr."
+msgstr "Telefon"
#. module: base_setup
#: view:base.setup.company:0
msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
#. module: base_setup
#: view:base.setup.company:0
@@ -173,8 +176,8 @@ msgid ""
"Your company information will be used to personalize documents issued with "
"OpenERP such as invoices, sales orders and much more."
msgstr ""
-"Dine virksomheds oplysninger vil blive brugt til at personliggøre dokumenter "
-"udstedt med OpenERP såsom fakturaer, salgsordrer og meget mere."
+"Dine virksomhedsoplysninger vil blive brugt til at individualisere "
+"dokumenter fra OpenERP som fakturaer, salgsordrer m.m."
#. module: base_setup
#: view:base.setup.installer:0
@@ -184,7 +187,7 @@ msgstr "titel"
#. module: base_setup
#: field:base.setup.installer,knowledge:0
msgid "Knowledge Management"
-msgstr "Knowledge Management"
+msgstr "Videnstyring"
#. module: base_setup
#: model:ir.module.module,description:base_setup.module_meta_information
@@ -205,18 +208,17 @@ msgid ""
" "
msgstr ""
"\n"
-" Dette modul implementerer en konfiguration, der hjælper brugeren\n"
-" til at konfigurere en ny database på systemet.\n"
+" Dette modul implementerer et konfigurationssystem, der hjælper brugeren\n"
+" med at konfigurere systemet ved installation af en ny database.\n"
"\n"
-" Det giver dig mulighed for at vælge mellem en liste af profiler for at "
-"installere:\n"
+" Det giver dig mulighed for at installere forskellige profiler:\n"
" * Minimal profil\n"
" * Kun regnskab\n"
" * Servicevirksomhed\n"
" * Produktionsvirksomhed\n"
"\n"
-" Det stiller også spørgsmål som hjælper med at oprette sidehoved,\n"
-" sidefod, kontokort og sprog\n"
+" Modulet hjælper dig også med at oprette dit firma, sidehoved,\n"
+" sidefod, kontoplan og sprog.\n"
" "
#. module: base_setup
@@ -225,8 +227,8 @@ msgid ""
"Installs a preselected set of OpenERP applications which will help you "
"manage your industry."
msgstr ""
-"Installerer en forudvalgt sæt OpenERP applikationer, der vil hjælpe dig med "
-"at administrere din branche."
+"Installerer en sæt OpenERP moduler, der vil hjælpe dig med at administrere "
+"din branche."
#. module: base_setup
#: help:base.setup.installer,project:0
@@ -234,8 +236,8 @@ msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
-"Hjælper dig med at administrere dine projekter og opgaver ved at spore dem, "
-"generere planlægning, osv. .."
+"Hjælper dig med at styre dine projekter og opgaver ved at spore dem, lave "
+"planlægning, osv. .."
#. module: base_setup
#: field:base.setup.company,name:0
@@ -245,7 +247,7 @@ msgstr "Firmanavn"
#. module: base_setup
#: view:base.setup.config:0
msgid "Skip Configuration Wizards"
-msgstr "Spring over konfigurations wizard"
+msgstr "Spring konfigurationsguide over"
#. module: base_setup
#: help:base.setup.installer,hr:0
@@ -253,6 +255,8 @@ msgid ""
"Helps you manage your human resources by encoding your employees structure, "
"generating work sheets, tracking attendance and more."
msgstr ""
+"Hjælper dig med at styre dit personale ved at indkode dine medarbejderes "
+"struktur, opret arbejdsplaner, checke fremmøde og m.m."
#. module: base_setup
#: help:base.setup.installer,account_voucher:0
@@ -260,6 +264,8 @@ msgid ""
"Allows you to create your invoices and track the payments. It is an easier "
"version of the accounting module for managers who are not accountants."
msgstr ""
+"Lader dig oprette fakturaer og spore betalinger. Det er en lettere udgave af "
+"regnskabsmodulet for ledere, der ikke er regnskabskyndige.."
#. module: base_setup
#: model:ir.model,name:base_setup.model_base_setup_company
@@ -272,7 +278,7 @@ msgid ""
"Helps you manage your purchase-related processes such as requests for "
"quotations, supplier invoices, etc..."
msgstr ""
-"Hjælper dig med at styre dit køb-relaterede processer såsom anmodninger om "
+"Hjælper dig med at styre dine indkøbsrelaterede processer som anmodninger om "
"tilbud, leverandørfakturaer, osv. .."
#. module: base_setup
@@ -282,6 +288,9 @@ msgid ""
"We suggest you to put bank information here:\n"
"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
msgstr ""
+"Denne sætning vises nederst i dine rapporter.\n"
+"Vi forslår at vise bankoplysninger her:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - Moms: BE0477.472.701"
#. module: base_setup
#: field:base.setup.company,street2:0
@@ -301,12 +310,12 @@ msgstr "Land"
#. module: base_setup
#: model:ir.actions.act_window,name:base_setup.action_base_setup
msgid "Setup"
-msgstr "Setup"
+msgstr "Opsætning"
#. module: base_setup
#: field:base.setup.installer,account_accountant:0
msgid "Accounting & Finance"
-msgstr "Regnskab & Finans"
+msgstr "Regnskab & finans"
#. module: base_setup
#: field:base.setup.installer,auction:0
@@ -321,7 +330,7 @@ msgstr "Postnr"
#. module: base_setup
#: view:base.setup.config:0
msgid "Start Configuration"
-msgstr "Start konfiguration"
+msgstr "Startkonfiguration"
#. module: base_setup
#: help:base.setup.installer,knowledge:0
@@ -329,8 +338,8 @@ msgid ""
"Lets you install addons geared towards sharing knowledge with and between "
"your employees."
msgstr ""
-"Lader dig installere addons rettet mod at dele viden med og mellem dine "
-"medarbejdere."
+"Lader dig installere tillægsmodul beregnet til at dele viden med og mellem "
+"dine medarbejdere."
#. module: base_setup
#: view:base.setup.installer:0
@@ -338,15 +347,14 @@ msgid ""
"Select the Applications you want your system to cover. If you are not sure "
"about your exact needs at this stage, you can easily install them later."
msgstr ""
-"Vælg de programmer, du ønsker dit system skal indeholde. Hvis du ikke er "
-"sikker på netop dine behov på nuvræendetidspunkt, kan du nemt installere dem "
-"senere."
+"Vælg de moduler, som dit system skal indeholde. Hvis du ikke er sikker dine "
+"præcise behov på nuværende tidspunkt, kan du nemt installere dem senere."
#. module: base_setup
#: view:base.setup.company:0
#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
msgid "Company Configuration"
-msgstr "Firma opsætning"
+msgstr "Firmaopsætning"
#. module: base_setup
#: field:base.setup.company,logo:0
@@ -360,31 +368,33 @@ msgid ""
"simplified payment mode encoding, automatic picking lists generation and "
"more."
msgstr ""
+"Hjælper dig med at få det bedste ud af dit detailhandelssystem med hurtigt "
+"salg, enkel betaling, automatisk plukliste m.m."
#. module: base_setup
#: field:base.setup.installer,purchase:0
msgid "Purchase Management"
-msgstr "Indkøbs administration"
+msgstr "Indkøbsstyring"
#. module: base_setup
#: help:base.setup.installer,sale:0
msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
+msgstr "Hjælper dig med dina tilbud, salgsordre och fakturer."
#. module: base_setup
#: field:base.setup.installer,stock:0
msgid "Warehouse Management"
-msgstr "Lager administration"
+msgstr "Lagerstyrning"
#. module: base_setup
#: field:base.setup.installer,project:0
msgid "Project Management"
-msgstr "Projekt administration"
+msgstr "Projektstyring"
#. module: base_setup
#: field:base.setup.config,installed_users:0
msgid "Installed Users"
-msgstr ""
+msgstr "Installerede brugere"
#. module: base_setup
#: view:base.setup.config:0
@@ -394,7 +404,7 @@ msgstr "Ny database"
#. module: base_setup
#: field:base.setup.installer,crm:0
msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Kundestyring (CRM)"
#. module: base_setup
#: help:base.setup.installer,auction:0
@@ -402,6 +412,8 @@ msgid ""
"Installs a preselected set of OpenERP applications selected to help you "
"manage your auctions as well as the business processes around them."
msgstr ""
+"Installerer et sæt OpenERP moduler, som hjælper med at styre auktioner og "
+"tilhørende forretningsprocesserne."
#. module: base_setup
#: help:base.setup.company,rml_header1:0
@@ -410,6 +422,9 @@ msgid ""
"We suggest you to put a slogan here:\n"
"\"Open Source Business Solutions\"."
msgstr ""
+"Denne sætning vises i øverste højre hjørne af dine rapporter.\n"
+"Vi foreslår at indsætte et slogan her:\n"
+"\"Open Source fimaløsninger\"."
#. module: base_setup
#: help:base.setup.installer,report_designer:0
@@ -417,28 +432,30 @@ msgid ""
"Lets you install various tools to simplify and enhance OpenERP's report "
"creation."
msgstr ""
+"Lader dig installere diverse værktøjer til forenkle og forbedre udvikling af "
+"rapporter i OpenERP."
#. module: base_setup
#: field:base.setup.company,rml_header1:0
msgid "Report Header"
-msgstr ""
+msgstr "Rapporthoved"
#. module: base_setup
#: view:base.setup.config:0
msgid "Information about your new database"
-msgstr ""
+msgstr "Information om din nye database"
#. module: base_setup
#: field:base.setup.company,config_logo:0
#: field:base.setup.config,config_logo:0
#: field:base.setup.installer,config_logo:0
msgid "Image"
-msgstr ""
+msgstr "Billede"
#. module: base_setup
#: field:base.setup.installer,product_expiry:0
msgid "Food Industry"
-msgstr ""
+msgstr "Fødevareindustri"
#. module: base_setup
#: field:base.setup.installer,mrp:0
@@ -448,7 +465,7 @@ msgstr "Produktion"
#. module: base_setup
#: view:base.setup.company:0
msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Dit Logo - Brug en størrelse på ca. 450x150 pixels."
#. module: base_setup
#: help:base.setup.company,rml_footer1:0
@@ -457,16 +474,19 @@ msgid ""
"We suggest you to write legal sentences here:\n"
"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
msgstr ""
+"Denne sætning vises nederst i dine rapporter.\n"
+"Vi forslår at vise kontaktoplysninger her:\n"
+"Web: http://openerp.com - Fax: +32 81 733 501 - Fortis Bank: 126-2013269-07"
#. module: base_setup
#: field:base.setup.company,website:0
msgid "Company Website"
-msgstr "Virksomhedens hjemmeside"
+msgstr "Firmaets hjemmeside"
#. module: base_setup
#: view:base.setup.installer:0
msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Installerer specifikke branchemoduler"
#. module: base_setup
#: field:base.setup.company,street:0
@@ -476,18 +496,18 @@ msgstr "Gade"
#. module: base_setup
#: view:base.setup.company:0
msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Opsætter dit firmaoplysninger"
#. module: base_setup
#: help:base.setup.company,website:0
msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Eksempel: http://openerp.com"
#. module: base_setup
#: view:base.setup.installer:0
#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
msgid "Install Applications"
-msgstr ""
+msgstr "Installer moduler"
#. module: base_setup
#: help:base.setup.installer,crm:0
@@ -496,18 +516,21 @@ msgid ""
"or issues. Can automatically send reminders, escalate requests or trigger "
"business-specific actions based on standard events."
msgstr ""
+"Hjælper med at spore og styre kunderelationer, som potentielle kunder, "
+"forespørgsler eller emner. Kan automatisk sende rykkere, fremme tilbud eller "
+"udløse forretningsspecifikke handlinger baseret på standard begivenheder."
#. module: base_setup
#: help:base.setup.installer,stock:0
msgid ""
"Helps you manage your inventory and main stock operations: delivery orders, "
"receptions, etc."
-msgstr ""
+msgstr "Hjælper med lageroperationer: Levering, modtagelse osv."
#. module: base_setup
#: model:ir.module.module,shortdesc:base_setup.module_meta_information
msgid "Base Setup"
-msgstr ""
+msgstr "Basal opsætning"
#. module: base_setup
#: help:base.setup.installer,association:0
@@ -515,11 +538,13 @@ msgid ""
"Installs a preselected set of OpenERP applications which will help you "
"manage your association more efficiently."
msgstr ""
+"Installerer OpwnERP moduler, som hjælper med styring af forbindelser mere "
+"effektivt."
#. module: base_setup
#: model:ir.model,name:base_setup.model_base_setup_config
msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
#~ msgid "Point of Sales"
#~ msgstr "Point of sales"
diff --git a/addons/base_tools/i18n/da.po b/addons/base_tools/i18n/da.po
index c4865608d95..017d4b51952 100644
--- a/addons/base_tools/i18n/da.po
+++ b/addons/base_tools/i18n/da.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-09-23 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 10:44+0000\n"
+"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: base_tools
#: model:ir.module.module,shortdesc:base_tools.module_meta_information
msgid "Common base for tools modules"
-msgstr ""
+msgstr "Fælles grundlag for værktøjsmoduler"
#. module: base_tools
#: model:ir.module.module,description:base_tools.module_meta_information
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index 9a22ae44fcc..4941d1a3065 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-11-17 08:50+0000\n"
-"Last-Translator: SmartWi \n"
+"PO-Revision-Date: 2011-11-08 10:58+0000\n"
+"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: base_vat
#: code:addons/base_vat/base_vat.py:87
@@ -24,6 +24,8 @@ msgid ""
"The Vat does not seems to be correct. You should have entered something like "
"this %s"
msgstr ""
+"Momsen ser ikke ud til at være korrekt. Der skulle være indtastet noget "
+"svarende til dette %s"
#. module: base_vat
#: model:ir.module.module,description:base_vat.module_meta_information
@@ -38,22 +40,31 @@ msgid ""
"countries.\n"
" "
msgstr ""
+"\n"
+" Aktiverer CVR-nr. (momsnr.) for kontakten. Checker gyldigheden af CVR-"
+"nr. (momsnr.)\n"
+"\n"
+" Dette modul bruger metoder beskrevet på http://sima-pc.com/nif.php for "
+"at\n"
+" checke gyldigheden af CVR-nr. (momsnr.) tilknyttet kontakter i EU-"
+"landene.\n"
+" "
#. module: base_vat
#: model:ir.module.module,shortdesc:base_vat.module_meta_information
msgid "Base VAT - To check VAT number validity"
-msgstr ""
+msgstr "Moms grundlag - Til at checke CVR-nr. (momsnr.) gyldighed"
#. module: base_vat
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fejl! Man kan ikke oprette rekursuve associerede medlemmer."
#. module: base_vat
#: code:addons/base_vat/base_vat.py:88
#, python-format
msgid "The VAT is invalid, It should begin with the country code"
-msgstr ""
+msgstr "CVR-nr. (momsnr.) er ugyldigt. Det skal starte med landekode."
#. module: base_vat
#: help:res.partner,vat_subjected:0
@@ -61,16 +72,18 @@ msgid ""
"Check this box if the partner is subjected to the VAT. It will be used for "
"the VAT legal statement."
msgstr ""
+"Afkryds dette felt, hvis kontakten er momsregistreret. Det bruges til "
+"momsbestemmelser."
#. module: base_vat
#: model:ir.model,name:base_vat.model_res_partner
msgid "Partner"
-msgstr ""
+msgstr "Kontakt"
#. module: base_vat
#: field:res.partner,vat_subjected:0
msgid "VAT Legal Statement"
-msgstr "Moms bestemmelser"
+msgstr "Momsbestemmelser"
#~ msgid "VAT"
#~ msgstr "Moms"
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index a6f5f1630f7..54dfc335a2b 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -55,7 +55,6 @@ Creates a dashboard for CRM that includes:
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': [
- 'base',
'base_action_rule',
'base_setup',
'process',
@@ -108,8 +107,8 @@ Creates a dashboard for CRM that includes:
'crm_installer_view.xml',
'res_partner_view.xml',
- 'board_crm_view.xml',
'board_crm_statistical_view.xml',
+ 'board_crm_view.xml',
],
'demo_xml': [
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 37c2c1781d6..3eacb9e7755 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -117,32 +117,32 @@
@@ -155,5 +155,7 @@
menu
+
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 08a4589cb8f..b37f1db6d55 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -345,7 +345,7 @@
-
+
diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po
index aae44c7b084..f7b7feadb2a 100644
--- a/addons/crm/i18n/da.po
+++ b/addons/crm/i18n/da.po
@@ -8,15 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME
\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-10-26 14:18+0000\n"
-"Last-Translator: Nicholas Christian Langkjær Ipsen "
-"\n"
+"PO-Revision-Date: 2011-11-08 21:47+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: crm
#: view:crm.lead.report:0
@@ -43,7 +42,7 @@ msgstr "Månedligt"
#. module: crm
#: view:crm.opportunity2phonecall:0
msgid "Schedule a PhoneCall"
-msgstr ""
+msgstr "Planlæg et telefon kald"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_stage
diff --git a/addons/crm_caldav/i18n/da.po b/addons/crm_caldav/i18n/da.po
index d79cc099c5c..2d68bcce53e 100644
--- a/addons/crm_caldav/i18n/da.po
+++ b/addons/crm_caldav/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-11-22 07:37+0000\n"
-"Last-Translator: Martin Pihl \n"
+"PO-Revision-Date: 2011-11-08 21:45+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: crm_caldav
#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -43,4 +43,4 @@ msgstr ""
#. module: crm_caldav
#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
msgid "Synchronyze this calendar"
-msgstr ""
+msgstr "Synkronisere denne kalender"
diff --git a/addons/decimal_precision/i18n/da.po b/addons/decimal_precision/i18n/da.po
new file mode 100644
index 00000000000..28871b4c50d
--- /dev/null
+++ b/addons/decimal_precision/i18n/da.po
@@ -0,0 +1,69 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-08 11:35+0000\n"
+"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Cifre"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Betydende decimaler"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "Definition af betydende decimaler"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Dette modul giver dig mulighed indstille prisnøjagtigheden til forskellig "
+"brug:\n"
+"Bogføring, salg, indkøb osv.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Anvendelse"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "Kun een værdi kan defineres for hver anvendelse!"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Opsætning af betydende decimaler"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po
index 7e4992e9a97..5c121017845 100644
--- a/addons/delivery/i18n/da.po
+++ b/addons/delivery/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-09-18 16:52+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:36+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: delivery
#: report:sale.shipping:0
@@ -25,7 +25,7 @@ msgstr ""
#. module: delivery
#: model:product.template,name:delivery.delivery_product_product_template
msgid "Delivery by Poste"
-msgstr ""
+msgstr "Levering med post"
#. module: delivery
#: view:delivery.grid:0
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
index db4315d50b2..c45213396d2 100644
--- a/addons/document_webdav/i18n/da.po
+++ b/addons/document_webdav/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-10-13 07:44+0000\n"
-"Last-Translator: Martin Pihl \n"
+"PO-Revision-Date: 2011-11-08 21:52+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: document_webdav
#: field:document.webdav.dir.property,create_date:0
@@ -56,7 +56,7 @@ msgstr ""
#: view:document.webdav.dir.property:0
#: view:document.webdav.file.property:0
msgid "Group By..."
-msgstr ""
+msgstr "Gruppér efter..."
#. module: document_webdav
#: view:document.directory:0
diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po
index 12421bacfd9..9db53ff2a77 100644
--- a/addons/event/i18n/da.po
+++ b/addons/event/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-09-23 14:35+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-09 21:21+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: event
#: view:event.event:0
@@ -42,7 +42,7 @@ msgstr "Hovedtaler"
#: view:event.registration:0
#: view:report.event.registration:0
msgid "Group By..."
-msgstr ""
+msgstr "Gruppér efter..."
#. module: event
#: field:event.event,register_min:0
@@ -57,7 +57,7 @@ msgstr ""
#. module: event
#: field:event.registration.badge,title:0
msgid "Title"
-msgstr ""
+msgstr "Titel"
#. module: event
#: field:event.event,mail_registr:0
@@ -83,7 +83,7 @@ msgstr ""
#. module: event
#: view:partner.event.registration:0
msgid "_Close"
-msgstr ""
+msgstr "_Luk"
#. module: event
#: model:event.event,name:event.event_0
diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po
index c55729d97fd..391cd357fa5 100644
--- a/addons/google_map/i18n/da.po
+++ b/addons/google_map/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-11-20 07:53+0000\n"
-"Last-Translator: Martin Pihl \n"
+"PO-Revision-Date: 2011-11-08 21:48+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: google_map
#: view:res.partner:0
@@ -48,7 +48,7 @@ msgstr ""
#. module: google_map
#: model:ir.module.module,shortdesc:google_map.module_meta_information
msgid "Google Map"
-msgstr "Google Kort"
+msgstr "Google kort"
#. module: google_map
#: model:ir.model,name:google_map.model_res_partner_address
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c20c1bbacb0..a43378b1c95 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -200,6 +200,7 @@
+
@@ -453,9 +454,9 @@
-
+
-
+
hr.employee.leave.tree
hr.employee
@@ -466,7 +467,7 @@
-
+
Allocate Leaves for Employees
@@ -484,7 +485,7 @@
-
+
hr.employee.leave.form.inherit
hr.employee
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 8215abf12f9..7ed381636cf 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -3,7 +3,7 @@
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 6b863121369..8be38c9024c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -334,7 +334,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index c1c936ccc0f..089ade7c618 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -313,7 +313,7 @@ class hr_timesheet_sheet(osv.osv):
def _default_employee(self, cr, uid, context=None):
emp_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
return emp_ids and emp_ids[0] or False
-
+
_defaults = {
'date_from' : _default_date_from,
'date_current' : lambda *a: time.strftime('%Y-%m-%d'),
@@ -329,7 +329,7 @@ class hr_timesheet_sheet(osv.osv):
if new_user_id:
cr.execute('SELECT id \
FROM hr_timesheet_sheet_sheet \
- WHERE (date_from < %s and %s < date_to) \
+ WHERE (date_from <= %s and %s <= date_to) \
AND user_id=%s \
AND id <> %s',(sheet.date_to, sheet.date_from, new_user_id, sheet.id))
if cr.fetchall():
diff --git a/addons/html_view/i18n/da.po b/addons/html_view/i18n/da.po
index e340fd0f736..2c33fe8b010 100644
--- a/addons/html_view/i18n/da.po
+++ b/addons/html_view/i18n/da.po
@@ -8,24 +8,24 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME
\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-09-24 09:55+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:09+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: html_view
#: field:html.view,name:0
msgid "Name"
-msgstr ""
+msgstr "Navn"
#. module: html_view
#: field:html.view,comp_id:0
msgid "Company"
-msgstr "Virksomhed"
+msgstr "Firma"
#. module: html_view
#: model:ir.actions.act_window,name:html_view.action_html_view_form
@@ -36,17 +36,17 @@ msgstr "HTML test"
#. module: html_view
#: view:html.view:0
msgid "Html Example"
-msgstr ""
+msgstr "HTML eksempel"
#. module: html_view
#: model:ir.module.module,shortdesc:html_view.module_meta_information
msgid "Html View"
-msgstr ""
+msgstr "HTML visning"
#. module: html_view
#: field:html.view,bank_ids:0
msgid "Banks"
-msgstr ""
+msgstr "Banker"
#. module: html_view
#: model:ir.module.module,description:html_view.module_meta_information
@@ -56,8 +56,12 @@ msgid ""
"view.\n"
" "
msgstr ""
+"\n"
+" Dette er testmodulet, der viser understøttelse af HTML tags i en normal "
+"XML formular.\n"
+" "
#. module: html_view
#: model:ir.model,name:html_view.model_html_view
msgid "html.view"
-msgstr ""
+msgstr "html.view"
diff --git a/addons/idea/i18n/da.po b/addons/idea/i18n/da.po
index f26f0d38ffe..e285d0d1135 100644
--- a/addons/idea/i18n/da.po
+++ b/addons/idea/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-11-01 20:17+0000\n"
+"PO-Revision-Date: 2011-11-08 21:34+0000\n"
"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: idea
#: help:idea.category,visibility:0
@@ -154,7 +154,7 @@ msgstr "Idéstemme"
#. module: idea
#: field:idea.category,parent_id:0
msgid "Parent Categories"
-msgstr ""
+msgstr "Forældrekategorier"
#. module: idea
#: selection:idea.idea,my_vote:0
@@ -443,7 +443,7 @@ msgstr "Brugernavn"
#. module: idea
#: model:ir.model,name:idea.model_idea_vote_stat
msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "Stemme statistik"
#. module: idea
#: field:idea.comment,user_id:0
@@ -451,7 +451,7 @@ msgstr ""
#: field:idea.vote,user_id:0
#: view:report.vote:0
msgid "User"
-msgstr "Bruger"
+msgstr "User"
#. module: idea
#: field:idea.vote,date:0
@@ -461,7 +461,7 @@ msgstr "Dato"
#. module: idea
#: view:idea.post.vote:0
msgid "Post"
-msgstr ""
+msgstr "Send"
#. module: idea
#: field:idea.idea,my_vote:0
@@ -512,7 +512,7 @@ msgstr "Historik"
#. module: idea
#: view:idea.idea:0
msgid "Vots Statistics"
-msgstr ""
+msgstr "Stemme statistik"
#. module: idea
#: field:report.vote,date:0
@@ -551,7 +551,7 @@ msgstr "Luk"
#: view:idea.idea:0
#: view:report.vote:0
msgid "Open"
-msgstr "Åbn"
+msgstr "Åben"
#. module: idea
#: view:report.vote:0
@@ -640,17 +640,17 @@ msgstr "April"
#. module: idea
#: field:idea.idea,count_comments:0
msgid "Count of comments"
-msgstr ""
+msgstr "Antal kommentarer"
#. module: idea
#: field:idea.vote,score:0
msgid "Vote Status"
-msgstr ""
+msgstr "Stemme status"
#. module: idea
#: field:idea.idea,vote_avg:0
msgid "Average Score"
-msgstr ""
+msgstr "Gennemsnitlig score"
#. module: idea
#: field:idea.comment,idea_id:0
@@ -662,7 +662,7 @@ msgstr ""
#: view:report.vote:0
#: field:report.vote,idea_id:0
msgid "Idea"
-msgstr ""
+msgstr "Idé"
#. module: idea
#: view:idea.idea:0
@@ -672,7 +672,7 @@ msgstr "Godkend"
#. module: idea
#: field:idea.post.vote,vote:0
msgid "Post Vote"
-msgstr ""
+msgstr "Send stemme"
#. module: idea
#: view:report.vote:0
diff --git a/addons/knowledge/i18n/da.po b/addons/knowledge/i18n/da.po
new file mode 100644
index 00000000000..f198a77905b
--- /dev/null
+++ b/addons/knowledge/i18n/da.po
@@ -0,0 +1,155 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-09 21:31+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Viden"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Share information within the company with these specific Addons."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure"
+msgstr "Konfigurer"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+" "
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurationsfremgang"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr "Billede"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+#: view:knowledge.installer:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure Your Knowledge Application"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and between your employees."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr ""
diff --git a/addons/l10n_hn/i18n/ca.po b/addons/l10n_hn/i18n/ca.po
index 24de725e214..aad943ef40d 100644
--- a/addons/l10n_hn/i18n/ca.po
+++ b/addons/l10n_hn/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: l10n_hn
#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
diff --git a/addons/l10n_hn/i18n/es.po b/addons/l10n_hn/i18n/es.po
index 54a8a33376c..fa71768c797 100644
--- a/addons/l10n_hn/i18n/es.po
+++ b/addons/l10n_hn/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: l10n_hn
#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
diff --git a/addons/l10n_hn/i18n/fr.po b/addons/l10n_hn/i18n/fr.po
index f61ad5dae13..9d2e759a734 100644
--- a/addons/l10n_hn/i18n/fr.po
+++ b/addons/l10n_hn/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: l10n_hn
#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
diff --git a/addons/l10n_hn/i18n/gl.po b/addons/l10n_hn/i18n/gl.po
index ef2997a1875..0c718c8e4eb 100644
--- a/addons/l10n_hn/i18n/gl.po
+++ b/addons/l10n_hn/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: l10n_hn
#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
diff --git a/addons/l10n_hn/i18n/hu.po b/addons/l10n_hn/i18n/hu.po
index 305ba7c6e40..8cb0490fdaa 100644
--- a/addons/l10n_hn/i18n/hu.po
+++ b/addons/l10n_hn/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: l10n_hn
#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
diff --git a/addons/l10n_hn/i18n/it.po b/addons/l10n_hn/i18n/it.po
index 36b0d853598..b2cbae2b860 100644
--- a/addons/l10n_hn/i18n/it.po
+++ b/addons/l10n_hn/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: l10n_hn
#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
diff --git a/addons/l10n_hn/i18n/pt_BR.po b/addons/l10n_hn/i18n/pt_BR.po
index 811711bfd59..85231507ac5 100644
--- a/addons/l10n_hn/i18n/pt_BR.po
+++ b/addons/l10n_hn/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: l10n_hn
#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
diff --git a/addons/l10n_hn/i18n/sr@latin.po b/addons/l10n_hn/i18n/sr@latin.po
index 861c48c341e..60d3fcb2dec 100644
--- a/addons/l10n_hn/i18n/sr@latin.po
+++ b/addons/l10n_hn/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: l10n_hn
#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index b97926e564c..d0be223158f 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -35,7 +35,7 @@ class membership_invoice(osv.osv_memory):
"""This function returns value of product's member price based on product id.
"""
if not product_id:
- return {'value': {'unit_price': False}}
+ return {'value': {'member_price': False}}
return {'value': {'member_price': self.pool.get('product.product').price_get(cr, uid, [product_id])[product_id]}}
def membership_invoice(self, cr, uid, ids, context=None):
@@ -67,4 +67,4 @@ class membership_invoice(osv.osv_memory):
membership_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index 500885d35f1..dedecf1e9dc 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -10,7 +10,7 @@
-
-
+
+
Sales Dashboard
board.board
form
form
-
-
+
+
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index 51f05793939..f0c4e392425 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-11-05 12:32+0000\n"
+"PO-Revision-Date: 2011-11-08 17:59+0000\n"
"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-06 05:23+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: sale
#: view:board.board:0
@@ -59,7 +59,7 @@ msgstr "Dag"
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
#: view:sale.order:0
msgid "Cancel Order"
-msgstr "Annuler ordre"
+msgstr "Annuller ordre"
#. module: sale
#: view:sale.config.picking_policy:0
@@ -162,7 +162,7 @@ msgstr "Standard betalingsbetinelser"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_config_picking_policy
msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "Konfigurerer plukpolitik for salgsorder"
#. module: sale
#: view:sale.order:0
@@ -185,7 +185,7 @@ msgstr ""
#. module: sale
#: help:sale.make.invoice,grouped:0
msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Afkryds for at gruppere fakturaer pr. kunde."
#. module: sale
#: selection:sale.order,invoice_quantity:0
@@ -200,13 +200,13 @@ msgstr "Salg pr. sælger"
#. module: sale
#: field:sale.order.line,move_ids:0
msgid "Inventory Moves"
-msgstr ""
+msgstr "Lagerbevægelser"
#. module: sale
#: field:sale.order,name:0
#: field:sale.order.line,order_id:0
msgid "Order Reference"
-msgstr ""
+msgstr "Ordre referense"
#. module: sale
#: view:sale.order:0
@@ -224,6 +224,8 @@ msgid ""
"The invoice is created automatically if the shipping policy is 'Invoice from "
"pick' or 'Invoice on order after delivery'."
msgstr ""
+"Fakturaen laves automatisk hvis leveringspolitiken er 'Fakturer på grundlag "
+"af plukliste' eller 'Fakturer på grundlag af ordre efter levering'."
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
@@ -245,6 +247,8 @@ msgstr "Rabat (%)"
msgid ""
"This is the days added to what you promise to customers for security purpose"
msgstr ""
+"Det er det antal dage som du lägger till det datum som du lovat kunden av "
+"säkerhetsskäl"
#. module: sale
#: view:board.board:0
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index aea79abfa37..e54433c0b32 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -110,7 +110,7 @@ class sale_order(osv.osv):
for item in cr.dictfetchall():
if item['move_state'] == 'cancel':
continue
-
+
if item['picking_type'] == 'in':#this is a returned picking
tmp[item['sale_order_id']]['total'] -= item['nbr'] or 0.0 # Deducting the return picking qty
if item['procurement_state'] == 'done' or item['move_state'] == 'done':
@@ -125,7 +125,7 @@ class sale_order(osv.osv):
res[order.id] = 100.0
else:
res[order.id] = tmp[order.id]['total'] and (100.0 * tmp[order.id]['picked'] / tmp[order.id]['total']) or 0.0
- return res
+ return res
def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
res = {}
@@ -726,6 +726,7 @@ class sale_order(osv.osv):
return {
'name': pick_name,
'origin': order.name,
+ 'date': order.date_order,
'type': 'out',
'state': 'auto',
'move_type': order.picking_policy,
@@ -898,7 +899,7 @@ class sale_order_line(osv.osv):
return result[1]
except Exception, ex:
return False
-
+
_name = 'sale.order.line'
_description = 'Sales Order Line'
_columns = {
@@ -1266,7 +1267,7 @@ sale_order_line()
class sale_config_picking_policy(osv.osv_memory):
_name = 'sale.config.picking_policy'
_inherit = 'res.config'
-
+
_columns = {
'name': fields.char('Name', size=64),
'sale_orders': fields.boolean('Based on Sales Orders',),
@@ -1307,7 +1308,7 @@ class sale_config_picking_policy(osv.osv_memory):
if wizard.sale_orders:
menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').id
- menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
+ menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
if wizard.deli_orders:
menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').id
@@ -1345,7 +1346,7 @@ class sale_config_picking_policy(osv.osv_memory):
product_obj = self.pool.get('product.product')
product_obj.write(cr, uid, prod_id, {'uom_id':wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
- ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)
+ ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)
if wizard.task_work and wizard.time_unit:
company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
self.pool.get('res.company').write(cr, uid, [company_id], {
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 85ae2c7cb5c..73a8a6cd42a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,8 +1,12 @@
-
+
-
+
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 74c9d4f70c7..1557166015a 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -1,21 +1,21 @@
-
+
board.crm.form.inherit.replace1
board.board
form
-
-
+
-
+
@@ -25,13 +25,13 @@
form
-
-
+
-
+
@@ -41,30 +41,16 @@
form
-
-
+
-
-
-
-
-
- board.crm.form.inherit.replace1
- board.board
- form
-
-
-
-
-
+
+
diff --git a/addons/sale_layout/i18n/da.po b/addons/sale_layout/i18n/da.po
index cfe4d50326a..d27e07c62ae 100644
--- a/addons/sale_layout/i18n/da.po
+++ b/addons/sale_layout/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-09-24 17:46+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-08 22:33+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: sale_layout
#: selection:sale.order.line,layout_type:0
@@ -39,7 +39,7 @@ msgstr ""
#. module: sale_layout
#: selection:sale.order.line,layout_type:0
msgid "Title"
-msgstr ""
+msgstr "Titel"
#. module: sale_layout
#: report:sale.order.layout:0
@@ -49,7 +49,7 @@ msgstr ""
#. module: sale_layout
#: selection:sale.order.line,layout_type:0
msgid "Note"
-msgstr ""
+msgstr "Notat"
#. module: sale_layout
#: report:sale.order.layout:0
@@ -69,7 +69,7 @@ msgstr "Ordre linier"
#. module: sale_layout
#: report:sale.order.layout:0
msgid "Disc.(%)"
-msgstr ""
+msgstr "Rabat (%)"
#. module: sale_layout
#: field:sale.order.line,layout_type:0
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 5b1d392a592..698ac7c8546 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -49,7 +49,10 @@ Thanks to the double entry management, the inventory controlling is powerful and
"depends" : ["product", "account"],
"category" : "Warehouse Management",
"init_xml" : [],
- "demo_xml" : ["stock_demo.xml"],
+ "demo_xml" : [
+ "stock_demo.xml",
+ "stock_demo_picking.yml",
+ ],
"update_xml" : [
"security/stock_security.xml",
"security/ir.model.access.csv",
@@ -78,10 +81,12 @@ Thanks to the double entry management, the inventory controlling is powerful and
"report/report_stock_view.xml",
"board_warehouse_view.xml"
],
- 'test': ['test/stock_test.yml',
- 'test/stock_report.yml',
- 'test/stock_test_wizard.yml',
- ],
+ 'test': [
+ 'test/stock_test.yml',
+ 'test/stock_report.yml',
+ 'test/stock_test_wizard.yml',
+ 'test/stock_demo_backorder.yml'
+ ],
'installable': True,
'active': False,
'certificate': '0055421559965',
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 9c6d46ea564..32e56c8a088 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-05-05 13:33+0000\n"
-"Last-Translator: João Mouro \n"
+"PO-Revision-Date: 2011-11-09 17:23+0000\n"
+"Last-Translator: DReis \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: 2011-11-08 05:38+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: stock
#: field:product.product,track_outgoing:0
@@ -322,7 +322,7 @@ msgstr "Lote de produção"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Categorias de unidades de medida"
#. module: stock
#: help:stock.incoterms,code:0
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 386a4d60e30..5c5cb776fb3 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -266,13 +266,5 @@
-
- PACKO1
- out
- direct
- 2binvoiced
-
-
-
diff --git a/addons/stock/stock_demo_picking.yml b/addons/stock/stock_demo_picking.yml
new file mode 100644
index 00000000000..6301ab7a0cb
--- /dev/null
+++ b/addons/stock/stock_demo_picking.yml
@@ -0,0 +1,25 @@
+-
+ !record {model: stock.picking, id: stock_picking_1}:
+ type: out
+ company_id: base.main_company
+ address_id: res_partner_address_fabien0
+-
+ !record {model: stock.move, id: stock_move_1}:
+ product_id: product.product_product_cpu1
+ product_uom: product.product_uom_unit
+ product_uos_qty: 5.0
+ product_qty: 5.0
+ location_dest_id: stock.stock_location_customers
+ location_id: stock.stock_location_stock
+ name: CPU1, Processor AMD Athlon XP 1800
+ picking_id: stock_picking_1
+-
+ !record {model: stock.move, id: stock_move_2}:
+ product_id: product.product_product_cpu3
+ product_uom: product.product_uom_unit
+ product_uos_qty: 5.0
+ product_qty: 5.0
+ location_dest_id: stock.stock_location_customers
+ location_id: stock.stock_location_stock
+ name: CPU3, Processor AMD Athlon XP 1800
+ picking_id: stock_picking_1
diff --git a/addons/stock/test/stock_demo_backorder.yml b/addons/stock/test/stock_demo_backorder.yml
new file mode 100644
index 00000000000..986a59c7349
--- /dev/null
+++ b/addons/stock/test/stock_demo_backorder.yml
@@ -0,0 +1,65 @@
+-
+ In order to test partial delivery and back orders, I will use a delivery order with 5 CPU1 and 5 CPU3
+-
+ I confirm and force the availability of all products on the picking OUT001
+-
+ !python {model: stock.picking}: |
+ self.draft_force_assign(cr, uid, [ref('stock.stock_picking_1')], {})
+ self.force_assign(cr, uid, [ref('stock.stock_picking_1')], {})
+-
+ After having confirmed the picking and its two lines, I add a new move line in draft state with 7 FAN2
+-
+ !record {model: stock.move, id: stock_move_3}:
+ product_id: product.product_product_fan2
+ product_uom: product.product_uom_unit
+ product_uos_qty: 7.0
+ product_qty: 7.0
+ location_dest_id: stock.stock_location_customers
+ location_id: stock.stock_location_stock
+ name: CPU3, Processor AMD Athlon XP 1800
+ picking_id: stock_picking_1
+- |
+ I click on 'Process Now' to process the delivery order and I change quantities to:
+ 7 CPU1, 0 CPU3, 3 FAN2 and a new product of 4 PC1
+-
+ !python {model: stock.picking}: |
+ result = self.action_process(cr, uid, [ref('stock.stock_picking_1')], {})['res_id']
+ pick = self.pool.get('stock.partial.picking').browse(cr, uid, result, {})
+ lobj = self.pool.get('stock.partial.picking.line')
+ for line in pick.move_ids:
+ if line.product_id.id == ref('product.product_product_cpu3'):
+ lobj.write(cr, uid, [line.id], {
+ 'quantity': 0.0
+ }, {})
+ elif line.product_id.id == ref('product.product_product_cpu1'):
+ lobj.write(cr, uid, [line.id], {
+ 'quantity': 7.0
+ }, {})
+ elif line.product_id.id == ref('product.product_product_fan2'):
+ lobj.write(cr, uid, [line.id], {
+ 'quantity': 3.0
+ }, {})
+ lobj.create(cr, uid, {
+ 'product_id': ref('product.product_product_pc1'),
+ 'quantity': 2.0,
+ 'product_uom': ref('product.product_uom_unit'),
+ 'location_id': ref('stock.stock_location_stock'),
+ 'location_dest_id': ref('stock.stock_location_customers'),
+ 'wizard_id': result
+ }, {})
+ self.pool.get('stock.partial.picking').do_partial(cr, uid, [result], {})
+-
+ I test that the back order contains 5 CPU3, 4 FAN2 and nothing else
+-
+ !python {model: stock.picking}: |
+ pick = self.browse(cr, uid, ref('stock.stock_picking_1'), {})
+ for line in pick.move_lines:
+ if line.product_id.id == ref('product.product_product_cpu3'):
+ assert line.product_qty == 5.0, "Wrong quantity %.2f for CPU3 back order" % (line.product_qty,)
+ elif line.product_id.id == ref('product.product_product_fan2'):
+ assert line.product_qty == 4.0, "Wrong quantity %.2f for FAN2 back order" % (line.product_qty,)
+ elif line.product_id.id == ref('product.product_product_pc1'):
+ assert line.product_qty == 0.0, "Wrong quantity for PC1 back order"
+ else:
+ assert line.product_qty == 0.0, "Wrong quantity for %s back order" % (line.product_id.code,)
+
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 8b71e6502eb..ef592282088 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -102,7 +102,7 @@ class stock_partial_picking(osv.osv_memory):
def _partial_move_for(self, cr, uid, move):
partial_move = {
'product_id' : move.product_id.id,
- 'quantity' : move.state == 'assigned' and move.product_qty or 0,
+ 'quantity' : move.state in ('assigned','new') and move.product_qty or 0,
'product_uom' : move.product_uom.id,
'prodlot_id' : move.prodlot_id.id,
'move_id' : move.id,
@@ -151,7 +151,7 @@ class stock_partial_picking(osv.osv_memory):
'location_dest_id' : move.location_dest_id.id,
'picking_id': partial.picking_id.id
},context=context)
- stock_move.action_done(cr, uid, [move_id], context)
+ stock_move.action_confirm(cr, uid, [move_id], context)
partial_data['move%s' % (move_id)] = {
'product_id': move.product_id.id,
'product_qty': move.quantity,
@@ -164,4 +164,4 @@ class stock_partial_picking(osv.osv_memory):
stock_picking.do_partial(cr, uid, [partial.picking_id.id], partial_data, context=context)
return {'type': 'ir.actions.act_window_close'}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po
index a88e77396a1..a0879d0ff69 100644
--- a/addons/stock_invoice_directly/i18n/da.po
+++ b/addons/stock_invoice_directly/i18n/da.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-11-17 10:52+0000\n"
-"Last-Translator: SmartWi \n"
+"PO-Revision-Date: 2011-11-08 11:51+0000\n"
+"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: stock_invoice_directly
#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
msgid "Partial Picking"
-msgstr ""
+msgstr "Delvis plukning"
#. module: stock_invoice_directly
#: model:ir.module.module,description:stock_invoice_directly.module_meta_information
@@ -34,4 +34,4 @@ msgstr ""
#. module: stock_invoice_directly
#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
msgid "Invoice Picking Directly"
-msgstr "Direkte faktura træk"
+msgstr "Direkte faktura plukning"
diff --git a/addons/stock_no_autopicking/i18n/da.po b/addons/stock_no_autopicking/i18n/da.po
index b2937002baa..bdd4c196c8f 100644
--- a/addons/stock_no_autopicking/i18n/da.po
+++ b/addons/stock_no_autopicking/i18n/da.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-11-17 10:53+0000\n"
-"Last-Translator: SmartWi \n"
+"PO-Revision-Date: 2011-11-08 11:54+0000\n"
+"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: stock_no_autopicking
#: model:ir.model,name:stock_no_autopicking.model_product_product
msgid "Product"
-msgstr "Vare"
+msgstr "Produkt"
#. module: stock_no_autopicking
#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
@@ -47,27 +47,27 @@ msgstr "Produktionsordre"
#. module: stock_no_autopicking
#: field:product.product,auto_pick:0
msgid "Auto Picking"
-msgstr "Automatisk træk"
+msgstr "Automatisk plukning"
#. module: stock_no_autopicking
#: help:product.product,auto_pick:0
msgid "Auto picking for raw materials of production orders."
-msgstr "Automatisk træk af råmatriale i produktionsordre"
+msgstr "Automatisk plukning af råmatriale i produktionsordre"
#. module: stock_no_autopicking
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fejl: Forkert EAN-kode"
#. module: stock_no_autopicking
#: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
msgid "Stock No Auto-Picking"
-msgstr "Ingen automatisk lagertræk"
+msgstr "Ingen automatisk lagerplukning"
#. module: stock_no_autopicking
#: constraint:mrp.production:0
msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Ordre antal kan ikke være negativ eller 0."
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Ugyldig XML for View Architecture!"
diff --git a/addons/survey/test/survey00.yml b/addons/survey/test/survey00.yml
index fa56e9fac39..ab34f62f65e 100644
--- a/addons/survey/test/survey00.yml
+++ b/addons/survey/test/survey00.yml
@@ -147,7 +147,7 @@
id = self.create(cr, uid, {'survey_id': ref("survey_partner_0")})
self.action_next(cr, uid, [id], context)
-
- Give answer of the first and second page in "Partner Feedback" suvey.
+ Give answer of the first and second page in "Partner Feedback" survey.
-
!python {model: survey.question.wiz}: |
ids = self.create(cr, uid, {str(ref("survey_p_question_0")) +"_single" :'Tiny' , str(ref("survey_p_question_1")) + "_selection" :int(ref("survey_p_1_1"))}, context)
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 332b74cc660..f913f922c55 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -42,7 +42,8 @@ class survey_question_wiz(osv.osv_memory):
"""
Fields View Get method :- generate the new view and display the survey pages of selected survey.
"""
-
+ if context is None:
+ context = {}
result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, \
view_type, context, toolbar,submenu)
@@ -55,8 +56,7 @@ class survey_question_wiz(osv.osv_memory):
que_col_head = self.pool.get('survey.question.column.heading')
user_obj = self.pool.get('res.users')
mail_message = self.pool.get('mail.message')
- if context is None:
- context = {}
+
if view_type in ['form']:
wiz_id = 0
sur_name_rec = None
@@ -407,21 +407,13 @@ class survey_question_wiz(osv.osv_memory):
attachments[survey_data.title + ".pdf"] = file_data
file.close()
os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
- user_email = False
- resp_email = False
+
+ user_email = user_obj.browse(cr, uid, uid, context).user_email
+ resp_email = survey_data.responsible_id and survey_data.responsible_id.user_email or False
- address_id = user_obj.browse(cr, uid, uid).address_id.id
- if address_id:
- cr.execute("select email from res_partner_address where id =%s", (address_id,))
- user_email = cr.fetchone()[0]
- resp_id = survey_data.responsible_id.address_id
-
- if resp_id:
- cr.execute("select email from res_partner_address where id =%s", (resp_id.id,))
- resp_email = cr.fetchone()[0]
if user_email and resp_email:
user_name = user_obj.browse(cr, uid, uid, context=context).name
- mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks,"
+ mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " has given the Response Of " + survey_data.title + " Survey.\nThe Response has been attached herewith.\n\n Thanks."
mail_message.schedule_with_attach(cr, uid, user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attachments=attachments, context=context)
xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
@@ -520,9 +512,10 @@ class survey_question_wiz(osv.osv_memory):
return value
if context.has_key('active') and context.get('active',False):
return value
-
+
sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
ans_list = []
+
for key,val in safe_eval(sur_name_read.get('store_ans',"{}")).items():
for field in fields_list:
if field in list(val):
@@ -535,8 +528,10 @@ class survey_question_wiz(osv.osv_memory):
Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
"""
if context is None: context = {}
+
+ survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, vals, context=context)
if context.has_key('active') and context.get('active',False):
- return True
+ return survey_question_wiz_id
for key,val in vals.items():
if key.split('_')[0] == "progress":
@@ -982,7 +977,7 @@ class survey_question_wiz(osv.osv_memory):
if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and que_rec['is_require_answer'] and select_count <= 0:
raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg']))
- return True
+ return survey_question_wiz_id
def action_new_question(self,cr, uid, ids, context=None):
"""
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index a803459899c..82c9fd385ed 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -41,6 +41,7 @@ class survey_name_wiz(osv.osv_memory):
'transfer': 1,
'response': 0,
'survey_id': lambda self,cr,uid,context:context.get('survey_id',False),
+ 'store_ans': '{}' #Setting the default pattern as '{}' as the field is of type text. The field always gets the value in dict format
}
def action_next(self, cr, uid, ids, context=None):
@@ -68,7 +69,6 @@ class survey_name_wiz(osv.osv_memory):
raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-
return {
'view_type': 'form',
"view_mode": 'form',
diff --git a/addons/thunderbird/i18n/da.po b/addons/thunderbird/i18n/da.po
index 7d8794fd4ec..f098ae333f9 100644
--- a/addons/thunderbird/i18n/da.po
+++ b/addons/thunderbird/i18n/da.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-09-22 20:28+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-11-09 21:50+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
#. module: thunderbird
#: field:thunderbird.installer,plugin_file:0
@@ -50,7 +50,7 @@ msgstr ""
#. module: thunderbird
#: view:thunderbird.installer:0
msgid "_Close"
-msgstr ""
+msgstr "_Luk"
#. module: thunderbird
#: field:thunderbird.installer,pdf_file:0
@@ -65,7 +65,7 @@ msgstr "Beskrivelse:"
#. module: thunderbird
#: view:thunderbird.installer:0
msgid "title"
-msgstr ""
+msgstr "titel"
#. module: thunderbird
#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
@@ -94,7 +94,7 @@ msgstr ""
#: field:thunderbird.installer,name:0
#: field:thunderbird.installer,pdf_name:0
msgid "File name"
-msgstr "Fil Navn"
+msgstr "Filnavn"
#. module: thunderbird
#: view:thunderbird.installer:0
@@ -104,7 +104,7 @@ msgstr ""
#. module: thunderbird
#: field:thunderbird.installer,progress:0
msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfigurationsfremgang"
#. module: thunderbird
#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index fad6f7fbe7e..adab3ff892c 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -50,6 +50,13 @@ anonymous authentication for users, it is only for the master
LDAP account that is used to verify if a user exists before
attempting to authenticate it.
+Securing the connection with STARTTLS is available for LDAP
+servers supporting it, by enabling the TLS option in the LDAP
+configuration.
+
+For further options configuring the LDAP settings, refer to the
+ldap.conf manpage :manpage:`ldap.conf(5)`.
+
Security Considerations
+++++++++++++++++++++++
Users' LDAP passwords are never stored in the OpenERP database,
@@ -78,6 +85,9 @@ OpenERP database (which means no access), the first step
always fails and the LDAP server is queried to do the
authentication.
+Enabling STARTTLS ensures that the authentication query to the
+LDAP server is encrypted.
+
User Template
+++++++++++++
In the LDAP configuration on the Company form, it is possible to
diff --git a/addons/users_ldap/users_ldap.py b/addons/users_ldap/users_ldap.py
index 5d77985d250..1ad1b2df104 100644
--- a/addons/users_ldap/users_ldap.py
+++ b/addons/users_ldap/users_ldap.py
@@ -52,7 +52,8 @@ class CompanyLDAP(osv.osv):
args = []
cr.execute("""
SELECT id, company, ldap_server, ldap_server_port, ldap_binddn,
- ldap_password, ldap_filter, ldap_base, "user", create_user
+ ldap_password, ldap_filter, ldap_base, "user", create_user,
+ ldap_tls
FROM res_company_ldap
WHERE ldap_server != '' """ + id_clause + """ ORDER BY sequence
""", args)
@@ -69,7 +70,11 @@ class CompanyLDAP(osv.osv):
uri = 'ldap://%s:%d' % (conf['ldap_server'],
conf['ldap_server_port'])
- return ldap.initialize(uri)
+
+ connection = ldap.initialize(uri)
+ if conf['ldap_tls']:
+ connection.start_tls_s()
+ return connection
def authenticate(self, conf, login, password):
"""
@@ -213,6 +218,10 @@ class CompanyLDAP(osv.osv):
help="Model used for user creation"),
'create_user': fields.boolean('Create user',
help="Create the user if not in database"),
+ 'ldap_tls': fields.boolean('Use TLS',
+ help="Request secure TLS/SSL encryption when connecting to the LDAP server. "
+ "This option requires a server with STARTTLS enabled, "
+ "otherwise all authentication attempts will fail."),
}
_defaults = {
'ldap_server': '127.0.0.1',
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index b055ef2938d..caece7efe8f 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -20,6 +20,7 @@
+
diff --git a/addons/wiki_sale_faq/i18n/da.po b/addons/wiki_sale_faq/i18n/da.po
new file mode 100644
index 00000000000..6a60c08ca2c
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/da.po
@@ -0,0 +1,70 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-09 20:09+0000\n"
+"Last-Translator: OpenERP Danmark / Henning Dinsen \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Dokumenter"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+" "
+msgstr ""
+"Dette modul leverer en wiki FAQ skabelon\n"
+" "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""