Date: Thu, 22 Sep 2011 14:28:47 +0530
Subject: [PATCH 143/190] [FIX] account:Profit and Loss and Balance Sheet
Report Problem
lp bug: https://launchpad.net/bugs/856128 fixed
bzr revid: psi@tinyerp.com-20110922085847-9i6hhsqu7f1r5i2g
---
addons/account/report/account_balance_sheet.rml | 16 ++++++++--------
.../report/account_balance_sheet_horizontal.rml | 4 ++--
addons/account/report/account_profit_loss.rml | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 11b37af6abe..99a39c49321 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -236,12 +236,12 @@
- [[ repeatIn(get_lines_another('asset'),'a' ) ]]
+ [[ repeatIn(get_lines_another('asset'),'a' ) ]]
[[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
[[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]][[ a['code'] ]] |
[[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]] |
- [[ (a['level'] <>2) or removeParentNode('td') ]][[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency = company.currency_id) ]] |
- [[ a['level'] == 2 or removeParentNode('td') ]][[ formatLang(a['balance'], currency = company.currency_id) ]] |
+ [[ (a['level'] <>2) or removeParentNode('td') ]][[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]] |
+ [[ a['level'] == 2 or removeParentNode('td') ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]] |
@@ -250,7 +250,7 @@
Balance:
- [[ formatLang(sum_cr(), currency = company.currency_id) ]]
+ [[ formatLang(sum_cr(), currency_obj = company.currency_id) ]]
|
@@ -278,12 +278,12 @@
- [[ repeatIn(get_lines_another('liability'),'a' ) ]]
+ [[ repeatIn(get_lines_another('liability'),'a' ) ]]
[[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
[[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]][[ a['code'] ]] |
[[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]] |
- [[ (a['level'] <>2) or removeParentNode('td') ]][[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency = company.currency_id) ]] |
- [[ a['level'] == 2 or removeParentNode('td') ]][[ formatLang(a['balance'], currency = company.currency_id) ]] |
+ [[ (a['level'] <>2) or removeParentNode('td') ]][[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]] |
+ [[ a['level'] == 2 or removeParentNode('td') ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]] |
@@ -292,7 +292,7 @@
Balance:
- [[ formatLang(sum_dr(), currency = company.currency_id) ]]
+ [[ formatLang(sum_dr(), currency_obj = company.currency_id) ]]
|
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index ce442b7b136..92125ce92dc 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -235,13 +235,13 @@
Balance:
- [[ formatLang(sum_cr(), currency_obj=company.currency_id) ) ]]
+ [[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]
|
Balance:
|
- [[ formatLang(sum_dr(), currency_obj=company.currency_id) ) ]]
+ [[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]
|
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index 362381be6a8..6e7ed374b75 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -224,11 +224,11 @@
- [[ repeatIn(get_lines_another('expense'),'a' ) ]]
+ [[ repeatIn(get_lines_another('expense'),'a' ) ]]
[[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]][[ a.code ]] |
[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]] |
- [[ (a.level <>2) or removeParentNode('td') ]][[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id.symbol) |
+ [[ (a.level <>2) or removeParentNode('td') ]][[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]] |
[[ a.level == 2 or removeParentNode('td') ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]] |
@@ -273,7 +273,7 @@
- [[ repeatIn(get_lines_another('income'),'a' ) ]]
+ [[ repeatIn(get_lines_another('income'),'a' ) ]]
[[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]][[ a.code ]] |
[[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]] |
From dfdfcf2bacaf1d2d1705a4ceb015e25424dc9fd7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)"
Date: Thu, 22 Sep 2011 14:39:09 +0530
Subject: [PATCH 144/190] [IMP]stock: improement in invoice after merge
bzr revid: mma@tinyerp.com-20110922090909-wljcxwn3a5of3mgj
---
addons/stock/wizard/stock_invoice_onshipping.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 395758b121b..a7b2554576b 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -135,6 +135,8 @@ class stock_invoice_onshipping(osv.osv_memory):
active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
inv_type = picking_pool._get_invoice_type(active_picking)
context['inv_type'] = inv_type
+ if isinstance(onshipdata_obj[0]['journal_id'], tuple):
+ onshipdata_obj[0]['journal_id'] = onshipdata_obj[0]['journal_id'][0]
res = picking_pool.action_invoice_create(cr, uid, active_ids,
journal_id = onshipdata_obj[0]['journal_id'],
group = onshipdata_obj[0]['group'],
From e3e5fe5cbe8b611fa3263bd1b022d7e30cdcc87a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Thu, 22 Sep 2011 11:44:06 +0200
Subject: [PATCH 145/190] [FIX] account_asset: remove 'x' flag on .xml and .py
files
bzr revid: stw@openerp.com-20110922094406-ssrari0nx6i39axw
---
addons/account_asset/__init__.py | 0
addons/account_asset/__openerp__.py | 0
addons/account_asset/account_asset_invoice.py | 0
addons/account_asset/account_asset_invoice_view.xml | 0
addons/account_asset/account_asset_wizard.xml | 0
5 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 addons/account_asset/__init__.py
mode change 100755 => 100644 addons/account_asset/__openerp__.py
mode change 100755 => 100644 addons/account_asset/account_asset_invoice.py
mode change 100755 => 100644 addons/account_asset/account_asset_invoice_view.xml
mode change 100755 => 100644 addons/account_asset/account_asset_wizard.xml
diff --git a/addons/account_asset/__init__.py b/addons/account_asset/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
old mode 100755
new mode 100644
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
old mode 100755
new mode 100644
diff --git a/addons/account_asset/account_asset_wizard.xml b/addons/account_asset/account_asset_wizard.xml
old mode 100755
new mode 100644
From 9757a3a5ce4b3d624738de7871d9e4bc2ff2f162 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)"
Date: Thu, 22 Sep 2011 15:36:59 +0530
Subject: [PATCH 146/190] [FIX] l10n_es, l10n_in, l10n_it: Fixed error of
'Receivable/Payable' accounts when installing different chart of accounts.
lp bug: https://launchpad.net/bugs/855490 fixed
bzr revid: uco@tinyerp.com-20110922100659-73cl0wwin1p9exv1
---
addons/l10n_es/account_chart.xml | 6 +++---
addons/l10n_in/l10n_in_chart.xml | 2 ++
addons/l10n_it/data/account.account.type.csv | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index df0b218ae49..5147024deae 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -37,18 +37,18 @@
Terceros - A Cobrar
terceros - rec
asset
- balance
+ unreconciled
Terceros - A Pagar
terceros - pay
liability
- balance
+ unreconciled
Impuestos
tax
- balance
+ unreconciled
Financieras
diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml
index f6851050604..0253756838c 100644
--- a/addons/l10n_in/l10n_in_chart.xml
+++ b/addons/l10n_in/l10n_in_chart.xml
@@ -37,11 +37,13 @@
Asset
asset
+ unreconciled
asset
Liability
liability
+ unreconciled
liability
diff --git a/addons/l10n_it/data/account.account.type.csv b/addons/l10n_it/data/account.account.type.csv
index 273ff71eb05..3861a6331e1 100644
--- a/addons/l10n_it/data/account.account.type.csv
+++ b/addons/l10n_it/data/account.account.type.csv
@@ -1,7 +1,7 @@
"id","code","name","close_method","report_type"
"account_type_receivable","receivable","Debiti","unreconciled","liability"
"account_type_payable","payable","Crediti","unreconciled","asset"
-"account_type_view","view","Gerarchia","none",
+"account_type_view","view","Gerarchia","unreconciled",
"account_type_income","income","Entrate","none","income"
"account_type_expense","expense","Uscite","none","expense"
"account_type_tax","tax","Tasse","none",
From a10570b1ec7646fb114e26cb05bc54b22e24ed87 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)"
Date: Thu, 22 Sep 2011 15:39:52 +0530
Subject: [PATCH 147/190] [IMP]stock: highlight a un-used function
bzr revid: mma@tinyerp.com-20110922100952-w7od697fouowomif
---
addons/stock/stock.py | 2 ++
addons/stock/wizard/stock_change_standard_price.py | 1 +
2 files changed, 3 insertions(+)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 283b9247b63..a0ae3bae582 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2239,6 +2239,7 @@ class stock_move(osv.osv):
return super(stock_move, self).unlink(
cr, uid, ids, context=ctx)
+ # _create_lot function is not used anywhere
def _create_lot(self, cr, uid, ids, product_id, prefix=False):
""" Creates production lot
@return: Production lot id
@@ -2284,6 +2285,7 @@ class stock_move(osv.osv):
self.action_done(cr, uid, res)
return res
+ # action_split function is not used anywhere
def action_split(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
""" Split Stock Move lines into production lot which specified split by quantity.
@param cr: the database cursor
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index d6b7355bb7c..fa36559dddc 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -69,6 +69,7 @@ class change_standard_price(osv.osv_memory):
return res
+ # onchange_price function is not used anywhere
def onchange_price(self, cr, uid, ids, new_price, context=None):
""" Sets stock input and output account according to the difference
of old price and new price.
From d442214a30ea887f68798ad9b6495ae6b7ffefa1 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)"
Date: Thu, 22 Sep 2011 16:02:11 +0530
Subject: [PATCH 148/190] [FIX] Account Chart Creation Problem
lp bug: https://launchpad.net/bugs/855490 fixed
bzr revid: ara@tinyerp.com-20110922103211-rv64goc6jasq6ss0
---
addons/l10n_br/data/account.account.type.csv | 8 ++++----
addons/l10n_cn/account_chart.xml | 6 +++---
addons/l10n_de/account_types_skr03.xml | 4 ++--
addons/l10n_de/account_types_skr04.xml | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/addons/l10n_br/data/account.account.type.csv b/addons/l10n_br/data/account.account.type.csv
index 1b1d8cfddac..4458859ae1f 100644
--- a/addons/l10n_br/data/account.account.type.csv
+++ b/addons/l10n_br/data/account.account.type.csv
@@ -1,7 +1,7 @@
"id","code","name","close_method"
-"ativo","1","Ativo","balance"
-"passivo","2","Passivo","balance"
-"despesa","3","Despesas","balance"
-"receita","4","Receita","balance"
+"ativo","1","Ativo","unreconciled"
+"passivo","2","Passivo","unreconciled"
+"despesa","3","Despesas","unreconciled"
+"receita","4","Receita","unreconciled"
"resultado","5","Resultado","balance"
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index 624e76a190e..9d5031c2d15 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -12,13 +12,13 @@
资产类
1
- balance
+ unreconciled
asset
负债类
2
- balance
+ unreconciled
liability
@@ -29,7 +29,7 @@
所有者权益类
4
- balance
+ unreconciled
liability
diff --git a/addons/l10n_de/account_types_skr03.xml b/addons/l10n_de/account_types_skr03.xml
index 5967999b601..305c06413ee 100644
--- a/addons/l10n_de/account_types_skr03.xml
+++ b/addons/l10n_de/account_types_skr03.xml
@@ -26,14 +26,14 @@
Bilanzkonten - Aktiva - Vermögenskonten
balance asset
asset
- balance
+ unreconciled
Bilanzkonten - Passiva - Kapitalkonten
balance liability
liability
- balance
+ unreconciled
Jahresabschlusskonten u. Statistik
diff --git a/addons/l10n_de/account_types_skr04.xml b/addons/l10n_de/account_types_skr04.xml
index 5967999b601..305c06413ee 100644
--- a/addons/l10n_de/account_types_skr04.xml
+++ b/addons/l10n_de/account_types_skr04.xml
@@ -26,14 +26,14 @@
Bilanzkonten - Aktiva - Vermögenskonten
balance asset
asset
- balance
+ unreconciled
Bilanzkonten - Passiva - Kapitalkonten
balance liability
liability
- balance
+ unreconciled
Jahresabschlusskonten u. Statistik
From 9815925e53d9c688adaa045e8160d0b37af4beae Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)"
Date: Thu, 22 Sep 2011 16:41:11 +0530
Subject: [PATCH 149/190] [IMP]stock_location: change a type
bzr revid: mma@tinyerp.com-20110922111111-javrebombn75vcys
---
addons/stock_location/test/stock_location_pull_flow.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index 5b4619e2a94..dec830b2d77 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -28,7 +28,7 @@
I create a account type Receivable.
-
!record {model: account.account.type, id: account_account_type_receivable0}:
- close_method: balance
+ close_method: unreconciled
code: receivable_test
name: Receivable For Tests
sign: 1
From cd78f6ac16a44d475ad1da448f11c9a8fc9d5ae4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)"
Date: Thu, 22 Sep 2011 17:13:25 +0530
Subject: [PATCH 150/190] Improve the statments
bzr revid: dbr@tinyerp.com-20110922114325-pdaf41uih8gcgrmz
---
addons/crm/test/test_crm_lead.yml | 8 ++++----
addons/crm/test/test_crm_lead_case2.yml | 10 +++++-----
addons/crm/test/test_crm_meeting.yml | 6 +++---
addons/crm/test/test_crm_opportunity.yml | 2 +-
addons/crm/test/test_crm_partner2opportunity.yml | 2 +-
addons/crm/test/test_crm_phonecall.yml | 6 +++---
addons/crm/test/test_crm_recurrent_meeting_case2.yml | 2 +-
addons/crm/test/test_crm_segmentation.yml | 4 ++--
addons/crm/test/test_crm_stage_changes.yml | 2 +-
addons/crm_caldav/test/test_crm_caldav.yml | 2 +-
addons/crm_claim/test/test_crm_claim.yml | 2 +-
addons/crm_fundraising/test/test_crm_fund.yml | 4 ++--
.../test/test_crm_partner_assign.yml | 8 ++++----
addons/crm_profiling/test/test_crm_profiling.yml | 4 ++--
14 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 1843fc6897d..92c01b5d8ea 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -61,7 +61,7 @@
!assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}:
- state == "open"
-
- Now, Find id for case object.
+ I search id for case object.
-
!python {model: crm.case.categ}: |
self._find_object_id(cr, uid, context)
@@ -76,7 +76,7 @@
assert action['res_model'] == 'crm.lead2opportunity.partner'
-
|
- Now, select "create a new partner" option in this wizard.
+ I select "create a new partner" option in this wizard.
-
!record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_0}:
action: 'create'
@@ -88,7 +88,7 @@
self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
-
|
- Now, select "Link to an existing partner" option in this wizard.
+ I select "Link to an existing partner" option in this wizard.
-
!record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
action: 'exist'
@@ -100,7 +100,7 @@
self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
-
|
- Now, select "Do not link to a partner" option in this wizard.
+ I select "Do not link to a partner" option in this wizard.
-
!record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_2}:
action: 'nothing'
diff --git a/addons/crm/test/test_crm_lead_case2.yml b/addons/crm/test/test_crm_lead_case2.yml
index 111f63ec01d..c8712d861d4 100644
--- a/addons/crm/test/test_crm_lead_case2.yml
+++ b/addons/crm/test/test_crm_lead_case2.yml
@@ -70,7 +70,7 @@
self.on_change_optout(cr, uid, ref("crm_lead_democustomer"), True)
-
- Now I change the Opt-out to Opt-in to show email receive preference.
+ I change the Opt-out to Opt-in to show email receive preference.
-
!python {model: crm.lead}: |
self.on_change_optin(cr, uid, ref("crm_lead_democustomer"), True)
@@ -85,7 +85,7 @@
!assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in open state}:
- state == "open"
-
- Now i reset the lead "Demo Customer".
+ I reset the lead "Demo Customer".
-
!python {model: crm.lead}: |
self.case_reset(cr, uid, [ref("crm_lead_democustomer")])
@@ -118,12 +118,12 @@
!assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in Pending state}:
- state == "pending"
-
- Now I Escalate the Lead "Demo Customer" Parent "Sales Team".
+ I Escalate the Lead "Demo Customer" Parent "Sales Team".
-
!python {model: crm.lead}: |
self.case_escalate(cr, uid, [ref("crm_lead_democustomer")])
-
- Now I add Internal Note Saying Escalated Reason.
+ I add Internal Note Saying Escalated Reason.
-
!record {model: crm.add.note, id: crm_add_note_0}:
body: Sales Lead Has Been Escalated Due to Some Technical reason to the parent 'Sales
@@ -138,7 +138,7 @@
self.action_add(cr, uid, [ref("crm_add_note_0")], context=context)
-
- Now I Copying this lead "Demo Customer" to New Lead.
+ I Copying this lead "Demo Customer" to New Lead.
-
!python {model: crm.lead}: |
self.copy(cr, uid, ref("crm_lead_democustomer"))
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
index 274d9c0f9bb..8d851dd58c7 100644
--- a/addons/crm/test/test_crm_meeting.yml
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -1,5 +1,5 @@
- |
- Now I will test Meetings which may be customer meeting or phonecall meeting or
+ I will test Meetings which may be customer meeting or phonecall meeting or
internal Meeting.
- |
I start by creating a new Meeting.
@@ -33,7 +33,7 @@
trigger_occurs: before
trigger_related: start
- |
- Now I will assign this reminder.
+ I will assign this reminder.
- !python {model: crm.meeting}: |
self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'alarm_id': ref("res_alarm_minituesbefore0")})
@@ -61,7 +61,7 @@
assert len(ids) == 10
- |
- Now If I want to edit meetings information for all occurrence I click on "Edit All" button.
+ If I want to edit meetings information for all occurrence I click on "Edit All" button.
-
!python {model: crm.meeting}: |
self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'edit_all':'True'},context)
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index d51b5c8d927..734a1cae46c 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -78,7 +78,7 @@
partner_id: base.res_partner_9
section_id: crm.section_sales_department
- |
- Now, Merge the opportunities.
+ I Merge the opportunities.
-
for that create two opportunities first opportunity 'Test FUEL CO'.
-
diff --git a/addons/crm/test/test_crm_partner2opportunity.yml b/addons/crm/test/test_crm_partner2opportunity.yml
index ea546e7bf8e..fe026074f4f 100644
--- a/addons/crm/test/test_crm_partner2opportunity.yml
+++ b/addons/crm/test/test_crm_partner2opportunity.yml
@@ -7,7 +7,7 @@
partner_id: base.res_partner_9
probability: 0.0
-
- Now, click on "Create Opportunity" button of this wizard.
+ I click on "Create Opportunity" button of this wizard.
-
!python {model: crm.partner2opportunity}: |
fields = {
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index 4fac9d34bbb..7a9c367b296 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -7,14 +7,14 @@
duration: 2.0
section_id: crm.section_sales_department
-
- Now , I select partner by click on "Create a Partner" button.
+ I select partner by click on "Create a Partner" button.
-
!record {model: crm.phonecall2partner, id: crm_phonecall2partner_1}:
action: exist
partner_id: base.res_partner_9
-
- Now, click on "Continue" button of this wizard.
+ I click on "Continue" button of this wizard.
-
!python {model: crm.phonecall2partner}: |
@@ -32,7 +32,7 @@
planned_revenue: 0.0
probability: 0.0
-
- Now, I click on "Convert" button of this wizard.
+ I click on "Convert" button of this wizard.
-
!python {model: crm.phonecall2opportunity}: |
self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
diff --git a/addons/crm/test/test_crm_recurrent_meeting_case2.yml b/addons/crm/test/test_crm_recurrent_meeting_case2.yml
index 07b1e9f9551..b6afeb6906e 100644
--- a/addons/crm/test/test_crm_recurrent_meeting_case2.yml
+++ b/addons/crm/test/test_crm_recurrent_meeting_case2.yml
@@ -21,7 +21,7 @@
meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_testmeeting0')]),('date','>=','2011-03-13'), ('date_deadline', '<=', '2011-05-13')], context={'virtual_id': True})
assert len(meeting_ids) == 5, 'Recurrent daily meetings are not created !'
-
- Now I create a weekly meeting till a particular end date.
+ I create a weekly meeting till a particular end date.
-
!record {model: crm.meeting, id: crm_meeting_reviewcodewithprogrammer0}:
date: '2011-04-18 11:47:00'
diff --git a/addons/crm/test/test_crm_segmentation.yml b/addons/crm/test/test_crm_segmentation.yml
index 191f0bd9638..5563f1ce52f 100644
--- a/addons/crm/test/test_crm_segmentation.yml
+++ b/addons/crm/test/test_crm_segmentation.yml
@@ -1,5 +1,5 @@
- |
- Now I will test segmentation which create specific partner categories criteria.
+ I will test segmentation which create specific partner categories criteria.
-
I create a new segmentation record.
-
@@ -10,7 +10,7 @@
som_interval: 0.0
sales_purchase_active : True
-
- Now, Start the process.
+ I start the process.
-
!python {model: crm.segmentation}: |
self.process_start(cr, uid, [ref("crm_segmentation_id_0")],context)
diff --git a/addons/crm/test/test_crm_stage_changes.yml b/addons/crm/test/test_crm_stage_changes.yml
index c9dcac081d6..391a328bffe 100644
--- a/addons/crm/test/test_crm_stage_changes.yml
+++ b/addons/crm/test/test_crm_stage_changes.yml
@@ -61,7 +61,7 @@
!python {model: crm.lead}: |
self.case_mark_lost(cr, uid, [ref('crm_lead_openerppresentation0')])
-
- Now I check whether the probability is set according to stage change or not.
+ I check whether the probability is set according to stage change or not.
-
!python {model: crm.lead}: |
opportunity = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
diff --git a/addons/crm_caldav/test/test_crm_caldav.yml b/addons/crm_caldav/test/test_crm_caldav.yml
index b049eadfddb..d286226bf3a 100644
--- a/addons/crm_caldav/test/test_crm_caldav.yml
+++ b/addons/crm_caldav/test/test_crm_caldav.yml
@@ -1,5 +1,5 @@
- |
- Now Create test cases for Sharing meeting with other calendar clients like sunbird.
+ I create test cases for Sharing meeting with other calendar clients like sunbird.
- |
I start by creating a new Meeting.
-
diff --git a/addons/crm_claim/test/test_crm_claim.yml b/addons/crm_claim/test/test_crm_claim.yml
index b1d4e734690..9ee130329a7 100644
--- a/addons/crm_claim/test/test_crm_claim.yml
+++ b/addons/crm_claim/test/test_crm_claim.yml
@@ -1,5 +1,5 @@
- |
- Now I check claims which contain customer claim information about document
+ I check claims which contain customer claim information about document
related problem, product related problem.
- |
I start by creating new claims for Damaged product as Value Claims with priority High and specify
diff --git a/addons/crm_fundraising/test/test_crm_fund.yml b/addons/crm_fundraising/test/test_crm_fund.yml
index 2e4a6bb18e2..a9207e534f0 100644
--- a/addons/crm_fundraising/test/test_crm_fund.yml
+++ b/addons/crm_fundraising/test/test_crm_fund.yml
@@ -1,5 +1,5 @@
- |
- Now I start test Fund Raising which contain information about Donation or charity
+ I start test Fund Raising which contain information about Donation or charity
given by user.
- |
I start by creating new Funds entry for donation for books to poor school children
@@ -21,7 +21,7 @@
!assert {model: crm.fundraising, id: crm_fundraising_donationforbookstopoorschoolchildren0}:
- state == 'draft'
- |
- Now I open Funds by click on "Open" button.
+ I open Funds by click on "Open" button.
-
!python {model: crm.fundraising}: |
self.case_open(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])
diff --git a/addons/crm_partner_assign/test/test_crm_partner_assign.yml b/addons/crm_partner_assign/test/test_crm_partner_assign.yml
index 1b42d50fda7..b214f535275 100644
--- a/addons/crm_partner_assign/test/test_crm_partner_assign.yml
+++ b/addons/crm_partner_assign/test/test_crm_partner_assign.yml
@@ -62,7 +62,7 @@
probability: 0.0
type: opportunity
-
- Now change the assigned partner.
+ I change the assigned partner.
-
!python {model: crm.lead}: |
self.onchange_assign_id(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], ref('base.res_partner_desertic_hispafuentes'), context)
@@ -82,7 +82,7 @@
context.update({'history': 'info', })
self.on_change_history(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], context.get('history'), context)
-
- Now check the case history.
+ I check the case history.
-
!python {model: crm.lead.forward.to.partner}: |
context.update({'history': 'latest', })
@@ -94,12 +94,12 @@
context.update({'history': 'whole', })
self._get_case_history(cr, uid, context.get('history'), ref('crm_lead_questionnaireonopenerp0'), context=context)
-
- Now get lead details.
+ I get lead details.
-
!python {model: crm.lead.forward.to.partner}: |
self.get_lead_details(cr, uid, ref('crm_lead_questionnaireonopenerp0'), context)
-
- Now I click on Forward button.
+ I click on Forward button.
-
!python {model: crm.lead.forward.to.partner}: |
from tools import config
diff --git a/addons/crm_profiling/test/test_crm_profiling.yml b/addons/crm_profiling/test/test_crm_profiling.yml
index 06388c23f73..2b70cac592b 100644
--- a/addons/crm_profiling/test/test_crm_profiling.yml
+++ b/addons/crm_profiling/test/test_crm_profiling.yml
@@ -1,5 +1,5 @@
- |
- Now I check segmentation which allows users to perform segmentation within partners.
+ I check segmentation which allows users to perform segmentation within partners.
-
I create a crm profiling question record.
-
@@ -42,7 +42,7 @@
data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
self._questionnaire_compute(cr, uid, data, context)
- |
- Now, I start by creating new Questionnaire.
+ I start by creating new Questionnaire.
-
!record {model: crm_profiling.questionnaire, id: crm_profiling_questionnaire_basequestionnaire0}:
description: First questionnaire.
From a1901114ed3532f7628c21c7fdd15d74e7eb0fcb Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)"
Date: Thu, 22 Sep 2011 18:07:52 +0530
Subject: [PATCH 151/190] [RMV]crm_caldav: remove yml file
bzr revid: dbr@tinyerp.com-20110922123752-5fasbwimvaetnwxu
---
addons/crm_caldav/__openerp__.py | 1 -
addons/crm_caldav/test/test_crm_caldav.yml | 37 -------------------
.../crm_helpdesk/test/test_crm_helpdesk.yml | 2 +-
3 files changed, 1 insertion(+), 39 deletions(-)
delete mode 100644 addons/crm_caldav/test/test_crm_caldav.yml
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index 0cf0e700fd1..fdbde1c8d2d 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -43,7 +43,6 @@ Caldav features in Meeting.
'update_xml': ['crm_caldav_view.xml'],
'demo_xml': [],
- 'test':['test/test_crm_caldav.yml' ],
'installable': True,
'active': False,
'certificate' : '001088048737252670109',
diff --git a/addons/crm_caldav/test/test_crm_caldav.yml b/addons/crm_caldav/test/test_crm_caldav.yml
deleted file mode 100644
index d286226bf3a..00000000000
--- a/addons/crm_caldav/test/test_crm_caldav.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-- |
- I create test cases for Sharing meeting with other calendar clients like sunbird.
-- |
- I start by creating a new Meeting.
--
- !record {model: crm.meeting, id: crm_meeting_regardingsharing0}:
- categ_id: crm.categ_meet2
- date: !eval time.strftime('%Y-%m-%d 16:04:00')
- date_deadline: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 00:04:00')"
- duration: 8.0
- email_from: info@balmerinc.be
- location: Gandhinagar
- name: Regarding Sharing with other client
- partner_address_id: base.res_partner_address_1
- partner_id: base.res_partner_9
- rrule_type: weekly
- section_id: crm.section_sales_department
-
--
- I check the export functionality.
--
- !python {model: crm.meeting}: |
- self.export_cal(cr, uid, [ref('crm_meeting_regardingsharing0')], context)
- import time
- vals = []
- context.update({'model':'crm.meeting','active_id': ref('crm_meeting_regardingsharing0')})
- vals.append({
- 'date': time.strftime('%Y-%m-%d 16:04:00'),
- 'create_date': time.strftime('%Y-%m-%d 16:04:00'),
- 'date_deadline':time.strftime('%Y-%m-%d 20:20:00'),
- 'id':ref('crm_meeting_regardingsharing0'),
- 'recurrent_id': time.strftime('%Y-%m-%d 50:00:00'),
- })
- try:
- self.check_import(cr, uid, vals, context)
- except:
- pass
diff --git a/addons/crm_helpdesk/test/test_crm_helpdesk.yml b/addons/crm_helpdesk/test/test_crm_helpdesk.yml
index 1dab04ee49c..eb0a25d2110 100644
--- a/addons/crm_helpdesk/test/test_crm_helpdesk.yml
+++ b/addons/crm_helpdesk/test/test_crm_helpdesk.yml
@@ -28,7 +28,7 @@
!assert {model: crm.helpdesk, id: crm_helpdesk_somefunctionalquestion0}:
- state == 'draft'
- |
- In order to make this helpdesk request to be considered I make it "Open".
+ I make it "Open".
-
!python {model: crm.helpdesk}: |
self.case_open(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')])
From 7afbca3af907b6ab6ee11f2b6826593b6aead068 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Thu, 22 Sep 2011 15:08:27 +0200
Subject: [PATCH 152/190] [IMP] fetchmail: Introduce the fetchmail_model
keyword in the context to specify the default value for the object field of
the fetchmail.server object
bzr revid: stw@openerp.com-20110922130827-ny2i17lng1x1ua59
---
addons/fetchmail/fetchmail.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index b7460965c3b..f45b5e955a0 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -78,6 +78,22 @@ class fetchmail_server(osv.osv):
'attach': True,
}
+ def default_get(self, cr, uid, fields, context=None):
+ if context is None:
+ context = {}
+
+ result = super(fetchmail_server, self).default_get(cr, uid, fields, context=context)
+
+ model = context.pop('fetchmail_model', False) or False
+
+ if isinstance(model, basestring):
+ model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model)], context=context)
+ result.update(
+ object_id = model_id[0],
+ )
+
+ return result
+
def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):
port = 0
if server_type == 'pop':
From f5539d1069cd37867a2f7b7ea6e48296e022a592 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Thu, 22 Sep 2011 15:09:13 +0200
Subject: [PATCH 153/190] [IMP] hr: Add some configuration wizards
bzr revid: stw@openerp.com-20110922130913-kw5htg1ieb1b3xyp
---
addons/hr/hr_installer.xml | 103 +++++++++++++++++++++----------------
1 file changed, 60 insertions(+), 43 deletions(-)
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 6aae7a3ac85..8a9b1eefbb5 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -1,49 +1,66 @@
-
+
-
- hr.installer.view
- base.setup.installer
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- HR Management
- 5
-
+
+ hr.installer.view
+ base.setup.installer
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- Create your employees
- ir.actions.act_window
- hr.employee
- form
- form
-
-
+
+ HR Management
+ 5
+
-
-
-
-
+
+
+ Create your employees
+ ir.actions.act_window
+ hr.employee
+ form
+ form
+
+
-
+
+
+
+
+
+
+
+ Define Your Department Structure
+ ir.actions.act_window
+ hr.department
+ form
+ tree,form
+
+
+ Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.
+
+
+
+
+
+ 3
+
+
From c895e312a9e74cc3e178fcd041457c6f00d6ee81 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)"
Date: Thu, 22 Sep 2011 18:41:13 +0530
Subject: [PATCH 154/190] [FIX] l10n_it: Fixed account type and added respected
accounts with correct types.
bzr revid: uco@tinyerp.com-20110922131113-ho5l3qzjbn0w7rkb
---
addons/l10n_it/data/account.account.template.csv | 4 ++--
addons/l10n_it/data/account.account.type.csv | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv
index ff91ccba79a..388d037ad4e 100644
--- a/addons/l10n_it/data/account.account.template.csv
+++ b/addons/l10n_it/data/account.account.template.csv
@@ -66,8 +66,8 @@
2,2,"PASSIVO ",0,"account_type_view","view",TRUE
20,20,"PATRIMONIO NETTO ",2,"account_type_view","view",TRUE
2101,2101,"patrimonio netto ",20,"account_type_view","other",TRUE
-2102,2102,"utile d'esercizio ",20,"account_type_view","receivable",TRUE
-2103,2103,"perdita d'esercizio ",20,"account_type_view","payable",TRUE
+2102,2102,"utile d'esercizio ",20,"account_type_receivable","receivable",TRUE
+2103,2103,"perdita d'esercizio ",20,"account_type_payable","payable",TRUE
2104,2104,"prelevamenti extra gestione ",20,"account_type_view","other",TRUE
2105,2105,"titolare c/ritenute subite ",20,"account_type_view","other",TRUE
22,22,"FONDI PER RISCHI E ONERI ",2,"account_type_view","view",TRUE
diff --git a/addons/l10n_it/data/account.account.type.csv b/addons/l10n_it/data/account.account.type.csv
index 3861a6331e1..273ff71eb05 100644
--- a/addons/l10n_it/data/account.account.type.csv
+++ b/addons/l10n_it/data/account.account.type.csv
@@ -1,7 +1,7 @@
"id","code","name","close_method","report_type"
"account_type_receivable","receivable","Debiti","unreconciled","liability"
"account_type_payable","payable","Crediti","unreconciled","asset"
-"account_type_view","view","Gerarchia","unreconciled",
+"account_type_view","view","Gerarchia","none",
"account_type_income","income","Entrate","none","income"
"account_type_expense","expense","Uscite","none","expense"
"account_type_tax","tax","Tasse","none",
From e123082d881476ca32eab028550a453e2dde80b2 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Thu, 22 Sep 2011 15:13:00 +0200
Subject: [PATCH 155/190] [IMP] Add missing configuration wizards
bzr revid: stw@openerp.com-20110922131300-uudx3uwhkyaj3ry0
---
addons/account/account_installer.xml | 40 ++++++++
.../account_analytic_plans_installer_view.xml | 2 +-
addons/account_asset/account_asset_view.xml | 2 +-
.../account_followup_view.xml | 2 +-
addons/base_setup/base_setup_views.xml | 24 ++---
addons/crm/crm_installer_view.xml | 4 +-
addons/hr_evaluation/__openerp__.py | 2 +-
.../hr_evaluation/hr_evaluation_installer.xml | 17 ++++
.../hr_evaluation_installer_view.xml | 19 ----
addons/hr_holidays/hr_holidays_view.xml | 2 +-
.../hr_recruitment_installer_view.xml | 30 +++---
addons/hr_timesheet/__openerp__.py | 1 +
.../hr_timesheet/hr_timesheet_installer.xml | 17 ++++
addons/lunch/lunch_installer_view.xml | 44 ++++++---
addons/mail/__openerp__.py | 1 +
addons/mail/mail_installer.xml | 17 ++++
addons/mrp/mrp_installer.xml | 33 +++++++
addons/product/wizard/product_installer.xml | 2 +-
addons/project/project_installer.xml | 93 ++++++++++++++-----
addons/purchase/wizard/purchase_installer.xml | 21 +++++
.../purchase_double_validation_installer.xml | 7 +-
21 files changed, 282 insertions(+), 98 deletions(-)
create mode 100644 addons/hr_evaluation/hr_evaluation_installer.xml
delete mode 100644 addons/hr_evaluation/hr_evaluation_installer_view.xml
create mode 100644 addons/hr_timesheet/hr_timesheet_installer.xml
create mode 100644 addons/mail/mail_installer.xml
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 374304135df..7a916f46520 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -85,5 +85,45 @@
automatic
+
+ Define your Bank Account
+ ir.actions.act_window
+ res.partner.bank
+ form
+ form
+
+
+
+
+
+
+
+
+ Review your Financial Accounts
+ ir.actions.act_window
+ account.account
+ form
+ tree,form
+
+
+
+
+
+
+
+
+
+ Review your Payment Terms
+ ir.actions.act_window
+ account.payment.term
+ form
+ tree,form
+
+
+
+
+
+
+
diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
index fa40ef1e618..c9d21147458 100644
--- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
@@ -2,7 +2,7 @@
- Account Analytic Plans
+ Define your Analytic Plans
ir.actions.act_window
account.analytic.plan
form
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 1cf76e5c6b5..d28579a6c1a 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -314,7 +314,7 @@
- Asset Categories
+ Review Asset Categories
account.asset.category
form
form
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index a5f842b1be3..f99a8b2c060 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -164,7 +164,7 @@
- Configure Follow-Ups
+ Review Invoicing Follow-Ups
ir.actions.act_window
account_followup.followup
form
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index cbfcbf4fb8c..a6059148b51 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -90,18 +90,18 @@
-
- Import or Create Customers
- ir.actions.act_window
- res.partner
- form
- tree,form
-
- Create some Customers, Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard
-
-
-
-
+
+ Create or Import Customers
+ ir.actions.act_window
+ res.partner
+ form
+ tree,form
+
+ Create or Import Customers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard
+
+
+
+
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 9e820075aa7..b2abddefbf3 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -25,12 +25,13 @@
- Create Sales Team
+ Define Sales Team
ir.actions.act_window
crm.case.section
form
tree,form
+
Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost.
@@ -55,6 +56,5 @@
10
-
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index adf1d9d69c4..95ef4512d5c 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -47,8 +47,8 @@ in the form of pdf file. Implements a dashboard for My Current Evaluations
"hr_evaluation_view.xml",
"report/hr_evaluation_report_view.xml",
"board_hr_evaluation_view.xml",
- 'hr_evaluation_installer_view.xml',
'hr_evaluation_data.xml',
+ 'hr_evaluation_installer.xml',
],
"test": ["test/test_hr_evaluation.yml"],
"active": False,
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
new file mode 100644
index 00000000000..4ef0013a4c2
--- /dev/null
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ Review Evaluation Plans
+ ir.actions.act_window
+ hr_evaluation.plan
+ form
+ form,tree
+
+
+
+
+
+
+
+
diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml
deleted file mode 100644
index 27dd0945553..00000000000
--- a/addons/hr_evaluation/hr_evaluation_installer_view.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- Define Your Department Structure
- ir.actions.act_window
- hr.department
- form
- tree,form
-
- Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.
-
-
-
-
-
- 3
-
-
-
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 074b44a4104..2dcf34a0533 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -446,7 +446,7 @@
- Assign Legal Leaves to Employees
+ Allocate Leaves for Employees
ir.actions.act_window
hr.employee
form
diff --git a/addons/hr_recruitment/hr_recruitment_installer_view.xml b/addons/hr_recruitment/hr_recruitment_installer_view.xml
index 5fdf1df849a..3d7d49d595e 100644
--- a/addons/hr_recruitment/hr_recruitment_installer_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_installer_view.xml
@@ -1,19 +1,19 @@
-
-
- Review Recruitment Stages
- ir.actions.act_window
- hr.recruitment.stage
- form
- tree,form
- Check if the following stages are matching your recruitment process. Don't forget to specify the department if your recruitment process is different according to the job position.
-
-
+
+
+ Review Recruitment Stages
+ ir.actions.act_window
+ hr.recruitment.stage
+ form
+ tree,form
+ Check if the following stages are matching your recruitment process. Don't forget to specify the department if your recruitment process is different according to the job position.
+
+
-
-
-
- 3
-
+
+
+
+ 3
+
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 411ac68d57b..40e3f720da1 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -53,6 +53,7 @@ to set up a management by affair.
'wizard/hr_timesheet_print_employee_view.xml',
'wizard/hr_timesheet_print_users_view.xml',
'wizard/hr_timesheet_sign_in_out_view.xml',
+ 'hr_timesheet_installer.xml',
],
'demo_xml': ['hr_timesheet_demo.xml'],
'test': ['test/test_hr_timesheet.yml',
diff --git a/addons/hr_timesheet/hr_timesheet_installer.xml b/addons/hr_timesheet/hr_timesheet_installer.xml
new file mode 100644
index 00000000000..66289ed0c0c
--- /dev/null
+++ b/addons/hr_timesheet/hr_timesheet_installer.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ Define your Analytic Structure
+ ir.actions.act_window
+ account.analytic.account
+ form
+ tree,form
+
+
+
+
+
+
+
+
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
index a318df9eee0..693ac9aa27f 100644
--- a/addons/lunch/lunch_installer_view.xml
+++ b/addons/lunch/lunch_installer_view.xml
@@ -1,18 +1,32 @@
-
-
- Define Your Lunch Products
- ir.actions.act_window
- lunch.product
- form
- tree,form
-
-
-
-
-
-
- 50
-
+
+
+ Define Your Lunch Products
+ ir.actions.act_window
+ lunch.product
+ form
+ tree,form
+
+
+
+
+
+
+ 50
+
+
+
+ Create CashBox
+ ir.actions.act_window
+ lunch.cashbox
+ form
+ form
+
+
+
+
+
+ 51
+
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index e9716be9e8e..08473cad102 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -62,6 +62,7 @@ The main features are:
"res_partner_view.xml",
'security/ir.model.access.csv',
'mail_data.xml',
+ 'mail_installer.xml',
],
'installable': True,
'active': False,
diff --git a/addons/mail/mail_installer.xml b/addons/mail/mail_installer.xml
new file mode 100644
index 00000000000..3faf5fad630
--- /dev/null
+++ b/addons/mail/mail_installer.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ Configure Email Server
+ ir.actions.act_window
+ ir.mail_server
+ form
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 7eabd5a45b1..5aab86f4b8f 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -19,5 +19,38 @@
+
+
+
+ MRP Management
+ 6
+
+
+
+ Configure your work centers
+ ir.actions.act_window
+ mrp.workcenter
+ form,tree
+ form
+
+
+
+
+
+
+
+
+
+ Create Bill of Materials
+ ir.actions.act_window
+ mrp.bom
+ form,tree
+ form
+
+
+
+
+
+
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
index bdfbc1d32bf..01ddf25c56c 100644
--- a/addons/product/wizard/product_installer.xml
+++ b/addons/product/wizard/product_installer.xml
@@ -2,7 +2,7 @@
- Create some Products
+ Create or Import Products
ir.actions.act_window
product.product
form
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index d6538ac1310..3e04b919edd 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -1,27 +1,74 @@
+
-
+
-
- project.installer.view
- base.setup.installer
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ project.installer.view
+ base.setup.installer
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Project Management
+ 7
+
+
+
+ Create your initial projects
+ ir.actions.act_window
+ project.project
+ form
+ form
+
+
+
+
+
+
+
+
+ Configure Default Time Unit for Project
+ ir.actions.act_window
+ res.company
+
+ form
+ form
+ {'res_id' : user.company_id.id}
+
+
+
+
+
+
+
+ Review Task Stages
+ ir.actions.act_window
+ project.task.type
+ form
+ tree,form
+ {}
+ []
+
+
+
+
+
+
+
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index e296b14ca91..68e03fc15f3 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -17,5 +17,26 @@
+
+
+ Create or Import Suppliers
+ ir.actions.act_window
+ res.partner
+ form
+ tree,form
+ {'search_default_supplier': 1, 'default_supplier' : True, 'default_customer' : False}
+
+ Create or Import Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard
+
+
+
+ Purchase Management
+ 5
+
+
+
+
+
+
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index bc39c837b6b..a0b5c3751bb 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -40,15 +40,10 @@
new
-
- Purchase Management
- 5
-
-
-
+
From f7fde320770f6d338e459c9e79478198681ba075 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)"
Date: Fri, 23 Sep 2011 11:07:22 +0530
Subject: [PATCH 156/190] [IMP]Improve the statments of yml file
bzr revid: dbr@tinyerp.com-20110923053722-2o05hvar14yoavp2
---
addons/crm/test/test_crm_lead_case2.yml | 36 ++++++++++++-------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/addons/crm/test/test_crm_lead_case2.yml b/addons/crm/test/test_crm_lead_case2.yml
index c8712d861d4..23a654d31a8 100644
--- a/addons/crm/test/test_crm_lead_case2.yml
+++ b/addons/crm/test/test_crm_lead_case2.yml
@@ -2,13 +2,13 @@
In order to do complete test the CRM in OpenERP,
I will create new full configured record and carry test on it.
- |
- I Start by creating "Demo Sales Team" with No Unlink.
+ I Start by creating "Test Sales Team" with No Unlink.
I create a crm.case.section record.
-
!record {model: crm.case.section, id: crm_case_section_demosalesteam}:
code: DEMO
- complete_name: Demo Sales Team
- name: Demo Sales Team
+ complete_name: Test Sales Team
+ name: Test Sales Team
allow_unlink: False
member_ids:
- base.user_admin
@@ -28,12 +28,12 @@
!record {model: res.users, id: res_users_usercrm0}:
context_section_id: crm_case_section_demosalesteam
- |
- I create a new lead "Demo Customer" and I provide an address to this
- demo customer and email "info@democustomer.com" and Also "Demo Sales Team".
+ I create a new lead "Test Customer" and I provide an address to this
+ demo customer and email "info@democustomer.com" and Also "Test Sales Team".
-
!record {model: crm.lead, id: crm_lead_democustomer}:
email_from: info@democustomer.com
- name: Demo Customer
+ name: Test Customer
partner_name: NotSoTinySARL
phone: (+32).81.81.37.00
mobile: (+32).81.81.37.00
@@ -52,19 +52,19 @@
name: crm_case_section_demosalesteam
section_id: crm_case_section_demosalesteam
-
- I assigning contact detail to the Lead "Demo Customer" without address.
+ I assigning contact detail to the Lead "Test Customer" without address.
-
!python {model: crm.lead}: |
self.onchange_partner_address_id(cr, uid, ref("crm_lead_democustomer"), None, email=False)
-
- I assigning contact detail to the Lead "Demo Customer" with address.
+ I assigning contact detail to the Lead "Test Customer" with address.
-
!python {model: crm.lead}: |
self.onchange_partner_address_id(cr, uid, ref("crm_lead_democustomer"), ref("base.res_partner_address_notsotinysarl0"), email=False)
-
- I selecting email "Opt-out" option for the "Demo Customer" Lead.
+ I selecting email "Opt-out" option for the "Test Customer" Lead.
-
!python {model: crm.lead}: |
self.on_change_optout(cr, uid, ref("crm_lead_democustomer"), True)
@@ -80,12 +80,12 @@
!python {model: crm.lead}: |
self.case_open(cr, uid, [ref("crm_lead_democustomer")])
-
- I check that lead "Demo Customer" is now in 'open' state.
+ I check that lead "Test Customer" is now in 'open' state.
-
!assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in open state}:
- state == "open"
-
- I reset the lead "Demo Customer".
+ I reset the lead "Test Customer".
-
!python {model: crm.lead}: |
self.case_reset(cr, uid, [ref("crm_lead_democustomer")])
@@ -95,12 +95,12 @@
!python {model: crm.lead}: |
self.case_open(cr, uid, [ref("crm_lead_democustomer")])
-
- I setting stage "New" for the lead "Demo Customer".
+ I setting stage "New" for the lead "Test Customer".
-
!python {model: crm.lead}: |
self.stage_next(cr, uid, [ref("crm_lead_democustomer")], context={'stage_type': 'lead'})
-
- I try to Unlink the Lead "Demo Customer" demo Lead.
+ I try to Unlink the Lead "Test Customer" demo Lead.
-
!python {model: crm.lead}: |
try:
@@ -108,17 +108,17 @@
except:
pass
-
- I setting Lead "Demo Customer" to Pending State.
+ I setting Lead "Test Customer" to Pending State.
-
!python {model: crm.lead}: |
self.case_pending(cr, uid, [ref("crm_lead_democustomer")])
-
- I check that lead "Demo Customer" is now in 'Pending' state.
+ I check that lead "Test Customer" is now in 'Pending' state.
-
!assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in Pending state}:
- state == "pending"
-
- I Escalate the Lead "Demo Customer" Parent "Sales Team".
+ I Escalate the Lead "Test Customer" Parent "Sales Team".
-
!python {model: crm.lead}: |
self.case_escalate(cr, uid, [ref("crm_lead_democustomer")])
@@ -138,7 +138,7 @@
self.action_add(cr, uid, [ref("crm_add_note_0")], context=context)
-
- I Copying this lead "Demo Customer" to New Lead.
+ I Copying this lead "Test Customer" to New Lead.
-
!python {model: crm.lead}: |
self.copy(cr, uid, ref("crm_lead_democustomer"))
@@ -146,6 +146,6 @@
I checking the Lead Copied or Not.
-
!python {model: crm.lead}: |
- sid = self.search(cr, uid, [('name', '=', 'Demo Customer'),('state', '=', 'draft')])
+ sid = self.search(cr, uid, [('name', '=', 'Test Customer'),('state', '=', 'draft')])
if not sid:
raise AssertionError("Lead is not copied Successfully")
From 89b4f6b8a998648a67d9fe0ecda85ddf9d2ce2e3 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)"
Date: Fri, 23 Sep 2011 12:09:10 +0530
Subject: [PATCH 157/190] [IMP]stock_invoice_directly: Improvement is Done as
Per Specification
bzr revid: mma@tinyerp.com-20110923063910-ucaj07uoami9xfv8
---
addons/stock_invoice_directly/test/stock_invoice_directly.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index b3a05645d68..806792868d4 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -60,7 +60,7 @@
}
self.do_partial(cr, uid, [ref('stock_partial_picking_0')], {"lang": "en_US", "search_default_available":
1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner",
- "active_ids": [ref('stock_picking_out0')], "active_id": ref("purchase.menu_action_picking_tree4"),
+ "active_ids": [ref('stock_picking_out0')], "active_id": ref("stock_picking_out0"),
})
-
As the Invoice state of the picking order is To be invoiced. I create invoice for my outgoing picking order.
From a198350e582750f4e8c4bfc987ff8d8942aa549f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)"
Date: Fri, 23 Sep 2011 12:09:49 +0530
Subject: [PATCH 158/190] [IMP]remove repeated code
bzr revid: dbr@tinyerp.com-20110923063949-4c6oymzdaick8pav
---
addons/crm/test/test_crm_lead.yml | 16 ----------------
addons/crm/test/test_crm_phonecall.yml | 16 ++++++----------
addons/crm_fundraising/test/test_crm_fund.yml | 15 ++++++++++++++-
3 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 92c01b5d8ea..830a21ca807 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -129,22 +129,6 @@
-
!python {model: crm.lead2opportunity.partner.mass}: |
self.mass_convert(cr, uid, [ref("crm_lead2opportunity_partner_mass0")],{'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
-
--
- I create notes.
--
- !record {model: crm.add.note, id: crm_add_note0}:
- {}
--
- Then, try to add notes.
--
- !python {model: crm.add.note}: |
- try:
- context.update({'active_model': "crm.lead"})
- model = ref("crm_lead_newcustomer0") or False
- self.action_add(cr, uid, [ref("crm_add_note0")],context)
- except:
- pass
-
I close lead by click on "close" button.
-
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index 7a9c367b296..0754a5b9544 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -14,7 +14,7 @@
partner_id: base.res_partner_9
-
- I click on "Continue" button of this wizard.
+ I click on "Continue" button of this wizard and make partner.
-
!python {model: crm.phonecall2partner}: |
@@ -31,18 +31,16 @@
partner_id: base.res_partner_9
planned_revenue: 0.0
probability: 0.0
--
- I click on "Convert" button of this wizard.
--
- !python {model: crm.phonecall2opportunity}: |
- self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
-
- |
I can see that a business opportunity is now assigned to this phonecall
-
!assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
- opportunity_id != False
-
+-
+ I click on "Convert" button of this wizard.
+-
+ !python {model: crm.phonecall2opportunity}: |
+ self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
- |
And I check that the phonecall and the newly created business opportunity is linked
to same partner.
@@ -50,10 +48,8 @@
!python {model: crm.phonecall}: |
obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_interviewcall0'))
ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
- #self.case_reset(cr, uid, ids)
obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
assert obj_phonecall.partner_id == obj_opp.partner_id
-
- |
I schedule Meeting on this current phonecall by clicking on "schedule
Meeting".
diff --git a/addons/crm_fundraising/test/test_crm_fund.yml b/addons/crm_fundraising/test/test_crm_fund.yml
index a9207e534f0..ef81afeb563 100644
--- a/addons/crm_fundraising/test/test_crm_fund.yml
+++ b/addons/crm_fundraising/test/test_crm_fund.yml
@@ -25,8 +25,21 @@
-
!python {model: crm.fundraising}: |
self.case_open(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])
+-
+ I create the message regarding the all details of fundraising.
+-
+ !python {model: crm.fundraising}: |
+ msg = {
+ 'subject': 'fundraising_email',
+ 'body_text': 'fundraising details',
+ 'from': 'Administrator ',
+ 'priority':'3',
+ }
+ context = None
+ self.message_new(cr, uid,msg,context)
+
- |
- I can close Funds by click on "Done" button.
+ After a request via email now I close this fundraising Request by clicking on "Done" button.
-
!python {model: crm.fundraising}: |
self.case_close(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])
From 3139b3cfafe954f68dede0bd7dd87b58aa2885c4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)"
Date: Fri, 23 Sep 2011 12:19:08 +0530
Subject: [PATCH 159/190] Statements changes
bzr revid: dbr@tinyerp.com-20110923064908-cjg4owqe8y49ff9j
---
addons/crm/test/test_crm_lead.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 830a21ca807..6a954939e04 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -76,37 +76,37 @@
assert action['res_model'] == 'crm.lead2opportunity.partner'
-
|
- I select "create a new partner" option in this wizard.
+ I select "create a new partner" option.
-
!record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_0}:
action: 'create'
name: 'convert'
-
- Then, Click on "Create Opportunity" button of this wizard.
+ Then, Click on "Create Opportunity" button.
-
!python {model: crm.lead2opportunity.partner}: |
self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
-
|
- I select "Link to an existing partner" option in this wizard.
+ I select "Link to an existing partner" option.
-
!record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
action: 'exist'
name: 'existing partner'
-
- Then, Click on "Create Opportunity" button of this wizard.
+ Then, Click on "Create Opportunity" button.
-
!python {model: crm.lead2opportunity.partner}: |
self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
-
|
- I select "Do not link to a partner" option in this wizard.
+ I select "Do not link to a partner" option.
-
!record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_2}:
action: 'nothing'
name: 'Do not link to a partner'
-
- Then, Click on "Create Opportunity" button of this wizard.
+ Then, Click on "Create Opportunity" button.
-
!python {model: crm.lead2opportunity.partner}: |
self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_2")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
From be17a405f2b5e6d7a709c03cf68fafff842ddb26 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)"
Date: Fri, 23 Sep 2011 13:05:25 +0530
Subject: [PATCH 160/190] [IMP] Account Chart Creation Problem
bzr revid: ara@tinyerp.com-20110923073525-4w1sh53z09th84du
---
.../l10n_br/data/account.account.template.csv | 496 +++++++++---------
addons/l10n_br/data/account.account.type.csv | 4 +-
addons/l10n_cn/account_chart.xml | 4 +-
addons/l10n_de/account_chart_skr03.xml | 36 +-
addons/l10n_de/account_chart_skr04.xml | 36 +-
addons/l10n_de/account_types_skr03.xml | 4 +-
addons/l10n_de/account_types_skr04.xml | 4 +-
7 files changed, 292 insertions(+), 292 deletions(-)
diff --git a/addons/l10n_br/data/account.account.template.csv b/addons/l10n_br/data/account.account.template.csv
index 5657769538c..d0468c68995 100644
--- a/addons/l10n_br/data/account.account.template.csv
+++ b/addons/l10n_br/data/account.account.template.csv
@@ -323,312 +323,312 @@
"account_template_322","3.1","CUSTOS","account_template_321","view","despesa","True"
"account_template_323","3.1.01","CUSTOS DAS MERCADORIAS E PRODUTOS","account_template_322","view","despesa","True"
"account_template_324","3.1.01.01","CUSTOS DAS MERCADORIAS VENDIDAS","account_template_323","view","despesa","True"
-"account_template_325","3.1.01.01.0001","Custo das Mercadorias Vendidas","account_template_324","payable","despesa","True"
+"account_template_325","3.1.01.01.0001","Custo das Mercadorias Vendidas","account_template_324","other","despesa","True"
"account_template_326","3.1.02","CUSTO DOS PRODUTOS VENDIDOS","account_template_322","view","despesa","True"
"account_template_327","3.1.02.01","CUSTO DAS MATÉRIAS PRIMAS","account_template_326","view","despesa","True"
-"account_template_328","3.1.02.01.0001","Custo das Matérias Primas","account_template_327","payable","despesa","True"
+"account_template_328","3.1.02.01.0001","Custo das Matérias Primas","account_template_327","other","despesa","True"
"account_template_329","3.1.02.02","CUSTO DOS PRODUTOS ACABADOS","account_template_326","view","despesa","True"
-"account_template_330","3.1.02.02.0001","Custo dos Produtos Acabados","account_template_329","payable","despesa","True"
+"account_template_330","3.1.02.02.0001","Custo dos Produtos Acabados","account_template_329","other","despesa","True"
"account_template_331","3.1.02.03","CUSTO DE MÃO-DE-OBRA DIRETA","account_template_326","view","despesa","True"
-"account_template_332","3.1.02.03.0001","Salários","account_template_331","payable","despesa","True"
-"account_template_333","3.1.02.03.0002","Horas Extras","account_template_331","payable","despesa","True"
-"account_template_334","3.1.02.03.0003","Adicional Noturno","account_template_331","payable","despesa","True"
-"account_template_335","3.1.02.03.0004","Férias","account_template_331","payable","despesa","True"
-"account_template_336","3.1.02.03.0005","13º Salário","account_template_331","payable","despesa","True"
-"account_template_337","3.1.02.03.0006","Aviso Prévio/Indeniz.Trabalhistas","account_template_331","payable","despesa","True"
-"account_template_338","3.1.02.03.0007","Gratificações","account_template_331","payable","despesa","True"
-"account_template_339","3.1.02.03.0008","INSS Empresa","account_template_331","payable","despesa","True"
-"account_template_340","3.1.02.03.0009","FGTS ","account_template_331","payable","despesa","True"
-"account_template_341","3.1.02.03.0010","Adicional Insalubridade","account_template_331","payable","despesa","True"
-"account_template_342","3.1.02.03.0011","Vale Transporte","account_template_331","payable","despesa","True"
-"account_template_343","3.1.02.03.0012","PAT - Programa Alim. Trabalhador","account_template_331","payable","despesa","True"
-"account_template_344","3.1.02.03.0013","Assistência Médica","account_template_331","payable","despesa","True"
-"account_template_345","3.1.02.03.0014","DSR - Descanso Semanal Remunerado","account_template_331","payable","despesa","True"
-"account_template_346","3.1.02.03.0015","Salário Estagiários","account_template_331","payable","despesa","True"
-"account_template_347","3.1.02.03.0016","Previdência Privada","account_template_331","payable","despesa","True"
-"account_template_348","3.1.02.03.0017","Vestuário","account_template_331","payable","despesa","True"
-"account_template_349","3.1.02.03.0018","Assiduidade","account_template_331","payable","despesa","True"
-"account_template_350","3.1.02.03.0019","Abono Salarial","account_template_331","payable","despesa","True"
-"account_template_351","3.1.02.03.0020","Vale Refeição","account_template_331","payable","despesa","True"
-"account_template_352","3.1.02.03.0021","Farmácia","account_template_331","payable","despesa","True"
-"account_template_353","3.1.02.03.0022","Pró-Labore","account_template_331","payable","despesa","True"
+"account_template_332","3.1.02.03.0001","Salários","account_template_331","other","despesa","True"
+"account_template_333","3.1.02.03.0002","Horas Extras","account_template_331","other","despesa","True"
+"account_template_334","3.1.02.03.0003","Adicional Noturno","account_template_331","other","despesa","True"
+"account_template_335","3.1.02.03.0004","Férias","account_template_331","other","despesa","True"
+"account_template_336","3.1.02.03.0005","13º Salário","account_template_331","other","despesa","True"
+"account_template_337","3.1.02.03.0006","Aviso Prévio/Indeniz.Trabalhistas","account_template_331","other","despesa","True"
+"account_template_338","3.1.02.03.0007","Gratificações","account_template_331","other","despesa","True"
+"account_template_339","3.1.02.03.0008","INSS Empresa","account_template_331","payable","passivo","True"
+"account_template_340","3.1.02.03.0009","FGTS ","account_template_331","payable","passivo","True"
+"account_template_341","3.1.02.03.0010","Adicional Insalubridade","account_template_331","other","despesa","True"
+"account_template_342","3.1.02.03.0011","Vale Transporte","account_template_331","other","despesa","True"
+"account_template_343","3.1.02.03.0012","PAT - Programa Alim. Trabalhador","account_template_331","other","despesa","True"
+"account_template_344","3.1.02.03.0013","Assistência Médica","account_template_331","other","despesa","True"
+"account_template_345","3.1.02.03.0014","DSR - Descanso Semanal Remunerado","account_template_331","other","despesa","True"
+"account_template_346","3.1.02.03.0015","Salário Estagiários","account_template_331","other","despesa","True"
+"account_template_347","3.1.02.03.0016","Previdência Privada","account_template_331","other","despesa","True"
+"account_template_348","3.1.02.03.0017","Vestuário","account_template_331","other","despesa","True"
+"account_template_349","3.1.02.03.0018","Assiduidade","account_template_331","other","despesa","True"
+"account_template_350","3.1.02.03.0019","Abono Salarial","account_template_331","other","despesa","True"
+"account_template_351","3.1.02.03.0020","Vale Refeição","account_template_331","other","despesa","True"
+"account_template_352","3.1.02.03.0021","Farmácia","account_template_331","other","despesa","True"
+"account_template_353","3.1.02.03.0022","Pró-Labore","account_template_331","other","despesa","True"
"account_template_354","3.1.02.04","GASTOS GERAIS DE FABRICAÇÃO","account_template_326","view","despesa","True"
-"account_template_355","3.1.02.04.0001","Aluguel","account_template_354","payable","despesa","True"
-"account_template_356","3.1.02.04.0002","Água e Esgoto","account_template_354","payable","despesa","True"
-"account_template_357","3.1.02.04.0003","Energia Elétrica","account_template_354","payable","despesa","True"
-"account_template_358","3.1.02.04.0004","Fretes e Carretos","account_template_354","payable","despesa","True"
-"account_template_359","3.1.02.04.0005","Material de Consumo","account_template_354","payable","despesa","True"
-"account_template_360","3.1.02.04.0006","Condução","account_template_354","payable","despesa","True"
-"account_template_361","3.1.02.04.0007","Contribuição Sindical/Assoc.de Classe","account_template_354","payable","despesa","True"
-"account_template_362","3.1.02.04.0008","Material de Limpeza","account_template_354","payable","despesa","True"
-"account_template_363","3.1.02.04.0009","Seguros","account_template_354","payable","despesa","True"
-"account_template_364","3.1.02.04.0010","Viagens e Estadias","account_template_354","payable","despesa","True"
-"account_template_365","3.1.02.04.0011","Manutenção de Equipamentos","account_template_354","payable","despesa","True"
-"account_template_366","3.1.02.04.0012","Depreciações e Amortizações","account_template_354","payable","despesa","True"
-"account_template_367","3.1.02.04.0013","Combustíveis e Lubrificantes","account_template_354","payable","despesa","True"
-"account_template_368","3.1.02.04.0014","Bens de Pequeno Valor","account_template_354","payable","despesa","True"
-"account_template_369","3.1.02.04.0015","Leasing","account_template_354","payable","despesa","True"
-"account_template_370","3.1.02.04.0016","Formação de Pessoal","account_template_354","payable","despesa","True"
-"account_template_371","3.1.02.04.0017","Serviços de Terceiros - Pessoa Jurídica","account_template_354","payable","despesa","True"
-"account_template_372","3.1.02.04.0018","Locação de Equipamentos","account_template_354","payable","despesa","True"
-"account_template_373","3.1.02.04.0019","Feiras/Congressos/Simpósios/Cursos","account_template_354","payable","despesa","True"
-"account_template_374","3.1.02.04.0020","Telefone","account_template_354","payable","despesa","True"
-"account_template_375","3.1.02.04.0021","Comissões sobre Serviços","account_template_354","payable","despesa","True"
-"account_template_376","3.1.02.04.0022","Jornais, Revistas e Periódicos","account_template_354","payable","despesa","True"
-"account_template_377","3.1.02.04.0023","Confraternizações","account_template_354","payable","despesa","True"
-"account_template_378","3.1.02.04.0024","Manutenção de Prédios","account_template_354","payable","despesa","True"
-"account_template_379","3.1.02.04.0025","Brindes e Amostras","account_template_354","payable","despesa","True"
-"account_template_380","3.1.02.04.0026","Aluguel de Equipamentos","account_template_354","payable","despesa","True"
-"account_template_381","3.1.02.04.0027","Serv.de Terceiros P.Física - Autônomos","account_template_354","payable","despesa","True"
-"account_template_382","3.1.02.04.0028","Manutenção de Veículos","account_template_354","payable","despesa","True"
-"account_template_383","3.1.02.04.0029","Despesas de Importação","account_template_354","payable","despesa","True"
-"account_template_384","3.1.02.04.0030","(-) Crédito PIS Não-Cumulativo","account_template_354","payable","despesa","True"
-"account_template_385","3.1.02.04.0031","(-) Crédito Cofins Não-Cumulativo","account_template_354","payable","despesa","True"
+"account_template_355","3.1.02.04.0001","Aluguel","account_template_354","other","despesa","True"
+"account_template_356","3.1.02.04.0002","Água e Esgoto","account_template_354","other","despesa","True"
+"account_template_357","3.1.02.04.0003","Energia Elétrica","account_template_354","other","despesa","True"
+"account_template_358","3.1.02.04.0004","Fretes e Carretos","account_template_354","other","despesa","True"
+"account_template_359","3.1.02.04.0005","Material de Consumo","account_template_354","other","despesa","True"
+"account_template_360","3.1.02.04.0006","Condução","account_template_354","other","despesa","True"
+"account_template_361","3.1.02.04.0007","Contribuição Sindical/Assoc.de Classe","account_template_354","other","despesa","True"
+"account_template_362","3.1.02.04.0008","Material de Limpeza","account_template_354","other","despesa","True"
+"account_template_363","3.1.02.04.0009","Seguros","account_template_354","other","despesa","True"
+"account_template_364","3.1.02.04.0010","Viagens e Estadias","account_template_354","other","despesa","True"
+"account_template_365","3.1.02.04.0011","Manutenção de Equipamentos","account_template_354","other","despesa","True"
+"account_template_366","3.1.02.04.0012","Depreciações e Amortizações","account_template_354","other","despesa","True"
+"account_template_367","3.1.02.04.0013","Combustíveis e Lubrificantes","account_template_354","other","despesa","True"
+"account_template_368","3.1.02.04.0014","Bens de Pequeno Valor","account_template_354","other","despesa","True"
+"account_template_369","3.1.02.04.0015","Leasing","account_template_354","other","despesa","True"
+"account_template_370","3.1.02.04.0016","Formação de Pessoal","account_template_354","other","despesa","True"
+"account_template_371","3.1.02.04.0017","Serviços de Terceiros - Pessoa Jurídica","account_template_354","other","despesa","True"
+"account_template_372","3.1.02.04.0018","Locação de Equipamentos","account_template_354","other","despesa","True"
+"account_template_373","3.1.02.04.0019","Feiras/Congressos/Simpósios/Cursos","account_template_354","other","despesa","True"
+"account_template_374","3.1.02.04.0020","Telefone","account_template_354","other","despesa","True"
+"account_template_375","3.1.02.04.0021","Comissões sobre Serviços","account_template_354","other","despesa","True"
+"account_template_376","3.1.02.04.0022","Jornais, Revistas e Periódicos","account_template_354","other","despesa","True"
+"account_template_377","3.1.02.04.0023","Confraternizações","account_template_354","other","despesa","True"
+"account_template_378","3.1.02.04.0024","Manutenção de Prédios","account_template_354","other","despesa","True"
+"account_template_379","3.1.02.04.0025","Brindes e Amostras","account_template_354","other","despesa","True"
+"account_template_380","3.1.02.04.0026","Aluguel de Equipamentos","account_template_354","other","despesa","True"
+"account_template_381","3.1.02.04.0027","Serv.de Terceiros P.Física - Autônomos","account_template_354","other","despesa","True"
+"account_template_382","3.1.02.04.0028","Manutenção de Veículos","account_template_354","other","despesa","True"
+"account_template_383","3.1.02.04.0029","Despesas de Importação","account_template_354","other","despesa","True"
+"account_template_384","3.1.02.04.0030","(-) Crédito PIS Não-Cumulativo","account_template_354","other","despesa","True"
+"account_template_385","3.1.02.04.0031","(-) Crédito Cofins Não-Cumulativo","account_template_354","other","despesa","True"
"account_template_386","3.1.02.05","ESTOQUE INICIAL DE PROD.EM ELABORAÇÃO","account_template_326","view","despesa","True"
-"account_template_387","3.1.02.05.0001","Estoque Inicial de Prod. em Elaboração","account_template_386","payable","despesa","True"
+"account_template_387","3.1.02.05.0001","Estoque Inicial de Prod. em Elaboração","account_template_386","other","despesa","True"
"account_template_388","3.1.02.06","ESTOQUE INICIAL DE PROD.ACABADOS","account_template_326","view","despesa","True"
-"account_template_389","3.1.02.06.0001","Estoque Inicial de Prod.Acabados","account_template_388","payable","despesa","True"
+"account_template_389","3.1.02.06.0001","Estoque Inicial de Prod.Acabados","account_template_388","other","despesa","True"
"account_template_390","3.1.02.07","ESTOQUE FINAL DE PROD.EM ELABORAÇÃO","account_template_326","view","despesa","True"
-"account_template_391","3.1.02.07.0001","Estoque Final de Prod.em Elaboração","account_template_390","payable","despesa","True"
+"account_template_391","3.1.02.07.0001","Estoque Final de Prod.em Elaboração","account_template_390","other","despesa","True"
"account_template_392","3.1.02.08","ESTOQUE FINAL DE PROD.ACABADOS","account_template_326","view","despesa","True"
-"account_template_393","3.1.02.08.0001","Estoque Final de Prod.Acabados","account_template_392","payable","despesa","True"
+"account_template_393","3.1.02.08.0001","Estoque Final de Prod.Acabados","account_template_392","other","despesa","True"
"account_template_394","3.2","despesa","account_template_321","view","despesa","True"
"account_template_395","3.2.01","DESPESAS OPERACIONAIS COMERCIAIS","account_template_394","view","despesa","True"
"account_template_396","3.2.01.01","DESPESAS TRABALHISTAS","account_template_395","view","despesa","True"
-"account_template_397","3.2.01.01.0001","Salários","account_template_396","payable","despesa","True"
-"account_template_398","3.2.01.01.0002","Horas Extras","account_template_396","payable","despesa","True"
-"account_template_399","3.2.01.01.0003","Vale Transporte","account_template_396","payable","despesa","True"
-"account_template_400","3.2.01.01.0004","Férias","account_template_396","payable","despesa","True"
-"account_template_401","3.2.01.01.0005","13º Salário","account_template_396","payable","despesa","True"
-"account_template_402","3.2.01.01.0006","Aviso Prévio/Indeniz.Trabalhisas","account_template_396","payable","despesa","True"
-"account_template_403","3.2.01.01.0007","Gratificações","account_template_396","payable","despesa","True"
-"account_template_404","3.2.01.01.0008","Assiduidade","account_template_396","payable","despesa","True"
-"account_template_405","3.2.01.01.0009","Abono Salarial","account_template_396","payable","despesa","True"
-"account_template_406","3.2.01.01.0010","Adicional de Insalubridade","account_template_396","payable","despesa","True"
-"account_template_407","3.2.01.01.0011","Vale Refeição","account_template_396","payable","despesa","True"
-"account_template_408","3.2.01.01.0012","Adicional Noturno","account_template_396","payable","despesa","True"
-"account_template_409","3.2.01.01.0013","Farmácia","account_template_396","payable","despesa","True"
-"account_template_410","3.2.01.01.0014","PAT - Programa Alim. Trabalhador","account_template_396","payable","despesa","True"
-"account_template_411","3.2.01.01.0015","Pró-Labore","account_template_396","payable","despesa","True"
-"account_template_412","3.2.01.01.0016","Assistência Médica","account_template_396","payable","despesa","True"
+"account_template_397","3.2.01.01.0001","Salários","account_template_396","other","despesa","True"
+"account_template_398","3.2.01.01.0002","Horas Extras","account_template_396","other","despesa","True"
+"account_template_399","3.2.01.01.0003","Vale Transporte","account_template_396","other","despesa","True"
+"account_template_400","3.2.01.01.0004","Férias","account_template_396","other","despesa","True"
+"account_template_401","3.2.01.01.0005","13º Salário","account_template_396","other","despesa","True"
+"account_template_402","3.2.01.01.0006","Aviso Prévio/Indeniz.Trabalhisas","account_template_396","other","despesa","True"
+"account_template_403","3.2.01.01.0007","Gratificações","account_template_396","other","despesa","True"
+"account_template_404","3.2.01.01.0008","Assiduidade","account_template_396","other","despesa","True"
+"account_template_405","3.2.01.01.0009","Abono Salarial","account_template_396","other","despesa","True"
+"account_template_406","3.2.01.01.0010","Adicional de Insalubridade","account_template_396","other","despesa","True"
+"account_template_407","3.2.01.01.0011","Vale Refeição","account_template_396","other","despesa","True"
+"account_template_408","3.2.01.01.0012","Adicional Noturno","account_template_396","other","despesa","True"
+"account_template_409","3.2.01.01.0013","Farmácia","account_template_396","other","despesa","True"
+"account_template_410","3.2.01.01.0014","PAT - Programa Alim. Trabalhador","account_template_396","other","despesa","True"
+"account_template_411","3.2.01.01.0015","Pró-Labore","account_template_396","other","despesa","True"
+"account_template_412","3.2.01.01.0016","Assistência Médica","account_template_396","other","despesa","True"
"account_template_413","3.2.01.02","ENCARGOS SOCIAIS","account_template_395","view","despesa","True"
-"account_template_414","3.2.01.02.0001","Inss","account_template_413","payable","despesa","True"
-"account_template_415","3.2.01.02.0002","Fgts","account_template_413","payable","despesa","True"
+"account_template_414","3.2.01.02.0001","Inss","account_template_413","other","despesa","True"
+"account_template_415","3.2.01.02.0002","Fgts","account_template_413","other","despesa","True"
"account_template_416","3.2.01.03","DESPESAS GERAIS COMERCIAIS","account_template_395","view","despesa","True"
-"account_template_417","3.2.01.03.0001","Comissões sobre Vendas","account_template_416","payable","despesa","True"
-"account_template_418","3.2.01.03.0002","Aluguel","account_template_416","payable","despesa","True"
-"account_template_419","3.2.01.03.0003","Agua e Esgoto","account_template_416","payable","despesa","True"
-"account_template_420","3.2.01.03.0004","Energia Elétrica","account_template_416","payable","despesa","True"
-"account_template_421","3.2.01.03.0006","Material de Expediente","account_template_416","payable","despesa","True"
-"account_template_422","3.2.01.03.0007","Condução","account_template_416","payable","despesa","True"
-"account_template_423","3.2.01.03.0008","Correios e Malotes","account_template_416","payable","despesa","True"
-"account_template_424","3.2.01.03.0009","Material de Limpeza","account_template_416","payable","despesa","True"
-"account_template_425","3.2.01.03.0010","Seguros","account_template_416","payable","despesa","True"
-"account_template_426","3.2.01.03.0011","Viagens e Estadias","account_template_416","payable","despesa","True"
-"account_template_427","3.2.01.03.0012","Manutenção e Conservação","account_template_416","payable","despesa","True"
-"account_template_428","3.2.01.03.0013","Depreciação e Amortização","account_template_416","payable","despesa","True"
-"account_template_429","3.2.01.03.0014","Propaganda e Publicidade","account_template_416","payable","despesa","True"
-"account_template_430","3.2.01.03.0015","Fretes e Carretos","account_template_416","payable","despesa","True"
-"account_template_431","3.2.01.03.0016","Combustíveis e Lubrificantes","account_template_416","payable","despesa","True"
-"account_template_432","3.2.01.03.0017","Leasing","account_template_416","payable","despesa","True"
-"account_template_433","3.2.01.03.0018","Serv.Terceiros P.Física - Autônomos","account_template_416","payable","despesa","True"
-"account_template_434","3.2.01.03.0019","Serv.Terceiros Pessoa Jurídica","account_template_416","payable","despesa","True"
-"account_template_435","3.2.01.03.0020","Feiras/Congressos/Simpósios/Cursos","account_template_416","payable","despesa","True"
-"account_template_436","3.2.01.03.0021","Telefone","account_template_416","payable","despesa","True"
-"account_template_437","3.2.01.03.0022","Despesas com Exportação","account_template_416","payable","despesa","True"
-"account_template_438","3.2.01.03.0024","Jornais, Revistas e Periódicos","account_template_416","payable","despesa","True"
-"account_template_439","3.2.01.03.0025","Refeições e Lanches","account_template_416","payable","despesa","True"
-"account_template_440","3.2.01.03.0026","Confraternizações","account_template_416","payable","despesa","True"
-"account_template_441","3.2.01.03.0027","Brindes","account_template_416","payable","despesa","True"
-"account_template_442","3.2.01.03.0028","Internet","account_template_416","payable","despesa","True"
+"account_template_417","3.2.01.03.0001","Comissões sobre Vendas","account_template_416","other","despesa","True"
+"account_template_418","3.2.01.03.0002","Aluguel","account_template_416","other","despesa","True"
+"account_template_419","3.2.01.03.0003","Agua e Esgoto","account_template_416","other","despesa","True"
+"account_template_420","3.2.01.03.0004","Energia Elétrica","account_template_416","other","despesa","True"
+"account_template_421","3.2.01.03.0006","Material de Expediente","account_template_416","other","despesa","True"
+"account_template_422","3.2.01.03.0007","Condução","account_template_416","other","despesa","True"
+"account_template_423","3.2.01.03.0008","Correios e Malotes","account_template_416","other","despesa","True"
+"account_template_424","3.2.01.03.0009","Material de Limpeza","account_template_416","other","despesa","True"
+"account_template_425","3.2.01.03.0010","Seguros","account_template_416","other","despesa","True"
+"account_template_426","3.2.01.03.0011","Viagens e Estadias","account_template_416","other","despesa","True"
+"account_template_427","3.2.01.03.0012","Manutenção e Conservação","account_template_416","other","despesa","True"
+"account_template_428","3.2.01.03.0013","Depreciação e Amortização","account_template_416","other","despesa","True"
+"account_template_429","3.2.01.03.0014","Propaganda e Publicidade","account_template_416","other","despesa","True"
+"account_template_430","3.2.01.03.0015","Fretes e Carretos","account_template_416","other","despesa","True"
+"account_template_431","3.2.01.03.0016","Combustíveis e Lubrificantes","account_template_416","other","despesa","True"
+"account_template_432","3.2.01.03.0017","Leasing","account_template_416","other","despesa","True"
+"account_template_433","3.2.01.03.0018","Serv.Terceiros P.Física - Autônomos","account_template_416","other","despesa","True"
+"account_template_434","3.2.01.03.0019","Serv.Terceiros Pessoa Jurídica","account_template_416","other","despesa","True"
+"account_template_435","3.2.01.03.0020","Feiras/Congressos/Simpósios/Cursos","account_template_416","other","despesa","True"
+"account_template_436","3.2.01.03.0021","Telefone","account_template_416","other","despesa","True"
+"account_template_437","3.2.01.03.0022","Despesas com Exportação","account_template_416","other","despesa","True"
+"account_template_438","3.2.01.03.0024","Jornais, Revistas e Periódicos","account_template_416","other","despesa","True"
+"account_template_439","3.2.01.03.0025","Refeições e Lanches","account_template_416","other","despesa","True"
+"account_template_440","3.2.01.03.0026","Confraternizações","account_template_416","other","despesa","True"
+"account_template_441","3.2.01.03.0027","Brindes","account_template_416","other","despesa","True"
+"account_template_442","3.2.01.03.0028","Internet","account_template_416","other","despesa","True"
"account_template_443","3.2.02","DESPESAS ADMINISTRATIVAS","account_template_394","view","despesa","True"
"account_template_444","3.2.02.01","DESPESAS TRABALHISTAS","account_template_443","view","despesa","True"
-"account_template_445","3.2.02.01.0001","Pro-Labore","account_template_444","payable","despesa","True"
-"account_template_446","3.2.02.01.0002","Salários","account_template_444","payable","despesa","True"
-"account_template_447","3.2.02.01.0003","Horas Extras","account_template_444","payable","despesa","True"
-"account_template_448","3.2.02.01.0004","Férias","account_template_444","payable","despesa","True"
-"account_template_449","3.2.02.01.0005","13º Salário","account_template_444","payable","despesa","True"
-"account_template_450","3.2.02.01.0006","Aviso Prévio/Indeniz.Trabalhistas","account_template_444","payable","despesa","True"
-"account_template_451","3.2.02.01.0007","Gratificações","account_template_444","payable","despesa","True"
-"account_template_452","3.2.02.01.0008","Adicional Insalubridade","account_template_444","payable","despesa","True"
-"account_template_453","3.2.02.01.0009","Adicional Noturno","account_template_444","payable","despesa","True"
-"account_template_454","3.2.02.01.0010","Vale Transporte","account_template_444","payable","despesa","True"
-"account_template_455","3.2.02.01.0011","Farmácia","account_template_444","payable","despesa","True"
-"account_template_456","3.2.02.01.0012","Vale Refeição","account_template_444","payable","despesa","True"
-"account_template_457","3.2.02.01.0013","PAT - Programa Alim. Trabalhador","account_template_444","payable","despesa","True"
-"account_template_458","3.2.02.01.0014","Salário Estagiários","account_template_444","payable","despesa","True"
-"account_template_459","3.2.02.01.0015","Assiduidade","account_template_444","payable","despesa","True"
-"account_template_460","3.2.02.01.0016","Abono Salarial","account_template_444","payable","despesa","True"
-"account_template_461","3.2.02.01.0017","Previdência Privada","account_template_444","payable","despesa","True"
-"account_template_462","3.2.02.01.0018","Assistência Médica","account_template_444","payable","despesa","True"
+"account_template_445","3.2.02.01.0001","Pro-Labore","account_template_444","other","despesa","True"
+"account_template_446","3.2.02.01.0002","Salários","account_template_444","other","despesa","True"
+"account_template_447","3.2.02.01.0003","Horas Extras","account_template_444","other","despesa","True"
+"account_template_448","3.2.02.01.0004","Férias","account_template_444","other","despesa","True"
+"account_template_449","3.2.02.01.0005","13º Salário","account_template_444","other","despesa","True"
+"account_template_450","3.2.02.01.0006","Aviso Prévio/Indeniz.Trabalhistas","account_template_444","other","despesa","True"
+"account_template_451","3.2.02.01.0007","Gratificações","account_template_444","other","despesa","True"
+"account_template_452","3.2.02.01.0008","Adicional Insalubridade","account_template_444","other","despesa","True"
+"account_template_453","3.2.02.01.0009","Adicional Noturno","account_template_444","other","despesa","True"
+"account_template_454","3.2.02.01.0010","Vale Transporte","account_template_444","other","despesa","True"
+"account_template_455","3.2.02.01.0011","Farmácia","account_template_444","other","despesa","True"
+"account_template_456","3.2.02.01.0012","Vale Refeição","account_template_444","other","despesa","True"
+"account_template_457","3.2.02.01.0013","PAT - Programa Alim. Trabalhador","account_template_444","other","despesa","True"
+"account_template_458","3.2.02.01.0014","Salário Estagiários","account_template_444","other","despesa","True"
+"account_template_459","3.2.02.01.0015","Assiduidade","account_template_444","other","despesa","True"
+"account_template_460","3.2.02.01.0016","Abono Salarial","account_template_444","other","despesa","True"
+"account_template_461","3.2.02.01.0017","Previdência Privada","account_template_444","other","despesa","True"
+"account_template_462","3.2.02.01.0018","Assistência Médica","account_template_444","other","despesa","True"
"account_template_463","3.2.02.02","ENCARGOS SOCIAIS","account_template_443","view","despesa","True"
-"account_template_464","3.2.02.02.0001","Inss","account_template_463","payable","despesa","True"
-"account_template_465","3.2.02.02.0002","Fgts","account_template_463","payable","despesa","True"
+"account_template_464","3.2.02.02.0001","Inss","account_template_463","other","despesa","True"
+"account_template_465","3.2.02.02.0002","Fgts","account_template_463","other","despesa","True"
"account_template_466","3.2.02.03","DESPESAS GERAIS ADMINISTRATIVAS","account_template_443","view","despesa","True"
-"account_template_467","3.2.02.03.0001","Aluguel","account_template_466","payable","despesa","True"
-"account_template_468","3.2.02.03.0002","Água e Esgoto","account_template_466","payable","despesa","True"
-"account_template_469","3.2.02.03.0003","Energia Elétrica","account_template_466","payable","despesa","True"
-"account_template_470","3.2.02.03.0004","Copa, Cozinha e Refeitório","account_template_466","payable","despesa","True"
-"account_template_471","3.2.02.03.0005","Material de Escritório","account_template_466","payable","despesa","True"
-"account_template_472","3.2.02.03.0006","Fretes e Carretos","account_template_466","payable","despesa","True"
-"account_template_473","3.2.02.03.0007","Correios e Malotes","account_template_466","payable","despesa","True"
-"account_template_474","3.2.02.03.0008","Material de Limpeza","account_template_466","payable","despesa","True"
-"account_template_475","3.2.02.03.0009","Seguros","account_template_466","payable","despesa","True"
-"account_template_476","3.2.02.03.0010","Viagens e Estadias","account_template_466","payable","despesa","True"
-"account_template_477","3.2.02.03.0011","Manutenção e Conservação","account_template_466","payable","despesa","True"
-"account_template_478","3.2.02.03.0012","Depreciação e Amortização","account_template_466","payable","despesa","True"
-"account_template_479","3.2.02.03.0013","Sindicato Patronal/Assoc.de Classe","account_template_466","payable","despesa","True"
-"account_template_480","3.2.02.03.0014","Feiras/Congressos/Simpósios/Cursos","account_template_466","payable","despesa","True"
-"account_template_481","3.2.02.03.0015","Internet","account_template_466","payable","despesa","True"
-"account_template_482","3.2.02.03.0016","Combustíveis e Lubrificantes","account_template_466","payable","despesa","True"
-"account_template_483","3.2.02.03.0017","Leasing","account_template_466","payable","despesa","True"
-"account_template_484","3.2.02.03.0018","Serviço de Terceiros - Pessoa Jurídica","account_template_466","payable","despesa","True"
-"account_template_485","3.2.02.03.0019","Telefone","account_template_466","payable","despesa","True"
-"account_template_486","3.2.02.03.0020","Legais e Judiciais","account_template_466","payable","despesa","True"
-"account_template_487","3.2.02.03.0021","Bens de Pequeno Valor","account_template_466","payable","despesa","True"
-"account_template_488","3.2.02.03.0022","Jornais Revistas e Periódicos","account_template_466","payable","despesa","True"
-"account_template_489","3.2.02.03.0023","Cópias e Reproduções","account_template_466","payable","despesa","True"
-"account_template_490","3.2.02.03.0024","Confraternizações","account_template_466","payable","despesa","True"
-"account_template_491","3.2.02.03.0025","Formação de Pessoal","account_template_466","payable","despesa","True"
-"account_template_492","3.2.02.03.0026","Segurança e Vigilância","account_template_466","payable","despesa","True"
-"account_template_493","3.2.02.03.0027","Despesas com Veículos","account_template_466","payable","despesa","True"
-"account_template_494","3.2.02.03.0028","Impressos","account_template_466","payable","despesa","True"
-"account_template_495","3.2.02.03.0029","Refeições e Lanches","account_template_466","payable","despesa","True"
-"account_template_496","3.2.02.03.0030","Comissões","account_template_466","payable","despesa","True"
-"account_template_497","3.2.02.03.0031","Condução ","account_template_466","payable","despesa","True"
-"account_template_498","3.2.02.03.0032","Telefone Linha Fixa","account_template_466","payable","despesa","True"
-"account_template_499","3.2.02.03.0033","Telefone Móvel Celular","account_template_466","payable","despesa","True"
-"account_template_500","3.2.02.03.0034","Telefone Nextel","account_template_466","payable","despesa","True"
-"account_template_501","3.2.02.03.0035","Crea-PR","account_template_466","payable","despesa","True"
-"account_template_502","3.2.02.03.0036","Despesas de Cartório","account_template_466","payable","despesa","True"
-"account_template_503","3.2.02.03.0037","Material de Consumo","account_template_466","payable","despesa","True"
-"account_template_504","3.2.02.03.0038","Donativos e Contribuições","account_template_466","payable","despesa","True"
-"account_template_505","3.2.02.03.0039","Locação de Equipamentos","account_template_466","payable","despesa","True"
+"account_template_467","3.2.02.03.0001","Aluguel","account_template_466","other","despesa","True"
+"account_template_468","3.2.02.03.0002","Água e Esgoto","account_template_466","other","despesa","True"
+"account_template_469","3.2.02.03.0003","Energia Elétrica","account_template_466","other","despesa","True"
+"account_template_470","3.2.02.03.0004","Copa, Cozinha e Refeitório","account_template_466","other","despesa","True"
+"account_template_471","3.2.02.03.0005","Material de Escritório","account_template_466","other","despesa","True"
+"account_template_472","3.2.02.03.0006","Fretes e Carretos","account_template_466","other","despesa","True"
+"account_template_473","3.2.02.03.0007","Correios e Malotes","account_template_466","other","despesa","True"
+"account_template_474","3.2.02.03.0008","Material de Limpeza","account_template_466","other","despesa","True"
+"account_template_475","3.2.02.03.0009","Seguros","account_template_466","other","despesa","True"
+"account_template_476","3.2.02.03.0010","Viagens e Estadias","account_template_466","other","despesa","True"
+"account_template_477","3.2.02.03.0011","Manutenção e Conservação","account_template_466","other","despesa","True"
+"account_template_478","3.2.02.03.0012","Depreciação e Amortização","account_template_466","other","despesa","True"
+"account_template_479","3.2.02.03.0013","Sindicato Patronal/Assoc.de Classe","account_template_466","other","despesa","True"
+"account_template_480","3.2.02.03.0014","Feiras/Congressos/Simpósios/Cursos","account_template_466","other","despesa","True"
+"account_template_481","3.2.02.03.0015","Internet","account_template_466","other","despesa","True"
+"account_template_482","3.2.02.03.0016","Combustíveis e Lubrificantes","account_template_466","other","despesa","True"
+"account_template_483","3.2.02.03.0017","Leasing","account_template_466","other","despesa","True"
+"account_template_484","3.2.02.03.0018","Serviço de Terceiros - Pessoa Jurídica","account_template_466","other","despesa","True"
+"account_template_485","3.2.02.03.0019","Telefone","account_template_466","other","despesa","True"
+"account_template_486","3.2.02.03.0020","Legais e Judiciais","account_template_466","other","despesa","True"
+"account_template_487","3.2.02.03.0021","Bens de Pequeno Valor","account_template_466","other","despesa","True"
+"account_template_488","3.2.02.03.0022","Jornais Revistas e Periódicos","account_template_466","other","despesa","True"
+"account_template_489","3.2.02.03.0023","Cópias e Reproduções","account_template_466","other","despesa","True"
+"account_template_490","3.2.02.03.0024","Confraternizações","account_template_466","other","despesa","True"
+"account_template_491","3.2.02.03.0025","Formação de Pessoal","account_template_466","other","despesa","True"
+"account_template_492","3.2.02.03.0026","Segurança e Vigilância","account_template_466","other","despesa","True"
+"account_template_493","3.2.02.03.0027","Despesas com Veículos","account_template_466","other","despesa","True"
+"account_template_494","3.2.02.03.0028","Impressos","account_template_466","other","despesa","True"
+"account_template_495","3.2.02.03.0029","Refeições e Lanches","account_template_466","other","despesa","True"
+"account_template_496","3.2.02.03.0030","Comissões","account_template_466","other","despesa","True"
+"account_template_497","3.2.02.03.0031","Condução ","account_template_466","other","despesa","True"
+"account_template_498","3.2.02.03.0032","Telefone Linha Fixa","account_template_466","other","despesa","True"
+"account_template_499","3.2.02.03.0033","Telefone Móvel Celular","account_template_466","other","despesa","True"
+"account_template_500","3.2.02.03.0034","Telefone Nextel","account_template_466","other","despesa","True"
+"account_template_501","3.2.02.03.0035","Crea-PR","account_template_466","other","despesa","True"
+"account_template_502","3.2.02.03.0036","Despesas de Cartório","account_template_466","other","despesa","True"
+"account_template_503","3.2.02.03.0037","Material de Consumo","account_template_466","other","despesa","True"
+"account_template_504","3.2.02.03.0038","Donativos e Contribuições","account_template_466","other","despesa","True"
+"account_template_505","3.2.02.03.0039","Locação de Equipamentos","account_template_466","other","despesa","True"
"account_template_506","3.2.02.04","DESPESAS INDEDUTÍVEIS","account_template_443","view","despesa","True"
-"account_template_507","3.2.02.04.0001","Autos de Infração","account_template_506","payable","despesa","True"
-"account_template_508","3.2.02.04.0002","Multas Punitívas","account_template_506","payable","despesa","True"
-"account_template_509","3.2.02.04.0003","Contribuições e Doações","account_template_506","payable","despesa","True"
-"account_template_510","3.2.02.04.0004","Impostos Federais - Exerc. Anteriores","account_template_506","payable","despesa","True"
-"account_template_511","3.2.02.04.0005","Impostos Estaduais - Exerc. Anteriores","account_template_506","payable","despesa","True"
-"account_template_512","3.2.02.04.0006","Impostos Municipais - Exerc.Anteriores","account_template_506","payable","despesa","True"
+"account_template_507","3.2.02.04.0001","Autos de Infração","account_template_506","other","despesa","True"
+"account_template_508","3.2.02.04.0002","Multas Punitívas","account_template_506","other","despesa","True"
+"account_template_509","3.2.02.04.0003","Contribuições e Doações","account_template_506","other","despesa","True"
+"account_template_510","3.2.02.04.0004","Impostos Federais - Exerc. Anteriores","account_template_506","other","despesa","True"
+"account_template_511","3.2.02.04.0005","Impostos Estaduais - Exerc. Anteriores","account_template_506","other","despesa","True"
+"account_template_512","3.2.02.04.0006","Impostos Municipais - Exerc.Anteriores","account_template_506","other","despesa","True"
"account_template_513","3.2.03","DESPESAS FINANCEIRAS","account_template_394","view","despesa","True"
"account_template_514","3.2.03.01","DESPESAS COM ATUALIZAÇÕES","account_template_513","view","despesa","True"
-"account_template_515","3.2.03.01.0001","Variação Monetária Passiva","account_template_514","payable","despesa","True"
-"account_template_516","3.2.03.01.0002","Variação Cambial Passiva","account_template_514","payable","despesa","True"
-"account_template_517","3.2.03.01.0003","Despesas de Cobrança","account_template_514","payable","despesa","True"
-"account_template_518","3.2.03.01.0004","Despesas Bancárias","account_template_514","payable","despesa","True"
+"account_template_515","3.2.03.01.0001","Variação Monetária Passiva","account_template_514","other","despesa","True"
+"account_template_516","3.2.03.01.0002","Variação Cambial Passiva","account_template_514","other","despesa","True"
+"account_template_517","3.2.03.01.0003","Despesas de Cobrança","account_template_514","other","despesa","True"
+"account_template_518","3.2.03.01.0004","Despesas Bancárias","account_template_514","other","despesa","True"
"account_template_519","3.2.03.02","JUROS E DESCONTOS","account_template_513","view","despesa","True"
-"account_template_520","3.2.03.02.0001","Juros de Mora","account_template_519","payable","despesa","True"
-"account_template_521","3.2.03.02.0002","Descontos Concedidos","account_template_519","payable","despesa","True"
-"account_template_522","3.2.03.02.0003","Juros s/ Empréstimos e Financiamentos","account_template_519","payable","despesa","True"
-"account_template_523","3.2.03.02.0004","Juros s/ Descontos de Duplicatas","account_template_519","payable","despesa","True"
+"account_template_520","3.2.03.02.0001","Juros de Mora","account_template_519","other","despesa","True"
+"account_template_521","3.2.03.02.0002","Descontos Concedidos","account_template_519","other","despesa","True"
+"account_template_522","3.2.03.02.0003","Juros s/ Empréstimos e Financiamentos","account_template_519","other","despesa","True"
+"account_template_523","3.2.03.02.0004","Juros s/ Descontos de Duplicatas","account_template_519","other","despesa","True"
"account_template_524","3.2.04","DESPESAS TRIBUTÁRIAS","account_template_394","view","despesa","True"
"account_template_525","3.2.04.01","IMPOSTOS, TAXAS E CONTRIBUIÇÕES","account_template_524","view","despesa","True"
-"account_template_526","3.2.04.01.0001","IOF","account_template_525","payable","despesa","True"
-"account_template_527","3.2.04.01.0002","CPMF","account_template_525","payable","despesa","True"
-"account_template_528","3.2.04.01.0003","IPTU","account_template_525","payable","despesa","True"
-"account_template_529","3.2.04.01.0004","IPVA","account_template_525","payable","despesa","True"
-"account_template_530","3.2.04.01.0005","IRF (Exclusivo na Fonte)","account_template_525","payable","despesa","True"
-"account_template_531","3.2.04.01.0006","Impostos e Taxas Federais","account_template_525","payable","despesa","True"
-"account_template_532","3.2.04.01.0007","Impostos e Taxas Estaduais","account_template_525","payable","despesa","True"
-"account_template_533","3.2.04.01.0008","Impostos e Taxas Municipais","account_template_525","payable","despesa","True"
+"account_template_526","3.2.04.01.0001","IOF","account_template_525","other","despesa","True"
+"account_template_527","3.2.04.01.0002","CPMF","account_template_525","other","despesa","True"
+"account_template_528","3.2.04.01.0003","IPTU","account_template_525","other","despesa","True"
+"account_template_529","3.2.04.01.0004","IPVA","account_template_525","other","despesa","True"
+"account_template_530","3.2.04.01.0005","IRF (Exclusivo na Fonte)","account_template_525","other","despesa","True"
+"account_template_531","3.2.04.01.0006","Impostos e Taxas Federais","account_template_525","other","despesa","True"
+"account_template_532","3.2.04.01.0007","Impostos e Taxas Estaduais","account_template_525","other","despesa","True"
+"account_template_533","3.2.04.01.0008","Impostos e Taxas Municipais","account_template_525","other","despesa","True"
"account_template_534","3.2.04.02","MULTAS","account_template_524","view","despesa","True"
-"account_template_535","3.2.04.02.0001","Multas Fiscais Compensatórias","account_template_534","payable","despesa","True"
-"account_template_536","3.2.04.02.0002","Multas de Mora","account_template_534","payable","despesa","True"
-"account_template_537","3.2.04.02.0003","Multas Contratuais","account_template_534","payable","despesa","True"
+"account_template_535","3.2.04.02.0001","Multas Fiscais Compensatórias","account_template_534","other","despesa","True"
+"account_template_536","3.2.04.02.0002","Multas de Mora","account_template_534","other","despesa","True"
+"account_template_537","3.2.04.02.0003","Multas Contratuais","account_template_534","other","despesa","True"
"account_template_538","3.2.05","OUTRAS DESPESAS OPERACIONAIS","account_template_394","view","despesa","True"
"account_template_539","3.2.05.01","PERDAS","account_template_538","view","despesa","True"
-"account_template_540","3.2.05.01.0001","Perdas com Duplicatas Incobráveis","account_template_539","payable","despesa","True"
+"account_template_540","3.2.05.01.0001","Perdas com Duplicatas Incobráveis","account_template_539","other","despesa","True"
"account_template_541","3.2.06","DESPESAS NÃO OPERACIONAIS","account_template_394","view","despesa","True"
"account_template_542","3.2.06.01","PERDAS","account_template_541","view","despesa","True"
-"account_template_543","3.2.06.01.0002","Perda crédito de ICMS s/ Imobilizado","account_template_542","payable","despesa","True"
-"account_template_544","3.2.06.01.0003","Perdas com Sinistros","account_template_542","payable","despesa","True"
-"account_template_545","3.2.06.01.0004","Perdas na Alienação de Imobilizado","account_template_542","payable","despesa","True"
-"account_template_546","3.2.06.01.0001","Perdas na Alienação de Investimentos","account_template_542","payable","despesa","True"
-"account_template_547","3.2.06.01.0005","Perdas, Deterioração de Mercadorias","account_template_542","payable","despesa","True"
+"account_template_543","3.2.06.01.0002","Perda crédito de ICMS s/ Imobilizado","account_template_542","other","despesa","True"
+"account_template_544","3.2.06.01.0003","Perdas com Sinistros","account_template_542","other","despesa","True"
+"account_template_545","3.2.06.01.0004","Perdas na Alienação de Imobilizado","account_template_542","other","despesa","True"
+"account_template_546","3.2.06.01.0001","Perdas na Alienação de Investimentos","account_template_542","other","despesa","True"
+"account_template_547","3.2.06.01.0005","Perdas, Deterioração de Mercadorias","account_template_542","other","despesa","True"
"account_template_548","4","CONTAS DE RESULTADO - RECEITAS","account_template_1","view","receita","True"
"account_template_549","4.1","RECEITAS","account_template_548","view","receita","True"
"account_template_550","4.1.01","RECEITAS OPERACIONAIS VENDAS E SERVIÇOS","account_template_549","view","receita","True"
"account_template_551","4.1.01.01","RECEITA BRUTA VENDAS NO PAÍS ","account_template_550","view","receita","True"
-"account_template_552","4.1.01.01.0001","Venda Produtos Fabricação Própria","account_template_551","receivable","receita","True"
-"account_template_553","4.1.01.01.0002","Industrialização de Mercadorias","account_template_551","receivable","receita","True"
-"account_template_554","4.1.01.01.0003","Revenda de Mercadorias","account_template_551","receivable","receita","True"
-"account_template_555","4.1.01.01.0004","Venda Fabricação Própria","account_template_551","receivable","receita","True"
-"account_template_556","4.1.01.01.0005","Industriazalição de Mercadorias","account_template_551","receivable","receita","True"
-"account_template_557","4.1.01.01.0006","Revenda de Mercadorias","account_template_551","receivable","receita","True"
+"account_template_552","4.1.01.01.0001","Venda Produtos Fabricação Própria","account_template_551","other","receita","True"
+"account_template_553","4.1.01.01.0002","Industrialização de Mercadorias","account_template_551","other","receita","True"
+"account_template_554","4.1.01.01.0003","Revenda de Mercadorias","account_template_551","other","receita","True"
+"account_template_555","4.1.01.01.0004","Venda Fabricação Própria","account_template_551","other","receita","True"
+"account_template_556","4.1.01.01.0005","Industriazalição de Mercadorias","account_template_551","other","receita","True"
+"account_template_557","4.1.01.01.0006","Revenda de Mercadorias","account_template_551","other","receita","True"
"account_template_558","4.1.01.02","RECEITA DE SERVIÇOS NO PAIS ","account_template_550","view","receita","True"
-"account_template_559","4.1.01.02.0001","Receita de Serviços","account_template_558","receivable","receita","True"
-"account_template_560","4.1.01.02.0002","Receita de Serviços","account_template_558","receivable","receita","True"
+"account_template_559","4.1.01.02.0001","Receita de Serviços","account_template_558","other","receita","True"
+"account_template_560","4.1.01.02.0002","Receita de Serviços","account_template_558","other","receita","True"
"account_template_561","4.1.01.03","RECEITA BRUTA DE VENDAS P/EXTERIOR","account_template_550","view","receita","True"
-"account_template_562","4.1.01.03.0001","Venda de Produtos Fabricação Própria(EX)","account_template_561","receivable","receita","True"
-"account_template_563","4.1.01.03.0002","Revenda de Mercadorias (EX)","account_template_561","receivable","receita","True"
+"account_template_562","4.1.01.03.0001","Venda de Produtos Fabricação Própria(EX)","account_template_561","other","receita","True"
+"account_template_563","4.1.01.03.0002","Revenda de Mercadorias (EX)","account_template_561","other","receita","True"
"account_template_564","4.1.02","(-) DEDUÇÕES DA RECEITA BRUTA","account_template_549","view","receita","True"
"account_template_565","4.1.02.01","DEVOLUÇÕES E ABATIMENTOS","account_template_564","view","receita","True"
-"account_template_566","4.1.02.01.0001","Devolução de Vendas","account_template_565","receivable","receita","True"
-"account_template_567","4.1.02.01.0002","Abatimentos Concedidos","account_template_565","receivable","receita","True"
-"account_template_568","4.1.02.01.0003","Devolução de Vendas","account_template_565","receivable","receita","True"
-"account_template_569","4.1.02.01.0004","Abatimentos Concedidos","account_template_565","receivable","receita","True"
+"account_template_566","4.1.02.01.0001","Devolução de Vendas","account_template_565","other","receita","True"
+"account_template_567","4.1.02.01.0002","Abatimentos Concedidos","account_template_565","other","receita","True"
+"account_template_568","4.1.02.01.0003","Devolução de Vendas","account_template_565","other","receita","True"
+"account_template_569","4.1.02.01.0004","Abatimentos Concedidos","account_template_565","other","receita","True"
"account_template_570","4.1.02.02","IMPOSTOS SOBRE VENDAS E SERVIÇOS","account_template_564","view","receita","True"
-"account_template_571","4.1.02.02.0001","ICMS sobre Vendas","account_template_570","receivable","receita","True"
-"account_template_572","4.1.02.02.0002","IPI sobre Vendas","account_template_570","receivable","receita","True"
-"account_template_573","4.1.02.02.0003","PIS sobre Vendas ","account_template_570","receivable","receita","True"
-"account_template_574","4.1.02.02.0004","COFINS sobre Vendas","account_template_570","receivable","receita","True"
-"account_template_575","4.1.02.02.0005","ISS sobre Serviços","account_template_570","receivable","receita","True"
+"account_template_571","4.1.02.02.0001","ICMS sobre Vendas","account_template_570","other","receita","True"
+"account_template_572","4.1.02.02.0002","IPI sobre Vendas","account_template_570","other","receita","True"
+"account_template_573","4.1.02.02.0003","PIS sobre Vendas ","account_template_570","other","receita","True"
+"account_template_574","4.1.02.02.0004","COFINS sobre Vendas","account_template_570","other","receita","True"
+"account_template_575","4.1.02.02.0005","ISS sobre Serviços","account_template_570","other","receita","True"
"account_template_579","4.1.02.03","(-) IMPOSTOS S/ DEVOLUÇÃO DE VENDAS","account_template_564","view","receita","True"
-"account_template_580","4.1.02.03.0001","(-) Cofins Não-Cumulativo s/ Dev. Vendas","account_template_579","receivable","receita","True"
-"account_template_581","4.1.02.03.0002","(-) ICMS sobre Devolução de Vendas","account_template_579","receivable","receita","True"
-"account_template_582","4.1.02.03.0003","(-) IPI s/Devolução de Vendas","account_template_579","receivable","receita","True"
-"account_template_583","4.1.02.03.0004","(-) Pis Não-Cumulativo s/ Dev. Vendas","account_template_579","receivable","receita","True"
+"account_template_580","4.1.02.03.0001","(-) Cofins Não-Cumulativo s/ Dev. Vendas","account_template_579","other","receita","True"
+"account_template_581","4.1.02.03.0002","(-) ICMS sobre Devolução de Vendas","account_template_579","other","receita","True"
+"account_template_582","4.1.02.03.0003","(-) IPI s/Devolução de Vendas","account_template_579","other","receita","True"
+"account_template_583","4.1.02.03.0004","(-) Pis Não-Cumulativo s/ Dev. Vendas","account_template_579","other","receita","True"
"account_template_584","4.1.03","RECEITAS FINANCEIRAS","account_template_549","view","receita","True"
"account_template_585","4.1.03.01","RECEITAS COM ATUALIZAÇÕES","account_template_584","view","receita","True"
-"account_template_586","4.1.03.01.0001","Variação Monetária Ativa","account_template_585","receivable","receita","True"
-"account_template_587","4.1.03.01.0002","Variação Cambial Ativa","account_template_585","receivable","receita","True"
+"account_template_586","4.1.03.01.0001","Variação Monetária Ativa","account_template_585","other","receita","True"
+"account_template_587","4.1.03.01.0002","Variação Cambial Ativa","account_template_585","other","receita","True"
"account_template_588","4.1.03.02","GANHOS COM APLICAÇÕES FINANCEIRAS","account_template_584","view","receita","True"
-"account_template_589","4.1.03.02.0001","Rend. Aplic.Automática C/Corrente","account_template_588","receivable","receita","True"
-"account_template_590","4.1.03.02.0002","Ganho Real Aplicações Renda Fixa","account_template_588","receivable","receita","True"
-"account_template_591","4.1.03.02.0003","Ganho Real Aplic.Renda Variável","account_template_588","receivable","receita","True"
-"account_template_592","4.1.03.02.0004","Rendimento Caderneta de Poupança","account_template_588","receivable","receita","True"
+"account_template_589","4.1.03.02.0001","Rend. Aplic.Automática C/Corrente","account_template_588","other","receita","True"
+"account_template_590","4.1.03.02.0002","Ganho Real Aplicações Renda Fixa","account_template_588","other","receita","True"
+"account_template_591","4.1.03.02.0003","Ganho Real Aplic.Renda Variável","account_template_588","other","receita","True"
+"account_template_592","4.1.03.02.0004","Rendimento Caderneta de Poupança","account_template_588","other","receita","True"
"account_template_593","4.1.03.03","JUROS E DESCONTOS OBTIDOS","account_template_584","view","receita","True"
-"account_template_594","4.1.03.03.0001","Juros Recebidos","account_template_593","receivable","receita","True"
-"account_template_595","4.1.03.03.0002","Descontos Obtidos","account_template_593","receivable","receita","True"
+"account_template_594","4.1.03.03.0001","Juros Recebidos","account_template_593","other","receita","True"
+"account_template_595","4.1.03.03.0002","Descontos Obtidos","account_template_593","other","receita","True"
"account_template_596","4.1.03.04","(-) TRIBUTOS S/RECEITAS FINANCEIRAS","account_template_584","view","receita","True"
-"account_template_597","4.1.03.04.0001","PIS sobre Receitas Financeiras","account_template_596","receivable","receita","True"
-"account_template_598","4.1.03.04.0002","COFINS sobre Receitas Financeiras","account_template_596","receivable","receita","True"
+"account_template_597","4.1.03.04.0001","PIS sobre Receitas Financeiras","account_template_596","other","receita","True"
+"account_template_598","4.1.03.04.0002","COFINS sobre Receitas Financeiras","account_template_596","other","receita","True"
"account_template_599","4.1.04","OUTRAS RECEITAS OPERACIONAIS","account_template_549","view","receita","True"
"account_template_600","4.1.04.01","LUCROS PARTIC.EM OUTRAS SOCIEDADES","account_template_599","view","receita","True"
-"account_template_601","4.1.04.01.0001","Resultado de Coligadas e Controladas","account_template_600","receivable","receita","True"
+"account_template_601","4.1.04.01.0001","Resultado de Coligadas e Controladas","account_template_600","other","receita","True"
"account_template_602","4.1.04.02","VENDAS DIVERSAS","account_template_599","view","receita","True"
-"account_template_603","4.1.04.02.0001","Venda de Sucatas","account_template_602","receivable","receita","True"
+"account_template_603","4.1.04.02.0001","Venda de Sucatas","account_template_602","other","receita","True"
"account_template_604","4.1.04.03","BRINDES E AMOSTRAS","account_template_599","view","receita","True"
-"account_template_605","4.1.04.03.0001","Brindes e Bonificações","account_template_604","receivable","receita","True"
-"account_template_606","4.1.04.03.0002","Amostras","account_template_604","receivable","receita","True"
+"account_template_605","4.1.04.03.0001","Brindes e Bonificações","account_template_604","other","receita","True"
+"account_template_606","4.1.04.03.0002","Amostras","account_template_604","other","receita","True"
"account_template_607","4.2","RESULTADOS NÃO OPERACIONAIS","account_template_548","view","receita","True"
"account_template_608","4.2.01","ALIENAÇÃO DE BENS PERMANENTES","account_template_607","view","receita","True"
"account_template_609","4.2.01.01","ALIENAÇÃO DE INVESTIMENTOS","account_template_608","view","receita","True"
-"account_template_610","4.2.01.01.0001","Dividendos Recebidos","account_template_609","receivable","receita","True"
-"account_template_611","4.2.01.01.0002","Alienação Partic.Societárias","account_template_609","receivable","receita","True"
+"account_template_610","4.2.01.01.0001","Dividendos Recebidos","account_template_609","other","receita","True"
+"account_template_611","4.2.01.01.0002","Alienação Partic.Societárias","account_template_609","other","receita","True"
"account_template_612","4.2.01.02","ALIENAÇÃO DE IMOBILIZADO","account_template_608","view","receita","True"
-"account_template_613","4.2.01.02.0001","Alienação de Máquinas e Equipamentos","account_template_612","receivable","receita","True"
-"account_template_614","4.2.01.02.0002","Alienação de Móveis e Utensílios","account_template_612","receivable","receita","True"
-"account_template_615","4.2.01.02.0003","Alienação de Ferramentas","account_template_612","receivable","receita","True"
-"account_template_616","4.2.01.02.0004","Alienação de Imóveis","account_template_612","receivable","receita","True"
-"account_template_617","4.2.01.02.0005","Alienação de Veículos","account_template_612","receivable","receita","True"
-"account_template_618","4.2.01.02.0006","Alienação de Equip.de Informática","account_template_612","receivable","receita","True"
+"account_template_613","4.2.01.02.0001","Alienação de Máquinas e Equipamentos","account_template_612","other","receita","True"
+"account_template_614","4.2.01.02.0002","Alienação de Móveis e Utensílios","account_template_612","other","receita","True"
+"account_template_615","4.2.01.02.0003","Alienação de Ferramentas","account_template_612","other","receita","True"
+"account_template_616","4.2.01.02.0004","Alienação de Imóveis","account_template_612","other","receita","True"
+"account_template_617","4.2.01.02.0005","Alienação de Veículos","account_template_612","other","receita","True"
+"account_template_618","4.2.01.02.0006","Alienação de Equip.de Informática","account_template_612","other","receita","True"
"account_template_619","4.2.02","DEDUÇÕES DAS ALIENAÇÕES DE BENS","account_template_607","view","receita","True"
"account_template_620","4.2.02.01","CUSTO DA ALIENAÇÃO DE INVESTIMENTOS","account_template_619","view","receita","True"
-"account_template_621","4.2.02.01.0001","Custo Alienação Partic.Societárias","account_template_620","receivable","receita","True"
+"account_template_621","4.2.02.01.0001","Custo Alienação Partic.Societárias","account_template_620","other","receita","True"
"account_template_622","4.2.02.02","CUSTO DA ALIENAÇÃO DE IMOBILIZADO","account_template_619","view","receita","True"
-"account_template_623","4.2.02.02.0001","Custo Alienação Máqs.e Equipamentos","account_template_622","receivable","receita","True"
-"account_template_624","4.2.02.02.0002","Custo Alienação Movs.e Utensílios","account_template_622","receivable","receita","True"
-"account_template_625","4.2.02.02.0003","Custo Alienação Ferramentas","account_template_622","receivable","receita","True"
-"account_template_626","4.2.02.02.0004","Custo Alienação de Imóveis","account_template_622","receivable","receita","True"
-"account_template_627","4.2.02.02.0005","Custo Alienação de Veículos","account_template_622","receivable","receita","True"
-"account_template_628","4.2.02.02.0006","Custo Alienação Equip.Informática","account_template_622","receivable","receita","True"
+"account_template_623","4.2.02.02.0001","Custo Alienação Máqs.e Equipamentos","account_template_622","other","receita","True"
+"account_template_624","4.2.02.02.0002","Custo Alienação Movs.e Utensílios","account_template_622","other","receita","True"
+"account_template_625","4.2.02.02.0003","Custo Alienação Ferramentas","account_template_622","other","receita","True"
+"account_template_626","4.2.02.02.0004","Custo Alienação de Imóveis","account_template_622","other","receita","True"
+"account_template_627","4.2.02.02.0005","Custo Alienação de Veículos","account_template_622","other","receita","True"
+"account_template_628","4.2.02.02.0006","Custo Alienação Equip.Informática","account_template_622","other","receita","True"
"account_template_629","4.2.03","OUTRAS RECEITAS NÃO OPERACIONAIS","account_template_607","view","receita","True"
"account_template_630","4.2.03.01","INDENIZAÇÃO DE SEGUROS","account_template_629","view","receita","True"
-"account_template_631","4.2.03.01.0001","Indenização de Seguros","account_template_630","receivable","receita","True"
+"account_template_631","4.2.03.01.0001","Indenização de Seguros","account_template_630","other","receita","True"
"account_template_632","4.2.03.02","OUTRAS RECEITAS","account_template_629","view","receita","True"
-"account_template_633","4.2.03.02.0001","Recuperação de Despesas","account_template_632","receivable","receita","True"
+"account_template_633","4.2.03.02.0001","Recuperação de Despesas","account_template_632","other","receita","True"
"account_template_634","5","CONTAS DE FECHAMENTO DE BALANÇO","account_template_1","view","resultado","True"
"account_template_635","5.1","RESULTADO DO EXERCÍCIO","account_template_634","view","resultado","True"
"account_template_636","5.1.01","RESULTADO OPERACIONAL","account_template_635","view","resultado","True"
diff --git a/addons/l10n_br/data/account.account.type.csv b/addons/l10n_br/data/account.account.type.csv
index 4458859ae1f..9f3844cdd2e 100644
--- a/addons/l10n_br/data/account.account.type.csv
+++ b/addons/l10n_br/data/account.account.type.csv
@@ -1,7 +1,7 @@
"id","code","name","close_method"
"ativo","1","Ativo","unreconciled"
"passivo","2","Passivo","unreconciled"
-"despesa","3","Despesas","unreconciled"
-"receita","4","Receita","unreconciled"
+"despesa","3","Despesas","balance"
+"receita","4","Receita","balance"
"resultado","5","Resultado","balance"
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index 9d5031c2d15..cadd288c810 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -29,7 +29,7 @@
所有者权益类
4
- unreconciled
+ balance
liability
@@ -767,7 +767,7 @@
4103
- payable
+ other
本年利润
diff --git a/addons/l10n_de/account_chart_skr03.xml b/addons/l10n_de/account_chart_skr03.xml
index 187f0259dbb..7a7e1fb8ee0 100644
--- a/addons/l10n_de/account_chart_skr03.xml
+++ b/addons/l10n_de/account_chart_skr03.xml
@@ -1228,7 +1228,7 @@
1490
receivable
-
+
@@ -1732,7 +1732,7 @@
1401
receivable
-
+
@@ -1740,7 +1740,7 @@
1400
receivable
-
+
@@ -3164,7 +3164,7 @@
1450
receivable
-
+
@@ -3476,7 +3476,7 @@
1630
payable
-
+
@@ -3684,7 +3684,7 @@
1480
receivable
-
+
@@ -3836,7 +3836,7 @@
1650
payable
-
+
@@ -4836,7 +4836,7 @@
1470
receivable
-
+
@@ -4844,7 +4844,7 @@
1610
payable
-
+
@@ -5956,7 +5956,7 @@
1640
payable
-
+
@@ -7084,7 +7084,7 @@
1601
payable
-
+
@@ -7092,7 +7092,7 @@
1600
payable
-
+
@@ -7108,7 +7108,7 @@
1605
payable
-
+
@@ -7116,7 +7116,7 @@
1607
payable
-
+
@@ -7124,7 +7124,7 @@
1606
payable
-
+
@@ -7732,7 +7732,7 @@
1410
receivable
-
+
@@ -8404,7 +8404,7 @@
1446
receivable
-
+
@@ -8844,7 +8844,7 @@
1447
receivable
-
+
diff --git a/addons/l10n_de/account_chart_skr04.xml b/addons/l10n_de/account_chart_skr04.xml
index 8ca8f35b98f..09af6c20e28 100644
--- a/addons/l10n_de/account_chart_skr04.xml
+++ b/addons/l10n_de/account_chart_skr04.xml
@@ -3313,7 +3313,7 @@
receivable
-
+
@@ -3367,7 +3367,7 @@
receivable
-
+
@@ -3376,7 +3376,7 @@
receivable
-
+
@@ -3385,7 +3385,7 @@
receivable
-
+
@@ -3394,7 +3394,7 @@
receivable
-
+
@@ -3403,7 +3403,7 @@
receivable
-
+
@@ -3412,7 +3412,7 @@
receivable
-
+
@@ -3546,7 +3546,7 @@
receivable
-
+
@@ -3670,7 +3670,7 @@
receivable
-
+
@@ -3794,7 +3794,7 @@
receivable
-
+
@@ -6214,7 +6214,7 @@
payable
-
+
@@ -6223,7 +6223,7 @@
payable
-
+
@@ -6232,7 +6232,7 @@
payable
-
+
@@ -6241,7 +6241,7 @@
payable
-
+
@@ -6268,7 +6268,7 @@
payable
-
+
@@ -6304,7 +6304,7 @@
payable
-
+
@@ -6445,7 +6445,7 @@
payable
-
+
@@ -6525,7 +6525,7 @@
payable
-
+
diff --git a/addons/l10n_de/account_types_skr03.xml b/addons/l10n_de/account_types_skr03.xml
index 305c06413ee..5967999b601 100644
--- a/addons/l10n_de/account_types_skr03.xml
+++ b/addons/l10n_de/account_types_skr03.xml
@@ -26,14 +26,14 @@
Bilanzkonten - Aktiva - Vermögenskonten
balance asset
asset
- unreconciled
+ balance
Bilanzkonten - Passiva - Kapitalkonten
balance liability
liability
- unreconciled
+ balance
Jahresabschlusskonten u. Statistik
diff --git a/addons/l10n_de/account_types_skr04.xml b/addons/l10n_de/account_types_skr04.xml
index 305c06413ee..5967999b601 100644
--- a/addons/l10n_de/account_types_skr04.xml
+++ b/addons/l10n_de/account_types_skr04.xml
@@ -26,14 +26,14 @@
Bilanzkonten - Aktiva - Vermögenskonten
balance asset
asset
- unreconciled
+ balance
Bilanzkonten - Passiva - Kapitalkonten
balance liability
liability
- unreconciled
+ balance
Jahresabschlusskonten u. Statistik
From 17b98e058ccbf725d5fd7a1498b41831d9a86eb7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)"
Date: Fri, 23 Sep 2011 14:18:55 +0530
Subject: [PATCH 161/190] [IMP]Improve the code
bzr revid: dbr@tinyerp.com-20110923084855-j87vzna3gv39h6hm
---
addons/project/test/test_project.yml | 30 +++++++++----------
.../project/test/test_project_delegation.yml | 4 +--
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index 5cca325f0ab..c58dc2bb729 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -1,8 +1,3 @@
--
- I assign an email address to Administrator.
--
- !record {model: res.users, id: base.user_root}:
- user_email: admin@openerp.com
-
I test project template feature.
-
@@ -12,11 +7,10 @@
company_id: base.main_company
name: OpenERP Training Programm
-
- I create analytic account.
+ I assign an email address to Administrator for communications.
-
- !record {model: account.analytic.account, id: account_analytic_account0}:
- name : account_analytic_account
- partner_id: base.res_partner_asus
+ !record {model: res.users, id: base.user_root}:
+ user_email: admin@openerp.com
-
I create project 'OpenERP Training Programme'.
-
@@ -28,7 +22,13 @@
date_start: !eval time.strftime('%Y-%m-%d')
date: !eval time.strftime('%Y-%m-%d')
-
- I create task 'Technical Training' for this project.
+ I create analytic account for assigned partner in project.
+-
+ !record {model: account.analytic.account, id: account_analytic_account0}:
+ name : account_analytic_account
+ partner_id: base.res_partner_asus
+-
+ I create task 'Technical Training' for 'OpenERP Training Programme' project.
-
!record {model: project.task, id: project_task_technicaltraining0}:
date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
@@ -39,7 +39,7 @@
remaining_hours: 30.0
state: draft
-
- I create task 'Training' for this project.
+ I create task 'Training' for 'OpenERP Training Programme' project.
-
!record {model: project.task, id: project_task_child0}:
date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
@@ -49,7 +49,7 @@
remaining_hours: 30.0
state: done
-
- I create task 'Functional Training' for this project.
+ I create task 'Functional Training' for 'OpenERP Training Programme' project.
-
!record {model: project.task, id: project_task_functionaltraining0}:
date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
@@ -88,7 +88,7 @@
!python {model: project.task}: |
self.do_open(cr, uid,[ref("project_task_functionaltraining0")],context={})
-
- I check child project.
+ I check is there any child task assigned to 'Functional Training' task.
-
!python {model: project.task}: |
self._check_child_task(cr, uid, [ref("project_task_functionaltraining0")])
@@ -108,12 +108,12 @@
!python {model: project.task}: |
self._change_type(cr, uid,[ref("project_task_functionaltraining0")], next, context)
-
- I click on next Button for change the type of project task.
+ I click on next button for change the type of project task.
-
!python {model: project.task}: |
self.next_type(cr, uid,[ref("project_task_functionaltraining0")], context)
-
- I click on previous Button for go back to previous type of task.
+ I click on previous button for go back to previous type of task.
-
!python {model: project.task}: |
self.prev_type(cr, uid,[ref("project_task_functionaltraining0")], context)
diff --git a/addons/project/test/test_project_delegation.yml b/addons/project/test/test_project_delegation.yml
index 68cf5f7e0fd..682ef8ce75a 100644
--- a/addons/project/test/test_project_delegation.yml
+++ b/addons/project/test/test_project_delegation.yml
@@ -117,7 +117,7 @@
"tz": False, "active_id": ref("project.menu_action_view_task"), })
-
- Now, delegate task 'Develop book for Technical and Functional reference' to these tasks and make it pending.
+ I delegate task 'Develop book for Technical and Functional reference' to these tasks and make it pending.
-
!record {model: project.task, id: project_task_documentation_book}:
child_ids:
@@ -148,7 +148,7 @@
state: draft
-
- Now, delegate task 'Prepare a technical reference for creating your modules' to these tasks and make it pending.
+ I delegate task 'Prepare a technical reference for creating your modules' to these tasks and make it pending.
-
!record {model: project.task, id: project_task_delegate_developer_book}:
child_ids:
From 1d715a371fc7b94e70a79443263834b47059d9f0 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)"
Date: Fri, 23 Sep 2011 14:27:04 +0530
Subject: [PATCH 162/190] Set parent_id for project in right place
bzr revid: dbr@tinyerp.com-20110923085704-872zdzhtgxsojet3
---
addons/project/test/test_project.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index c58dc2bb729..21d55b49d37 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -11,6 +11,12 @@
-
!record {model: res.users, id: base.user_root}:
user_email: admin@openerp.com
+-
+ I create analytic account for assigned partner in project.
+-
+ !record {model: account.analytic.account, id: account_analytic_account0}:
+ name : account_analytic_account
+ partner_id: base.res_partner_asus
-
I create project 'OpenERP Training Programme'.
-
@@ -21,12 +27,6 @@
name: OpenERP Training Programme
date_start: !eval time.strftime('%Y-%m-%d')
date: !eval time.strftime('%Y-%m-%d')
--
- I create analytic account for assigned partner in project.
--
- !record {model: account.analytic.account, id: account_analytic_account0}:
- name : account_analytic_account
- partner_id: base.res_partner_asus
-
I create task 'Technical Training' for 'OpenERP Training Programme' project.
-
From 9a45e0560233a65d4476cac0f5d895d6fe4e0bbd Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Fri, 23 Sep 2011 11:35:15 +0200
Subject: [PATCH 163/190] [FIX] purchase: Specify the model in a record
bzr revid: stw@openerp.com-20110923093515-hb8ya17q09p941wa
---
addons/purchase/wizard/purchase_installer.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 68e03fc15f3..d6d08081930 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -29,7 +29,7 @@
Create or Import Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard
-
+
Purchase Management
5
From f93536a356d5633a363105ed973a48990f7e8f86 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)"
Date: Fri, 23 Sep 2011 15:08:20 +0530
Subject: [PATCH 164/190] [RMV]project_caldav: remove test file
bzr revid: dbr@tinyerp.com-20110923093820-3xfn39ju1dhq3w0c
---
addons/project/test/test_project.yml | 10 ++--
addons/project_caldav/__openerp__.py | 1 -
.../test/test_project_caldav.yml | 59 -------------------
3 files changed, 5 insertions(+), 65 deletions(-)
delete mode 100644 addons/project_caldav/test/test_project_caldav.yml
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index 21d55b49d37..970f5d4f5a1 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -39,7 +39,7 @@
remaining_hours: 30.0
state: draft
-
- I create task 'Training' for 'OpenERP Training Programme' project.
+ I create child task 'Training' of 'OpenERP Training Programme' project.
-
!record {model: project.task, id: project_task_child0}:
date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
@@ -154,7 +154,7 @@
!python {model: project.project}: |
self.onchange_partner_id(cr, uid, [ref("project_project_openerptrainingprogramme0")], part=ref('base.res_partner_asus'), context = {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_open_view_project_all")],"tz": False, "active_id": ref("project.menu_open_view_project_all")})
-
- I set project as project template.
+ I set 'OpenERP Training Programme' project as project template.
-
!python {model: project.project}: |
self.set_template(cr, uid, [ref("project_project_openerptrainingprogramme0")],
@@ -180,7 +180,7 @@
name = new_prj['name']
assert state == 'open', "Project in %s state. Project created from template project must be in open state"%state
-
- I reset project template to normal project.
+ I reset project template to normal project 'OpenERP Training Programme'.
-
!python {model: project.project}: |
self.reset_project(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
@@ -209,7 +209,7 @@
- state == "pending"
-
I cancel the project.
--
+-
!python {model: project.project}: |
self.set_cancel(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
[ref("project.menu_open_view_project_all")], "tz": False, "active_model":
@@ -255,7 +255,7 @@
!python {model: project.task.reevaluate}: |
self._get_remaining(cr, uid,{'active_id':ref('project_task_functionaltraining0') })
- |
- I click the apply button.
+ I click the apply button for compute hours.
-
!python {model: project.task.reevaluate}: |
self.compute_hours(cr, uid, [ref('project_task_technicaltraining_remainingwiz0')], {'active_id': ref("project_task_technicaltraining0"),'button_reactivate': True})
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 838914ba9e6..29c9ec4d483 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -34,7 +34,6 @@ on a remote server.
"depends": ["project", "caldav", "base_calendar"],
"init_xml": ["project_caldav_data.xml", 'project_caldav_setup.xml', ],
"demo_xml": [],
- "test": ['test/test_project_caldav.yml'],
"update_xml": ["project_caldav_view.xml"],
"active": False,
"website": "http://www.openerp.com",
diff --git a/addons/project_caldav/test/test_project_caldav.yml b/addons/project_caldav/test/test_project_caldav.yml
deleted file mode 100644
index 3ed1e6f38ec..00000000000
--- a/addons/project_caldav/test/test_project_caldav.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-- |
- Now Create test cases for project caldav
--
- I create task 'Training task' for this project.
--
- !record {model: project.task, id: project_task_technicaltasktraining}:
- date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
- name: Technical Training
- user_id: base.user_root
- planned_hours: 30.0
- date_deadline: !eval time.strftime('%Y-%m-%d 20:20:00')
- remaining_hours: 30.0
- state: draft
--
- Open the created task.
--
- !python {model: project.task}: |
- context.update({'model':'project.task','active_id': ref('project_task_technicaltasktraining')})
- self.open_task(cr, uid, [ref('project_task_technicaltasktraining')], context)
--
- Check the export functionality.
--
- !python {model: project.task}: |
- context.update({'model':'project.task','active_id': ref('project_task_technicaltasktraining')})
- self.export_cal(cr, uid, [ref('project_task_technicaltasktraining')], context)
--
- Check the Import functionality with the define date.
--
- !python {model: project.task}: |
- import time
- vals = []
- context.update({'model':'project.task','active_id': ref('project_task_technicaltasktraining')})
- vals.append({
- 'date': time.strftime('%Y-%m-%d 16:04:00'),
- 'date_deadline':time.strftime('%Y-%m-%d 20:20:00'),
- })
- try:
- self.check_import(cr, uid, vals, context)
- except:
- pass
--
- Check the export Import functionality with the planned hours.
--
- !python {model: project.task}: |
- import time
- vals = []
- context.update({'model':'project.task','active_id': ref('project_task_technicaltasktraining')})
- vals.append({
- 'date': time.strftime('%Y-%m-%d 16:04:00'),
- 'create_date': time.strftime('%Y-%m-%d 16:04:00'),
- 'date_deadline':time.strftime('%Y-%m-%d 20:20:00'),
- 'planned_hours':30.0,
- 'ids':ref('project_task_technicaltasktraining'),
- 'recurrent_id': time.strftime('%Y-%m-%d 50:00:00'),
- })
- try:
- self.check_import(cr, uid, vals, context)
- except:
- pass
From 9046fc6869d71ef76b5520213ae2497ce87112d8 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Fri, 23 Sep 2011 15:30:30 +0200
Subject: [PATCH 165/190] [IMP] delivery: Add the 'Setup your Delivery Steps'
wizard
bzr revid: stw@openerp.com-20110923133030-83kkxdu7kb3e8l6f
---
addons/delivery/delivery.py | 21 ++++++++++++++++++++-
addons/delivery/delivery_view.xml | 30 +++++++++++++++++++++++++++++-
2 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 55199a9aa19..94a21289925 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -238,6 +238,25 @@ class delivery_grid_line(osv.osv):
delivery_grid_line()
+class define_delivery_steps(osv.osv_memory):
+ _name = 'delivery.define.delivery.steps.wizard'
+
+ _columns = {
+ 'picking_policy' : fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery'),],
+ 'Picking Policy', required=True),
+ }
+
+ def apply_cb(self, cr, uid, ids, context=None):
+ ir_values_obj = self.pool.get('ir.values')
+
+ wizard = self.browse(cr, uid, ids, context=context)[0]
+
+ ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], wizard.picking_policy)
+
+ return {'type' : 'ir.actions.act_window_close'}
+
+define_delivery_steps()
+
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 4ade9b321a7..23147a2716f 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -72,7 +72,7 @@
- Delivery Method
+ Define Delivery Methods
ir.actions.act_window
delivery.carrier
form
@@ -332,8 +332,36 @@
+
10
+
+ delivery.define_delivery_steps
+ delivery.define.delivery.steps.wizard
+ form
+
+
+
+
+
+
+ Setup Your Delivery Steps
+ delivery.define.delivery.steps.wizard
+ form
+ form
+ new
+
+
+
+
+
From 556323758fdc7aa4882298f2809eb363dd14f15d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Fri, 23 Sep 2011 15:30:56 +0200
Subject: [PATCH 166/190] [FIX] Set the right categories and fix some bugs
bzr revid: stw@openerp.com-20110923133056-g4om6km431n83m07
---
addons/account/account_installer.xml | 17 ++++++++++++++--
addons/crm/crm_installer_view.xml | 3 ++-
addons/fetchmail_crm/installer.xml | 2 +-
addons/fetchmail_crm_claim/installer.xml | 2 +-
addons/fetchmail_hr_recruitment/installer.xml | 2 +-
addons/fetchmail_project_issue/installer.xml | 2 +-
addons/hr/hr_installer.xml | 2 +-
addons/mrp/mrp_installer.xml | 20 +++++++++++++++++--
addons/outlook/outlook_installer.xml | 3 +++
addons/stock/stock_view.xml | 4 ++++
addons/thunderbird/thunderbird_installer.xml | 6 ++++--
11 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 7a916f46520..361a371fb97 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -104,26 +104,39 @@
account.account
form
tree,form
-
+
+
+ Review your Financial Journal
+ ir.actions.act_window
+ account.journal
+ form
+ tree,form
+
+
+
+
+
+
+
Review your Payment Terms
ir.actions.act_window
account.payment.term
form
tree,form
-
+
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index cca8fc8560e..782083e4669 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -32,7 +32,6 @@
form
tree,form
-
Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost.
@@ -40,6 +39,7 @@
10
+
@@ -55,6 +55,7 @@
+
10
diff --git a/addons/fetchmail_crm/installer.xml b/addons/fetchmail_crm/installer.xml
index da5a4d840e0..def954eb286 100644
--- a/addons/fetchmail_crm/installer.xml
+++ b/addons/fetchmail_crm/installer.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/addons/fetchmail_crm_claim/installer.xml b/addons/fetchmail_crm_claim/installer.xml
index 8122b91c4be..232d95f6ea2 100644
--- a/addons/fetchmail_crm_claim/installer.xml
+++ b/addons/fetchmail_crm_claim/installer.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/addons/fetchmail_hr_recruitment/installer.xml b/addons/fetchmail_hr_recruitment/installer.xml
index 686d0c18b7b..f9dc497f357 100644
--- a/addons/fetchmail_hr_recruitment/installer.xml
+++ b/addons/fetchmail_hr_recruitment/installer.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/addons/fetchmail_project_issue/installer.xml b/addons/fetchmail_project_issue/installer.xml
index b0ca7b39c6f..300ffdc22d1 100644
--- a/addons/fetchmail_project_issue/installer.xml
+++ b/addons/fetchmail_project_issue/installer.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 8a9b1eefbb5..bd6e7ed3f6b 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -53,7 +53,6 @@
form
tree,form
-
Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.
@@ -61,6 +60,7 @@
3
+
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 5aab86f4b8f..af2a35b3ce7 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -32,12 +32,12 @@
mrp.workcenter
form,tree
form
-
+
@@ -52,5 +52,21 @@
-
+
+
+ Create or Import Products
+ ir.actions.act_window
+ product.product
+ form
+ tree,form
+
+ Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased.
+
+
+
+
+
+ 20
+
+
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 7eb6e2b0d68..a85a16c245b 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -75,5 +75,8 @@
+
+
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6a6566d8bf9..722bdd80f78 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1945,5 +1945,9 @@
groups="base.group_extended"
parent="menu_warehouse_config" />
+
+ Stock Management
+
+
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 2ab1d97fe46..cf23cdf45c1 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -75,8 +75,10 @@
{'menu':True}
-
-
+
+
+
+
From cc26f2b5d2fb7e1046989541ba292190901b6276 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu
Date: Fri, 23 Sep 2011 15:34:08 +0200
Subject: [PATCH 167/190] [IMP] tests: added a simple test case to create a
database via XML-RPC. The test setup starts an OpenERP server similarly to
the openerp-server script. For this to be possible, some of its code is moved
to openerp.services.
bzr revid: vmt@openerp.com-20110923133408-qqf4i5l86pkk7xn5
---
openerp-server | 41 +-----------------
openerp/service/__init__.py | 47 ++++++++++++++++++++
tests/__init__.py | 2 +
tests/test_xmlrpc.py | 85 +++++++++++++++++++++++++++++++++++++
4 files changed, 136 insertions(+), 39 deletions(-)
create mode 100644 tests/__init__.py
create mode 100644 tests/test_xmlrpc.py
diff --git a/openerp-server b/openerp-server
index c42651dc419..c86400be6d6 100755
--- a/openerp-server
+++ b/openerp-server
@@ -136,27 +136,6 @@ def import_translation():
cr.commit()
cr.close()
-def start_services():
- http_server = openerp.service.http_server
- netrpc_server = openerp.service.netrpc_server
-
- # Instantiate local services (this is a legacy design).
- openerp.osv.osv.start_object_proxy()
- # Export (for RPC) services.
- openerp.service.web_services.start_web_services()
-
- # Initialize the HTTP stack.
- http_server.init_servers()
- http_server.init_xmlrpc()
- http_server.init_static_http()
- netrpc_server.init_servers()
-
- # Start the main cron thread.
- openerp.netsvc.start_agent()
-
- # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
- openerp.netsvc.Server.startAll()
-
# Variable keeping track of the number of calls to the signal handler defined
# below. This variable is monitored by ``quit_on_signals()``.
quit_signals_received = 0
@@ -208,26 +187,10 @@ def quit_on_signals():
while quit_signals_received == 0:
time.sleep(60)
- openerp.netsvc.Agent.quit()
- openerp.netsvc.Server.quitAll()
- config = openerp.tools.config
if config['pidfile']:
os.unlink(config['pidfile'])
- logger = logging.getLogger('server')
- logger.info("Initiating shutdown")
- logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
- logging.shutdown()
- # manually join() all threads before calling sys.exit() to allow a second signal
- # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
- # threading.Thread.join() should not mask signals (at least in python 2.5)
- for thread in threading.enumerate():
- if thread != threading.currentThread() and not thread.isDaemon():
- while thread.isAlive():
- # need a busyloop here as thread.join() masks signals
- # and would present the forced shutdown
- thread.join(0.05)
- time.sleep(0.05)
+ openerp.service.stop_services()
sys.exit(0)
if __name__ == "__main__":
@@ -259,7 +222,7 @@ if __name__ == "__main__":
if not config["stop_after_init"]:
# Some module register themselves when they are loaded so we need the
# services to be running before loading any registry.
- start_services()
+ openerp.service.start_services()
if config['db_name']:
for dbname in config['db_name'].split(','):
diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index b9ee98fcab0..2a4c03a0892 100644
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -34,5 +34,52 @@ import web_services
low-level behavior of the wire.
"""
+def start_services():
+ import openerp
+ http_server = openerp.service.http_server
+ netrpc_server = openerp.service.netrpc_server
+
+ # Instantiate local services (this is a legacy design).
+ openerp.osv.osv.start_object_proxy()
+ # Export (for RPC) services.
+ openerp.service.web_services.start_web_services()
+
+ # Initialize the HTTP stack.
+ http_server.init_servers()
+ http_server.init_xmlrpc()
+ http_server.init_static_http()
+ netrpc_server.init_servers()
+
+ # Start the main cron thread.
+ openerp.netsvc.start_agent()
+
+ # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
+ openerp.netsvc.Server.startAll()
+
+def stop_services():
+ import openerp
+ import logging
+ import threading
+ import time
+ openerp.netsvc.Agent.quit()
+ openerp.netsvc.Server.quitAll()
+ config = openerp.tools.config
+ logger = logging.getLogger('server')
+ logger.info("Initiating shutdown")
+ logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
+ logging.shutdown()
+
+ # manually join() all threads before calling sys.exit() to allow a second signal
+ # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
+ # threading.Thread.join() should not mask signals (at least in python 2.5)
+ for thread in threading.enumerate():
+ if thread != threading.currentThread() and not thread.isDaemon():
+ while thread.isAlive():
+ # need a busyloop here as thread.join() masks signals
+ # and would present the forced shutdown
+ thread.join(0.05)
+ time.sleep(0.05)
+
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000000..396284efaf7
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import test_xmlrpc
diff --git a/tests/test_xmlrpc.py b/tests/test_xmlrpc.py
new file mode 100644
index 00000000000..30af863f12d
--- /dev/null
+++ b/tests/test_xmlrpc.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+# Run with one of these commands:
+# > OPENERP_ADDONS_PATH='../../addons/trunk' OPENERP_PORT=8069 \
+# OPENERP_DATABASE=yy PYTHONPATH=. python tests/test_xmlrpc.py
+# > OPENERP_ADDONS_PATH='../../addons/trunk' OPENERP_PORT=8069 \
+# OPENERP_DATABASE=yy nosetests tests/test_xmlrpc.py
+# > OPENERP_ADDONS_PATH='../../../addons/trunk' OPENERP_PORT=8069 \
+# OPENERP_DATABASE=yy PYTHONPATH=../:. unit2 test_xmlrpc
+import os
+import time
+import unittest2
+import xmlrpclib
+
+import openerp
+
+ADDONS_PATH = os.environ['OPENERP_ADDONS_PATH']
+PORT = int(os.environ['OPENERP_PORT'])
+DB = os.environ['OPENERP_DATABASE']
+
+HOST = '127.0.0.1'
+
+ADMIN_USER = 'admin'
+ADMIN_USER_ID = 1
+ADMIN_PASSWORD = 'admin'
+
+common_proxy_60 = None
+db_proxy_60 = None
+object_proxy_60 = None
+
+def setUpModule():
+ """
+ Start the OpenERP server similary to the openerp-server script and
+ setup some xmlrpclib proxies.
+ """
+ openerp.tools.config['addons_path'] = ADDONS_PATH
+ openerp.tools.config['xmlrpc_port'] = PORT
+ openerp.service.start_services()
+
+ global common_proxy_60
+ global db_proxy_60
+ global object_proxy_60
+
+ # Use the old (pre 6.1) API.
+ url = 'http://%s:%d/xmlrpc/' % (HOST, PORT)
+ common_proxy_60 = xmlrpclib.ServerProxy(url + 'common')
+ db_proxy_60 = xmlrpclib.ServerProxy(url + 'db')
+ object_proxy_60 = xmlrpclib.ServerProxy(url + 'object')
+
+def tearDownModule():
+ """ Shutdown the OpenERP server similarly to a single ctrl-c. """
+ openerp.service.stop_services()
+
+class test_xmlrpc(unittest2.TestCase):
+
+ def test_xmlrpc_create_database_polling(self):
+ """
+ Simulate a OpenERP client requesting the creation of a database and
+ polling the server until the creation is complete.
+ """
+ progress_id = db_proxy_60.create(ADMIN_PASSWORD, DB, True, False,
+ ADMIN_PASSWORD)
+ while True:
+ time.sleep(1)
+ progress, users = db_proxy_60.get_progress(ADMIN_PASSWORD,
+ progress_id)
+ if progress == 1.0:
+ break
+
+ def test_xmlrpc_login(self):
+ """ Try to login on the common service. """
+ uid = common_proxy_60.login(DB, ADMIN_USER, ADMIN_PASSWORD)
+ assert uid == ADMIN_USER_ID
+
+ def test_xmlrpc_ir_model_search(self):
+ """ Try a search on the object service. """
+ ids = object_proxy_60.execute(DB, ADMIN_USER_ID, ADMIN_PASSWORD,
+ 'ir.model', 'search', [])
+ assert ids
+ ids = object_proxy_60.execute(DB, ADMIN_USER_ID, ADMIN_PASSWORD,
+ 'ir.model', 'search', [], {})
+ assert ids
+
+if __name__ == '__main__':
+ unittest2.main()
+
From b51bf903f8a19ef81ee44baa225893284b1b03a4 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Fri, 23 Sep 2011 17:24:51 +0200
Subject: [PATCH 168/190] [IMP] purchase: Add the wizard 'Set the default
invoicing method'
bzr revid: stw@openerp.com-20110923152451-7g75qwlrelvqesq2
---
addons/purchase/wizard/purchase_installer.py | 24 +++++++++++++++
addons/purchase/wizard/purchase_installer.xml | 29 +++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index be99a41a3cc..c6d70947893 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -29,4 +29,28 @@ class purchase_installer(osv.osv_memory):
}
purchase_installer()
+class purchase_config_wizard(osv.osv_memory):
+ _name = 'purchase.config.wizard'
+
+ _columns = {
+ 'default_method' : fields.selection(
+ [('manual', 'Based on Purchase Orders'),
+ ('picking', 'Based on Receptions'),
+ ('order', 'Pre-Generate Draft Invoices on Purchase Orders'),
+ ],
+ 'Default Invoicing Control Method',
+ required=True,
+ ),
+ }
+
+ def validate_cb(self, cr, uid, ids, context=None):
+ wizard = self.browse(cr, uid, ids, context=context)[0]
+
+ proxy = self.pool.get('ir.values')
+ proxy.set(cr, uid, 'default', False, 'invoice_method', ['purchase.order'], wizard.default_method),
+
+ return {'type' : 'ir.actions.act_window_close'}
+
+purchase_config_wizard()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index d6d08081930..cf9b6a985db 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -38,5 +38,34 @@
+
+
+ purchase.view_purchase_config
+ form
+ purchase.config.wizard
+
+
+
+
+
+
+ Set the Default Invoicing Control Method
+ purchase.config.wizard
+ form
+ form
+ new
+
+
+
+
+
From 1a57a8505db481d03c85911ee3bcb6460f1cf1b2 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Fri, 23 Sep 2011 17:51:01 +0200
Subject: [PATCH 169/190] [FIX] purchase_double_validation: Set the right
module for the category_id field of the todo wizard
bzr revid: stw@openerp.com-20110923155101-y80yylrfkw1b9xsm
---
.../purchase_double_validation_installer.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index a0b5c3751bb..9a06f66164a 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -43,7 +43,7 @@
-
+
From e7808be8e400793a2dc4a3642f9d5cd101561122 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 24 Sep 2011 04:59:08 +0000
Subject: [PATCH 170/190] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110924045908-xta8vp8da3oamwq2
---
addons/account_budget/i18n/da.po | 441 ++++++
addons/auction/i18n/da.po | 2294 ++++++++++++++++++++++++++++++
addons/base_calendar/i18n/da.po | 1658 +++++++++++++++++++++
addons/base_iban/i18n/da.po | 92 ++
addons/base_tools/i18n/da.po | 32 +
addons/event/i18n/da.po | 1229 ++++++++++++++++
addons/share/i18n/da.po | 476 +++++++
7 files changed, 6222 insertions(+)
create mode 100644 addons/account_budget/i18n/da.po
create mode 100644 addons/auction/i18n/da.po
create mode 100644 addons/base_calendar/i18n/da.po
create mode 100644 addons/base_iban/i18n/da.po
create mode 100644 addons/base_tools/i18n/da.po
create mode 100644 addons/event/i18n/da.po
create mode 100644 addons/share/i18n/da.po
diff --git a/addons/account_budget/i18n/da.po b/addons/account_budget/i18n/da.po
new file mode 100644
index 00000000000..2050bea9d86
--- /dev/null
+++ b/addons/account_budget/i18n/da.po
@@ -0,0 +1,441 @@
+# 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-09-23 06:03+0000\n"
+"Last-Translator: FULL NAME \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-09-24 04:58+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
+#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
+msgid "Budgetary Positions"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Printed at:"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "at"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Currency:"
+msgstr "Valuta:"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr "Procentdel"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"A budget is a forecast of your company's income and expenses expected for a "
+"period in the future. With a budget, a company is able to carefully look at "
+"how much money they are taking in during a given period, and figure out the "
+"best way to divide it among various categories. By keeping track of where "
+"your money goes, you may be less likely to overspend, and more likely to "
+"meet your financial goals. Forecast a budget by detailing the expected "
+"revenue per analytic account and monitor its evolution based on the actuals "
+"realised during that period."
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+msgid "Theoritical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Linier"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Budget"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr ""
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.module.module,description:account_budget.module_meta_information
+msgid ""
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+" 1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+" 2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+" 3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Budget :"
+msgstr "Budget:"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr "Budget linier"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+#: view:crossovered.budget:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.module.module,shortdesc:account_budget.module_meta_information
+msgid "Budget Management"
+msgstr "Budget administration"
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr ""
diff --git a/addons/auction/i18n/da.po b/addons/auction/i18n/da.po
new file mode 100644
index 00000000000..17401e2bdaa
--- /dev/null
+++ b/addons/auction/i18n/da.po
@@ -0,0 +1,2294 @@
+# 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-09-23 14:47+0000\n"
+"Last-Translator: FULL NAME \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-09-24 04:58+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr "Sælger"
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr "SMS besked"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "Køber"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "Dato:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS send"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr "SMS sendt"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr "August"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr "Solgt"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr "Send SMS"
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr "Købere"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr "Betaling"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr "Faktureret"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr "Antal købere"
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Auction Management"
+msgstr "Auktions administration"
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object. "
+" \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold. \n"
+"* The 'Paid' state is used when user pay for the object \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr ""
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr "Auktion"
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr "September"
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr ""
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr ""
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr "Kort "
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr "Oversigt"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr "November"
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr "Nr."
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Cancel"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices For Seller"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr "Fakturanummer"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr "Bud"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr "Sælgere"
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr "SMS sendt "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr "Telefon"
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ")"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr "Betalt:"
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "Error!"
+msgstr "Fejl!"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,description:auction.module_meta_information
+msgid ""
+"\n"
+" This module manages the records of the artists,\n"
+" the articles to be put up for auction,the buyers and\n"
+" sellers.\n"
+"\n"
+" It completely manages an auction such as managing bids,\n"
+" keeping track of the sold articles along with the paid\n"
+" and unpaid objects including delivery of the articles.\n"
+" Dashboards for auction that includes:\n"
+" * My Latest Objects (list)\n"
+" * My Latest Deposits (list)\n"
+" * Objects Statistics (list)\n"
+" * My Objects By Day (list)\n"
+" "
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr "OK"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr ""
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr "December"
+
+#. module: auction
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+msgid "Open Bids"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr "Fejl"
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr ""
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr "April"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr ""
diff --git a/addons/base_calendar/i18n/da.po b/addons/base_calendar/i18n/da.po
new file mode 100644
index 00000000000..8bce8ed434c
--- /dev/null
+++ b/addons/base_calendar/i18n/da.po
@@ -0,0 +1,1658 @@
+# 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-09-23 15:56+0000\n"
+"Last-Translator: FULL NAME \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-09-24 04:59+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "Hver time"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Månedligt"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Søndag"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Marts"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel!"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Fredag"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Hele dagen"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr "Ledig"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Ons."
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Tir."
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "Årligt"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr "Sidste"
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Rum"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Dage"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr "Fejl!"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minutter"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+" - Calendar of events\n"
+" - Alerts (create requests)\n"
+" - Recurring events\n"
+" - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr "År"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Warning!"
+msgstr "Advarsel!"
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr "Før"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr "Søn."
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr "Synlighed"
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "Juli"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "Accepteret"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr "Tor."
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr "For altid"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr "Oprettet"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "Privat"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "Dagligt"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete description of the "
+"calendar component, than that provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences: "
+" FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be used as the message subject for "
+"email or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource, which is rendered when the "
+"alarm is triggered for audio,\n"
+" * File which is intended to be sent as message "
+"attachments for email,\n"
+" * Points to a procedure resource, which is invoked when "
+" the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_iban/i18n/da.po b/addons/base_iban/i18n/da.po
new file mode 100644
index 00000000000..8ff987c7e56
--- /dev/null
+++ b/addons/base_iban/i18n/da.po
@@ -0,0 +1,92 @@
+# 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-09-23 16:04+0000\n"
+"Last-Translator: FULL NAME \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-09-24 04:58+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr ""
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:120
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr ""
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr ""
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkonti"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr ""
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:121
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr ""
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr ""
+
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for its validity.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr ""
diff --git a/addons/base_tools/i18n/da.po b/addons/base_tools/i18n/da.po
new file mode 100644
index 00000000000..14effb86350
--- /dev/null
+++ b/addons/base_tools/i18n/da.po
@@ -0,0 +1,32 @@
+# 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-09-23 15:37+0000\n"
+"Last-Translator: FULL NAME \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-09-24 04:59+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr ""
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+" "
+msgstr ""
+"\n"
+" "
diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po
new file mode 100644
index 00000000000..3e36a6a53ee
--- /dev/null
+++ b/addons/event/i18n/da.po
@@ -0,0 +1,1229 @@
+# 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-09-23 14:35+0000\n"
+"Last-Translator: FULL NAME \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-09-24 04:58+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+
+#. module: event
+#: view:event.event:0
+msgid "Invoice Information"
+msgstr "Faktura information"
+
+#. module: event
+#: help:event.event,register_max:0
+msgid "Provide Maximun Number of Registrations"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event Details"
+msgstr ""
+
+#. module: event
+#: field:event.event,main_speaker_id:0
+msgid "Main Speaker"
+msgstr "Hovedtaler"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "Group By..."
+msgstr ""
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Confirmation for Event Registration"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,title:0
+msgid "Title"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_confirm_registration
+msgid "Make Invoices"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Registration Date"
+msgstr ""
+
+#. module: event
+#: help:event.event,main_speaker_id:0
+msgid "Speaker who are giving speech on event."
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Close"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_0
+msgid "Concert of Bon Jovi"
+msgstr ""
+
+#. module: event
+#: help:event.event,unit_price:0
+msgid ""
+"This will be the default price used as registration cost when invoicing this "
+"event. Note that you can specify for each registration a specific amount if "
+"you want to"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:63
+#, python-format
+msgid "Registration doesn't have any partner to invoice."
+msgstr ""
+
+#. module: event
+#: field:event.event,company_id:0
+#: field:event.registration,company_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: event
+#: field:event.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Faktura dato"
+
+#. module: event
+#: code:addons/event/wizard/partner_event_registration.py:93
+#: view:event.registration:0
+#: model:ir.actions.act_window,name:event.action_partner_event_registration
+#: model:ir.model,name:event.model_event_registration
+#: view:partner.event.registration:0
+#, python-format
+msgid "Event Registration"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 7 Days"
+msgstr "Seneste 7 dage"
+
+#. module: event
+#: field:event.event,parent_id:0
+msgid "Parent Event"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_make_invoices
+msgid "Make Invoice"
+msgstr ""
+
+#. module: event
+#: field:event.registration,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Current Events"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_report_event_registration
+#: model:ir.model,name:event.model_report_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+#: view:report.event.registration:0
+msgid "Events Analysis"
+msgstr ""
+
+#. module: event
+#: field:event.registration,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:122
+#: view:event.event:0
+#, python-format
+msgid "Confirm Event"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: event
+#: field:event.event,reply_to:0
+msgid "Reply-To"
+msgstr "Svar til"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.open_board_associations_manager
+msgid "Event Dashboard"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_1
+msgid "Opera of Verdi"
+msgstr ""
+
+#. module: event
+#: field:event.event,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration_badge
+msgid "event.registration.badge"
+msgstr ""
+
+#. module: event
+#: field:event.registration,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: event
+#: help:event.event,date_end:0
+#: help:partner.event.registration,end_date:0
+msgid "Closing Date of Event"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Emails"
+msgstr "E-mails"
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "Ekstra information"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:83
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:report.event.registration,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: event
+#: field:event.type,name:0
+msgid "Event type"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_type
+msgid " Event Type "
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,event_id:0
+#: model:ir.model,name:event.model_event_event
+#: model:ir.module.module,shortdesc:event.module_meta_information
+#: field:partner.event.registration,event_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,event_id:0
+#: view:res.partner:0
+msgid "Event"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,badge_ids:0
+msgid "Badges"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: selection:event.event,state:0
+#: view:event.registration:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: event
+#: view:event.confirm.registration:0
+msgid "Registration Confirmation"
+msgstr ""
+
+#. module: event
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr ""
+
+#. module: event
+#: help:event.event,product_id:0
+msgid ""
+"The invoices of this event registration will be created with this Product. "
+"Thus it allows you to set the default label and the accounting info you want "
+"by default on these invoices."
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Misc"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,speaker_ids:0
+msgid "Other Speakers"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_make_invoice
+msgid "Event Make Invoice"
+msgstr ""
+
+#. module: event
+#: help:event.registration,nb_register:0
+msgid "Number of Registrations or Tickets"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Location"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Reply"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_current:0
+#: view:report.event.registration:0
+msgid "Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr ""
+
+#. module: event
+#: field:event.event,type:0
+#: field:partner.event.registration,event_type:0
+msgid "Type"
+msgstr ""
+
+#. module: event
+#: field:event.registration,email_from:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:394
+#, python-format
+msgid "Error !"
+msgstr "Fejl!"
+
+#. module: event
+#: field:event.registration,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "Cancel Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:395
+#, python-format
+msgid "Registered partner doesn't have an address to make the invoice."
+msgstr ""
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Quantity"
+msgstr ""
+
+#. module: event
+#: help:event.event,type:0
+msgid "Type of Event like Seminar, Exhibition, Conference, Training."
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confimed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+
+#. module: event
+#: help:event.event,register_prospect:0
+msgid "Total of Prospect Registrati./event/event.py:41:ons"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Organization"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "History Information"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "Datoer"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+msgid "Confirm Anyway"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_confirm_registration.py:54
+#, python-format
+msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
+msgid "Registration"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,nbevent:0
+msgid "Number Of Events"
+msgstr ""
+
+#. module: event
+#: help:event.event,state:0
+msgid ""
+"If event is created, the state is 'Draft'.If event is confirmed for the "
+"particular dates the state is set to 'Confirmed'. If the event is over, the "
+"state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Contact"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 30 Days"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,partner_id:0
+#: model:ir.model,name:event.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_reg
+#: view:report.event.registration:0
+msgid "Events Filling Status"
+msgstr ""
+
+#. module: event
+#: field:event.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: field:event.event,register_prospect:0
+msgid "Unconfirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr ""
+
+#. module: event
+#: field:event.registration,log_ids:0
+msgid "Logs"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+#: field:event.registration,state:0
+#: view:report.event.registration:0
+#: field:report.event.registration,state:0
+msgid "State"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "September"
+msgstr "September"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "December"
+msgstr "December"
+
+#. module: event
+#: field:event.registration,event_product:0
+msgid "Invoice Name"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid " # No of Draft Registrations"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr ""
+
+#. module: event
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of Event.\n"
+"\n"
+" This module allow you\n"
+" * to manage your events and their registrations\n"
+" * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+" * ...\n"
+" A dashboard for associations that includes:\n"
+" * Registration by Events (graph)\n"
+" Note that:\n"
+" - You can define new types of events in\n"
+" Events / Configuration / Types of Events\n"
+" - You can access predefined reports about number of registration per "
+"event or per event category in:\n"
+" Events / Reporting\n"
+msgstr ""
+
+#. module: event
+#: field:event.confirm.registration,msg:0
+msgid "Message"
+msgstr ""
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr ""
+
+#. module: event
+#: field:event.registration,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:357
+#: view:report.event.registration:0
+#, python-format
+msgid "Invoiced"
+msgstr "Faktureret"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+msgid "My Events"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Speakers"
+msgstr ""
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: event
+#: help:event.registration,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: event
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Beginning Date"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+#: model:ir.ui.menu,name:event.menu_board_associations_manager
+#: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.menu,name:event.menu_event_event_assiciation
+#: view:res.partner:0
+msgid "Events"
+msgstr ""
+
+#. module: event
+#: field:partner.event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr ""
+
+#. module: event
+#: field:event.event,child_ids:0
+msgid "Child Events"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "August"
+msgstr "August"
+
+#. module: event
+#: field:res.partner,event_ids:0
+#: field:res.partner,event_registration_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use the automatic mailing for new registration"
+msgstr ""
+
+#. module: event
+#: field:event.registration,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "My Registrations"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+msgid ""
+"Warning: This Event has not reached its Minimum Registration Limit. Are you "
+"sure you want to confirm it?"
+msgstr ""
+
+#. module: event
+#: field:event.registration,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: event
+#: help:event.event,reply_to:0
+msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,language:0
+msgid "Language"
+msgstr "Sprog"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,email_cc:0
+msgid "CC"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: event
+#: help:event.registration,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:472
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Confirm Registration"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+#: view:res.partner:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: event
+#: model:ir.ui.menu,name:event.board_associations
+msgid "Dashboard"
+msgstr "Oversigt"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmation Email Body"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: event
+#: field:event.event,address_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+#: model:ir.ui.menu,name:event.menu_event_type_association
+msgid "Types of Events"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Attachments"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:59
+#, python-format
+msgid "Event related doesn't have any product defined"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 365 Days"
+msgstr "Sidste 365 dage"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:442
+#: selection:event.event,state:0
+#: view:event.make.invoice:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: event
+#: field:event.event,date_begin:0
+msgid "Beginning date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: event
+#: code:addons/event/event.py:517
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+#: view:event.make.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event by Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:432
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: event
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:538
+#: code:addons/event/event.py:545
+#, python-format
+msgid "Auto Confirmation: [%s] %s"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,user_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: event
+#: field:event.event,unit_price:0
+#: view:event.registration:0
+#: field:partner.event.registration,unit_price:0
+msgid "Registration Cost"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Current"
+msgstr ""
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "Enhedspris"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,speaker_id:0
+#: field:res.partner,speaker:0
+msgid "Speaker"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Details"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_2
+msgid "Conference on ERP Buisness"
+msgstr ""
+
+#. module: event
+#: field:event.event,section_id:0
+#: field:event.registration,section_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: event
+#: field:partner.event.registration,start_date:0
+msgid "Start date"
+msgstr ""
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:partner.event.registration,end_date:0
+msgid "Closing date"
+msgstr ""
+
+#. module: event
+#: field:event.event,product_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,product_id:0
+msgid "Product"
+msgstr "Vare"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,note:0
+#: view:event.registration:0
+#: field:event.registration,description:0
+msgid "Description"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,confirm_state:0
+msgid " # No of Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: event
+#: view:res.partner:0
+msgid "Events Registration"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,address_id:0
+msgid "Address"
+msgstr "Adresse"
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_view
+msgid "Next Events"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Subcribe"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid " event Registration "
+msgstr ""
+
+#. module: event
+#: help:event.event,date_begin:0
+#: help:partner.event.registration,start_date:0
+msgid "Beginning Date of Event"
+msgstr ""
+
+#. module: event
+#: selection:event.registration,state:0
+msgid "Unconfirmed"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:542
+#, python-format
+msgid "Auto Registration: [%s] %s"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: event
+#: view:board.board:0
+msgid "Association Dashboard"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.registration.badge,name:0
+msgid "Name"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want ot use the automatic confirmation emailing or the "
+"reminder"
+msgstr ""
+
+#. module: event
+#: field:event.event,country_id:0
+msgid "Country"
+msgstr "Land"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:55
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:500
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Close Registration"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "April"
+msgstr "April"
+
+#. module: event
+#: field:event.event,name:0
+#: field:event.registration,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.type:0
+#: view:report.event.registration:0
+#: field:report.event.registration,type:0
+msgid "Event Type"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,registration_ids:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration_association
+msgid "Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,date:0
+msgid "Event Start Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Registration Email Body"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event For Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:51
+#, python-format
+msgid "Invoice cannot be created if the registration is in %s state."
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: model:ir.actions.act_window,name:event.action_event_confirm
+#: model:ir.model,name:event.model_event_confirm
+msgid "Event Confirmation"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:report.event.registration:0
+#: field:report.event.registration,total:0
+msgid "Total"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_min:0
+msgid "Providee Minimum Number of Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,speaker_confirmed:0
+msgid "Speaker Confirmed"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid ""
+"Event is the low level object used by meeting and others documents that "
+"should be synchronized with mobile devices or calendar applications through "
+"caldav. Most of the users should work in the Calendar menu, and not in the "
+"list of events."
+msgstr ""
diff --git a/addons/share/i18n/da.po b/addons/share/i18n/da.po
new file mode 100644
index 00000000000..d4839ed6e84
--- /dev/null
+++ b/addons/share/i18n/da.po
@@ -0,0 +1,476 @@
+# 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-09-23 17:42+0000\n"
+"Last-Translator: FULL NAME \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-09-24 04:59+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:462
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr ""
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:275
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:458
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:452
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:149
+#, python-format
+msgid "%s (Shared)"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:418
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:459
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Adgangskode"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+" "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:463
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:460
+#, python-format
+msgid "Database"
+msgstr "Database"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:304
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:240
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:314
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:454
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+" %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:313
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:323
+#, python-format
+msgid "*usual password*"
+msgstr ""
From 44719f5d5f2ef487c50fd422e24cf152733a5e23 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 11:17:26 +0200
Subject: [PATCH 171/190] fix
bzr revid: fp@tinyerp.com-20110924091726-gnqdy6oqqt7ytq64
---
addons/crm/wizard/crm_lead_to_partner.py | 1 +
.../crm_partner_to_opportunity_view.xml | 19 +++++++++----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 790c6222de6..88ccacffef5 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -158,6 +158,7 @@ class crm_lead2partner(osv.osv_memory):
'name': lead.partner_name or lead.contact_name or lead.name,
'user_id': lead.user_id.id,
'comment': lead.description,
+ 'address': []
})
contact_obj.create(cr, uid, {
'partner_id': partner_id,
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 762303f06ba..1111bbbbc50 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -31,17 +31,16 @@
form
form
new
-
+
-
+
-
-
-
+
+
From cc4c16a8218e85521c890953768d72d2ed81a8fe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 11:24:08 +0200
Subject: [PATCH 172/190] [FIX] 821287
bzr revid: fp@tinyerp.com-20110924092408-35xnrb3yw2caqqnb
---
.../report/report_account_invoice_layout.rml | 4 ----
.../account_invoice_layout/report/special_message_invoice.rml | 4 ----
2 files changed, 8 deletions(-)
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 4e6bdfd0aa0..6b10b7b6d8f 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -182,8 +182,6 @@
-
-
@@ -203,7 +201,6 @@
|
-
[[ repeatIn(objects,'o') ]]
[[ setLang(o.partner_id.lang) ]]
@@ -505,6 +502,5 @@
-
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index eabb8efe9c2..609c73c36ac 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -186,8 +186,6 @@
-
-
@@ -207,7 +205,6 @@
|
-
[[ repeatIn(objects,'o') ]]
[[ setLang(o.partner_id.lang) ]]
@@ -523,6 +520,5 @@
-
From 9ff918dd059902fcf770865058a9aadeff1db5fa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 11:27:59 +0200
Subject: [PATCH 173/190] [IMP] useability invoice layout
bzr revid: fp@tinyerp.com-20110924092759-ewko8ohn47p9qdp5
---
.../account_invoice_layout_report.xml | 32 ++++-----
.../test/account_invoice_layout_report.yml | 17 +----
.../account_invoice_special_message.xml | 72 +++++++++----------
3 files changed, 54 insertions(+), 67 deletions(-)
diff --git a/addons/account_invoice_layout/account_invoice_layout_report.xml b/addons/account_invoice_layout/account_invoice_layout_report.xml
index ba7f44f0661..d5148b41cd3 100644
--- a/addons/account_invoice_layout/account_invoice_layout_report.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_report.xml
@@ -1,21 +1,21 @@
-
+
-
-
-
+
+
+
-
+
diff --git a/addons/account_invoice_layout/test/account_invoice_layout_report.yml b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
index 91967358a3d..61ca39c654b 100644
--- a/addons/account_invoice_layout/test/account_invoice_layout_report.yml
+++ b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
@@ -1,22 +1,9 @@
--
- In order to Print the Invoice layout report in Normal Mode, we will create a invoice record
--
- !record {model: account.invoice, id: test_invoice_1}:
- currency_id: base.EUR
- company_id: base.main_company
- address_invoice_id: base.res_partner_address_tang
- partner_id: base.res_partner_asus
- state: draft
- type: out_invoice
- account_id: account.a_recv
- name: Test invoice 1
- address_contact_id: base.res_partner_address_tang
-
Print the Invoice layout report in Normal Mode
-
!python {model: account.invoice}: |
import netsvc, tools, os
- (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('test_invoice_1')], {}, {})
+ (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('account.demo_invoice_0')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout.'+format), 'wb+').write(data)
@@ -25,7 +12,7 @@
-
!python {model: account.invoice}: |
ctx={}
- ctx.update({'model': 'account.invoice','active_ids': [ref('test_invoice_1')]})
+ ctx.update({'model': 'account.invoice','active_ids': [ref('account.demo_invoice_0')]})
data_dict = {'message':ref('account_invoice_layout.demo_message1')}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_invoice_special_msg',wiz_data=data_dict, context=ctx, our_module='account_invoice_layout')
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
index b1cf7357241..d849595bfca 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -2,43 +2,43 @@
-
- Account Invioce Special Message
- account.invoice.special.msg
- form
-
-
-
-
+
+ Account Invioce Special Message
+ account.invoice.special.msg
+ form
+
+
+
+
-
- Invoices with Layout and Message
- ir.actions.act_window
- account.invoice.special.msg
- form
- form
-
- new
-
+
+ Invoices and Message
+ ir.actions.act_window
+ account.invoice.special.msg
+ form
+ form
+
+ new
+
-
-
-
- Account Invioce Special Message
- client_print_multi
-
- action
- account.invoice
-
+
+
+
+ Account Invioce Special Message
+ client_print_multi
+
+ action
+ account.invoice
+
-
\ No newline at end of file
+
From 1d8c15f5ee90f412b90c181919f7e5d7bd2fcf9f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 11:37:19 +0200
Subject: [PATCH 174/190] merge
lp bug: https://launchpad.net/bugs/812322 fixed
bzr revid: fp@tinyerp.com-20110924093719-s9r6u0iir5ehfm3s
---
addons/stock/stock_workflow.xml | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 7a1f786ebf8..d54c8b83d11 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -37,13 +37,6 @@
action_done()
True
-
-
- cancel
- True
- function
- action_cancel()
-
@@ -121,11 +114,6 @@
test_cancel()
-
-
-
- button_cancel
-
From d9318e92e6a2b181f99889a98e1eefdc6d2db2bb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 12:42:25 +0200
Subject: [PATCH 175/190] [fix] check followup message
lp bug: https://launchpad.net/bugs/768241 fixed
bzr revid: fp@tinyerp.com-20110924104225-0mvbgeofjm2tnj81
---
addons/account_followup/account_followup.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 06a53bb9548..fd8b7026d74 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -63,7 +63,20 @@ class followup_line(osv.osv):
}
_defaults = {
'start': 'days',
+
}
+ def _check_description(self, cr, uid, ids, context=None):
+ for line in self.browse(cr, uid, ids, context=context):
+ if line.description:
+ try:
+ line.description % {'partner_name': '', 'date':'', 'user_signature': '', 'company_name': ''}
+ except:
+ return False
+ return True
+
+ _constraints = [
+ (_check_description, 'Your description is invalid, use the right legend or %% if you want to use the percent character.', ['description']),
+ ]
followup_line()
@@ -101,4 +114,4 @@ Thanks,
res_company()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
From a583b076bc50d26d5a1e833034d715a07bddbc2c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 13:14:47 +0200
Subject: [PATCH 176/190] merge
bzr revid: fp@tinyerp.com-20110924111447-8c4a3s6ioizq1lgu
---
addons/stock/report/report_stock_move.py | 26 +++++++++++-------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 07289a4379a..d728cbf0e29 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -86,19 +86,19 @@ class report_stock_move(osv.osv):
sum(al.in_value - al.out_value) as value
FROM (SELECT
CASE WHEN sp.type in ('out') THEN
- sum(sm.product_qty * pu.factor)
+ sum(sm.product_qty * pu.factor / pu2.factor)
ELSE 0.0
END AS out_qty,
CASE WHEN sp.type in ('in') THEN
- sum(sm.product_qty * pu.factor)
+ sum(sm.product_qty * pu.factor / pu2.factor)
ELSE 0.0
END AS in_qty,
CASE WHEN sp.type in ('out') THEN
- sum(sm.product_qty * pu.factor) * pt.standard_price
+ sum(sm.product_qty * pu.factor / pu2.factor) * pt.standard_price
ELSE 0.0
END AS out_value,
CASE WHEN sp.type in ('in') THEN
- sum(sm.product_qty * pu.factor) * pt.standard_price
+ sum(sm.product_qty * pu.factor / pu2.factor) * pt.standard_price
ELSE 0.0
END AS in_value,
min(sm.id) as sm_id,
@@ -126,6 +126,7 @@ class report_stock_move(osv.osv):
LEFT JOIN stock_picking sp ON (sm.picking_id=sp.id)
LEFT JOIN product_product pp ON (sm.product_id=pp.id)
LEFT JOIN product_uom pu ON (sm.product_uom=pu.id)
+ LEFT JOIN product_uom pu2 ON (sm.product_uom=pu2.id)
LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
LEFT JOIN stock_location sl ON (sm.location_id = sl.id)
@@ -176,17 +177,16 @@ CREATE OR REPLACE view report_stock_inventory AS (
m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
m.company_id,
m.state as state, m.prodlot_id as prodlot_id,
- coalesce(sum(-pt.standard_price * m.product_qty)::decimal, 0.0) as value,
- CASE when pt.uom_id = m.product_uom THEN
- coalesce(sum(-m.product_qty)::decimal, 0.0)
- ELSE
- coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
+
+ coalesce(sum(-pt.standard_price * m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as value,
+ coalesce(sum(-m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as product_qty
FROM
stock_move m
LEFT JOIN stock_picking p ON (m.picking_id=p.id)
LEFT JOIN product_product pp ON (m.product_id=pp.id)
LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+ LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id)
LEFT JOIN product_uom u ON (m.product_uom=u.id)
LEFT JOIN stock_location l ON (m.location_id=l.id)
GROUP BY
@@ -199,17 +199,15 @@ CREATE OR REPLACE view report_stock_inventory AS (
m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
m.company_id,
m.state as state, m.prodlot_id as prodlot_id,
- coalesce(sum(pt.standard_price * m.product_qty )::decimal, 0.0) as value,
- CASE when pt.uom_id = m.product_uom THEN
- coalesce(sum(m.product_qty)::decimal, 0.0)
- ELSE
- coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
+ coalesce(sum(pt.standard_price * m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as value,
+ coalesce(sum(m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as product_qty
FROM
stock_move m
LEFT JOIN stock_picking p ON (m.picking_id=p.id)
LEFT JOIN product_product pp ON (m.product_id=pp.id)
LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+ LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id)
LEFT JOIN product_uom u ON (m.product_uom=u.id)
LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
GROUP BY
From 3d97bddb638ec273877224bcc82ec38d62b3f2ec Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 13:25:29 +0200
Subject: [PATCH 177/190] fix
bzr revid: fp@tinyerp.com-20110924112529-o72j8k1lota6sm1s
---
addons/sale/sale.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f1efea38f50..f2f953398a2 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -479,6 +479,7 @@ class sale_order(osv.osv):
picking_obj = self.pool.get('stock.picking')
invoice = self.pool.get('account.invoice')
obj_sale_order_line = self.pool.get('sale.order.line')
+ partner_currency = {}
if context is None:
context = {}
# If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
@@ -486,6 +487,13 @@ class sale_order(osv.osv):
if date_inv:
context['date_inv'] = date_inv
for o in self.browse(cr, uid, ids, context=context):
+ currency_id = o.pricelist_id.currency_id.id
+ if (o.partner_id.id in partner_currency) and (partner_currency[o.partner_id.id] <> currency_id):
+ raise osv.except_osv(
+ _('Error !'),
+ _('You cannot group sales having different currencies for the same partner.'))
+
+ partner_currency[o.partner_id.id] = currency_id
lines = []
for line in o.order_line:
if line.invoiced:
From b1e8ce4648ce0bfd65517e3740e307c1311c3557 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 13:48:06 +0200
Subject: [PATCH 178/190] [IMP] removing unuseaful and wrong report
bzr revid: fp@tinyerp.com-20110924114806-0mhlmckigrfnf88c
---
addons/mrp/report/mrp_production_order.py | 114 ----------------
.../mrp/report/mrp_production_order_view.xml | 127 ------------------
2 files changed, 241 deletions(-)
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index 3ad4184c413..4bb525db1ff 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -19,118 +19,4 @@
#
##############################################################################
-from osv import fields,osv
-import tools
-
-
-class mrp_production_order(osv.osv):
- _name = "mrp.production.order"
- _description = "Production Order Report"
- _auto = False
- _columns = {
- 'year': fields.char('Year',size=64,readonly=True),
- 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
- ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
- 'day': fields.char('Day',size=64,readonly=True),
- 'origin': fields.char('Source Document', size=64),
- 'nbr': fields.integer('# of Lines', readonly=True),
- 'products_to_consume': fields.integer('Products to Consume', readonly=True),
- 'consumed_products': fields.integer('Consumed Products', readonly=True),
- 'date': fields.date('Date', readonly=True),
- 'product_id': fields.many2one('product.product', 'Product', readonly=True),
- 'product_id2': fields.many2one('product.product', 'Product Consumed', readonly=True),
- 'product_qty': fields.float('Product Qty', readonly=True),
- 'state': fields.selection([('draft','Draft'),
- ('picking_except', 'Picking Exception'),
- ('confirmed','Waiting Goods'),
- ('ready','Ready to Produce'),
- ('in_production','In Production'),
- ('cancel','Cancelled'),
- ('done','Done')],
- 'State', readonly=True),
- 'date_planned':fields.date('Scheduled Date'),
- 'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', readonly=True),
- 'date_start': fields.datetime('Start Date',readonly=True),
- 'date_finished': fields.datetime('End Date',readonly=True),
- 'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', readonly=True),
- 'company_id': fields.many2one('res.company','Company',readonly=True),
- 'bom_id': fields.many2one('mrp.bom', 'Bill of Material',readonly=True),
- 'routing_id': fields.many2one('mrp.routing', string='Routing',readonly=True),
- 'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True),
- 'product_uom': fields.many2one('product.uom', 'Product UOM', readonly=True),
- 'priority': fields.selection([('0','Not urgent'),
- ('1','Normal'),
- ('2','Urgent'),
- ('3','Very Urgent')],
- 'Priority',readonly=True),
-
-
- }
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'mrp_production_order')
- cr.execute("""
- create or replace view mrp_production_order as (
- select
- min(l.id) as id,
- to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as date,
- to_char(s.create_date, 'YYYY') as year,
- to_char(s.create_date, 'MM') as month,
- to_char(s.create_date, 'YYYY-MM-DD') as day,
- s.product_id as product_id,
- l.product_id as product_id2,
- l.product_uom,
- sum(l.product_qty * u.factor) as product_qty,
- s.company_id as company_id,
- (select 1) as nbr,
- (select sum(sm.product_qty) from stock_move as sm
- left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
- left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
- where sm.product_id=ll.product_id and ll.id=l.id
- and sm.state not in ('done','cancel')
- group by sm.product_id) as products_to_consume,
- (select sum(sm.product_qty)/2 from stock_move as sm
- left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
- left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
- where sm.product_id=ll.product_id and ll.id=l.id
- and sm.state in ('done','cancel')
- group by sm.product_id) as consumed_products,
- s.location_src_id,
- s.location_dest_id,
- s.bom_id,
- s.routing_id,
- s.picking_id,
- s.date_start,
- s.date_finished,
- to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_planned,
- s.origin,
- s.priority,
- s.state
- from mrp_production_product_line l
- left join mrp_production s on (s.id=l.production_id)
- left join product_uom u on (u.id=l.product_uom)
- group by
- to_char(s.create_date, 'YYYY'),
- to_char(s.create_date, 'MM'),
- to_char(s.create_date, 'YYYY-MM-DD'),
- to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY'),
- l.product_id,
- s.product_id,
- l.product_uom,
- s.id,
- l.id,
- s.bom_id,
- s.routing_id,
- s.picking_id,
- s.priority,
- s.location_src_id,
- s.location_dest_id,
- s.state,
- to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY'),
- s.origin,
- s.date_start,
- s.date_finished,
- s.company_id
- )""")
-mrp_production_order()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index fe25ef8fd19..140170e4906 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -1,133 +1,6 @@
-
-
-
- mrp.production.order.tree
- mrp.production.order
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- mrp.production.order.graph
- mrp.production.order
- graph
-
-
-
-
-
-
-
-
-
- mrp.production.order.select
- mrp.production.order
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Production Analysis
- mrp.production.order
- form
- tree,graph
-
-
- {'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}
- This reporting allows you to analyse your manufacturing activities and performance.
-
-
-
-
- tree
-
-
-
-
-
-
- graph
-
-
-
-
-
From 3c186c580738511cfc805e9b4454a1eb9cf49e3c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 15:33:31 +0200
Subject: [PATCH 179/190] [FIX] removing not usefull feature that doed not work
(partially implemented)
bzr revid: fp@tinyerp.com-20110924133331-r5j8e4xfjdk3uoc7
---
addons/product/product.py | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/addons/product/product.py b/addons/product/product.py
index 7b9ed2085d2..adf76a11d1d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -713,24 +713,16 @@ class product_supplierinfo(osv.osv):
for supplier_info in self.browse(cr, uid, ids, context=context):
for field in fields:
result[supplier_info.id] = {field:False}
- if supplier_info.product_uom.id:
- qty = product_uom_pool._compute_qty(cr, uid, supplier_info.product_uom.id, supplier_info.min_qty, to_uom_id=supplier_info.product_id.uom_id.id)
- else:
- qty = supplier_info.min_qty
+ qty = supplier_info.min_qty
result[supplier_info.id]['qty'] = qty
return result
- def _get_uom_id(self, cr, uid, context=None):
- if context is None:
- context = {}
- return context.get('uom_id', False)
-
_columns = {
'name' : fields.many2one('res.partner', 'Supplier', required=True,domain = [('supplier','=',True)], ondelete='cascade', help="Supplier of this product"),
'product_name': fields.char('Supplier Product Name', size=128, help="This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
- 'product_uom': fields.many2one('product.uom', string="Supplier UoM", help="Choose here the Unit of Measure in which the prices and quantities are expressed below."),
+ 'product_uom': fields.related('product_id', 'uom_po_id', type='many2one', relation='product.uom', string="Supplier UoM", readonly="1", help="This comes from the product form."),
'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."),
'qty': fields.function(_calc_qty, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
@@ -743,17 +735,7 @@ class product_supplierinfo(osv.osv):
'sequence': lambda *a: 1,
'delay': lambda *a: 1,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),
- 'product_uom': _get_uom_id,
}
- def _check_uom(self, cr, uid, ids, context=None):
- for supplier_info in self.browse(cr, uid, ids, context=context):
- if supplier_info.product_uom and supplier_info.product_uom.category_id.id <> supplier_info.product_id.uom_id.category_id.id:
- return False
- return True
-
- _constraints = [
- (_check_uom, 'Error: The default UOM and the Supplier Product UOM must be in the same category.', ['product_uom']),
- ]
def price_get(self, cr, uid, supplier_ids, product_id, product_qty=1, context=None):
"""
Calculate price from supplier pricelist.
From 2a89b0fd42043ed48d3f6a63bad533187cf576b7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 15:52:35 +0200
Subject: [PATCH 180/190] fix
bzr revid: fp@tinyerp.com-20110924135235-ks6rclkz25lnpg18
---
addons/survey/survey_demo.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 97e8daeb5b4..a351a3da9b4 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -2140,7 +2140,7 @@
Community Survey
Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.
- draft
+ open
From 8e34fa652638f1f13bb0238588d857b24e372fed Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 16:07:44 +0200
Subject: [PATCH 181/190] [FIX] translated msg for PO
lp bug: https://launchpad.net/bugs/852456 fixed
bzr revid: fp@tinyerp.com-20110924140744-728n8oda7vw8mzum
---
addons/purchase/purchase.py | 6 +++---
addons/purchase/purchase_view.xml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 49489db36f8..27abd1d611a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -667,7 +667,7 @@ class purchase_order_line(osv.osv):
def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom,
partner_id, date_order=False, fiscal_position=False, date_planned=False,
- name=False, price_unit=False, notes=False):
+ name=False, price_unit=False, notes=False, context={}):
if not pricelist:
raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.'))
if not partner_id:
@@ -740,10 +740,10 @@ class purchase_order_line(osv.osv):
def product_uom_change(self, cr, uid, ids, pricelist, product, qty, uom,
partner_id, date_order=False, fiscal_position=False, date_planned=False,
- name=False, price_unit=False, notes=False):
+ name=False, price_unit=False, notes=False, context={}):
res = self.product_id_change(cr, uid, ids, pricelist, product, qty, uom,
partner_id, date_order=date_order, fiscal_position=fiscal_position, date_planned=date_planned,
- name=name, price_unit=price_unit, notes=notes)
+ name=name, price_unit=price_unit, notes=notes, context=context)
if 'product_uom' in res['value']:
if uom and (uom != res['value']['product_uom']) and res['value']['product_uom']:
seller_uom_name = self.pool.get('product.uom').read(cr, uid, [res['value']['product_uom']], ['name'])[0]['name']
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 557dcf354df..cb7224faaf0 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -358,8 +358,8 @@
Job Survey
- draft
20
From a901ee2eaa39009471a500e751af649f7305b326 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse
Date: Sat, 24 Sep 2011 16:35:18 +0200
Subject: [PATCH 184/190] [FIX] base_setup missing categories for
ir.actions.todo
bzr revid: al@openerp.com-20110924143518-yb16n6k851ajsph2
---
addons/base_setup/base_setup_views.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index fab929b239b..a6059148b51 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -70,6 +70,7 @@
+
2
@@ -221,6 +222,7 @@
+
1
From 70b818985a373ec432ec57d68f489d9810e00fda Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 17:07:35 +0200
Subject: [PATCH 186/190] [FIX] access rule not required in sale_margin
bzr revid: fp@tinyerp.com-20110924150735-77kg4vw84dzqc5qx
---
addons/sale_margin/security/ir.model.access.csv | 1 -
1 file changed, 1 deletion(-)
diff --git a/addons/sale_margin/security/ir.model.access.csv b/addons/sale_margin/security/ir.model.access.csv
index d7752fa1961..0343f29f43a 100644
--- a/addons/sale_margin/security/ir.model.access.csv
+++ b/addons/sale_margin/security/ir.model.access.csv
@@ -1,2 +1 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_account_invoice_product","report.account.invoice.product","model_report_account_invoice_product","account.group_account_manager",1,1,1,1
From a1fbc44387facad8c6f3070ec6d47ae7edef4674 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sat, 24 Sep 2011 17:09:44 +0200
Subject: [PATCH 187/190] fix
bzr revid: fp@tinyerp.com-20110924150944-7v00udju3cbi9m0c
---
addons/mrp/security/ir.model.access.csv | 1 -
1 file changed, 1 deletion(-)
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 4af31e9c902..1d93fb460b5 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -29,7 +29,6 @@
"access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
"access_procurement_user","procurement.order.user","model_procurement_order","base.group_user",1,1,1,1
"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
-"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
"access_product_product_manager","product.product manager","product.model_product_product","mrp.group_mrp_manager",1,0,0,0
From 58ebd45efed8ee1e30d42a5abfff94080bf45951 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu
Date: Sat, 24 Sep 2011 18:33:58 +0200
Subject: [PATCH 188/190] [IMP] openerp.service: import at the top.
bzr revid: vmt@openerp.com-20110924163358-svx1yjuwdybxxr6k
---
openerp/service/__init__.py | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index 2a4c03a0892..3da7a50e1f0 100644
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -19,10 +19,18 @@
#
##############################################################################
+import logging
+import threading
+import time
+
import http_server
import netrpc_server
import web_services
+import openerp.netsvc
+import openerp.osv
+import openerp.tools
+
#.apidoc title: RPC Services
""" Classes of this module implement the network protocols that the
@@ -35,14 +43,15 @@ import web_services
"""
def start_services():
- import openerp
- http_server = openerp.service.http_server
- netrpc_server = openerp.service.netrpc_server
+ """ Start all services.
+ Services include the different servers and cron threads.
+
+ """
# Instantiate local services (this is a legacy design).
openerp.osv.osv.start_object_proxy()
# Export (for RPC) services.
- openerp.service.web_services.start_web_services()
+ web_services.start_web_services()
# Initialize the HTTP stack.
http_server.init_servers()
@@ -57,10 +66,7 @@ def start_services():
openerp.netsvc.Server.startAll()
def stop_services():
- import openerp
- import logging
- import threading
- import time
+ """ Stop all services. """
openerp.netsvc.Agent.quit()
openerp.netsvc.Server.quitAll()
config = openerp.tools.config
@@ -69,14 +75,14 @@ def stop_services():
logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
logging.shutdown()
- # manually join() all threads before calling sys.exit() to allow a second signal
+ # Manually join() all threads before calling sys.exit() to allow a second signal
# to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
- # threading.Thread.join() should not mask signals (at least in python 2.5)
+ # threading.Thread.join() should not mask signals (at least in python 2.5).
for thread in threading.enumerate():
if thread != threading.currentThread() and not thread.isDaemon():
while thread.isAlive():
- # need a busyloop here as thread.join() masks signals
- # and would present the forced shutdown
+ # Need a busyloop here as thread.join() masks signals
+ # and would prevent the forced shutdown.
thread.join(0.05)
time.sleep(0.05)
From 0a02a387399880395c1275efb78480ee7e6c8692 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse
Date: Sat, 24 Sep 2011 18:38:28 +0200
Subject: [PATCH 189/190] [IMP] web.common.sesion local backend part1
bzr revid: al@openerp.com-20110924163828-gbys8t65gyz0qkcu
---
addons/web/__init__.py | 4 ----
addons/web/common/dispatch.py | 12 +++++-------
addons/web/common/openerplib/main.py | 20 +++++++++++++++++++-
addons/web/common/session.py | 7 +++----
openerp-web.py | 2 +-
5 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index 2478edb81b7..6934ef1e81a 100644
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -20,9 +20,5 @@ def wsgi_postload():
o.backend = 'local'
app = common.dispatch.Root(o)
- #import openerp.wsgi
openerp.wsgi.register_wsgi_handler(app)
-# TODO
-# if we detect that we are imported from the openerp server register common.Root() as a wsgi entry point
-
diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py
index 98b948704fa..2a5546ac85a 100644
--- a/addons/web/common/dispatch.py
+++ b/addons/web/common/dispatch.py
@@ -21,8 +21,7 @@ import werkzeug.wsgi
import ast
import nonliterals
import http
-# import backendlocal as backend
-import session as backend
+import session
import openerplib
__all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
@@ -79,12 +78,12 @@ class WebRequest(object):
.. attribute:: session_id
- opaque identifier for the :class:`backend.OpenERPSession` instance of
+ opaque identifier for the :class:`session.OpenERPSession` instance of
the current request
.. attribute:: session
- :class:`~backend.OpenERPSession` instance for the current request
+ :class:`~session.OpenERPSession` instance for the current request
.. attribute:: context
@@ -100,13 +99,12 @@ class WebRequest(object):
self.httpresponse = None
self.httpsession = request.session
self.config = config
+
def init(self, params):
self.params = dict(params)
# OpenERP session setup
self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex
- self.session = self.httpsession.setdefault(
- self.session_id, backend.OpenERPSession(
- self.config.server_host, self.config.server_port))
+ self.session = self.httpsession.setdefault(self.session_id, session.OpenERPSession(self.config))
self.context = self.params.pop('context', None)
self.debug = self.params.pop('debug', False) != False
diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py
index 21f8d48ff63..75941b4ee9e 100644
--- a/addons/web/common/openerplib/main.py
+++ b/addons/web/common/openerplib/main.py
@@ -190,6 +190,22 @@ class NetRPCConnector(Connector):
socket.disconnect()
return result
+class LocalConnector(Connector):
+ """
+ A type of connector that uses the XMLRPC protocol.
+ """
+ PROTOCOL = 'local'
+
+ __logger = _getChildLogger(_logger, 'connector.local')
+
+ def __init__(self):
+ pass
+
+ def send(self, service_name, method, *args):
+ import openerp
+ # todo local
+ print service_name, method, args
+
class Service(object):
"""
A class to execute RPC calls on a specific service of the remote server.
@@ -377,8 +393,10 @@ def get_connector(hostname, protocol="xmlrpc", port="auto"):
return XmlRPCConnector(hostname, port)
elif protocol == "netrpc":
return NetRPCConnector(hostname, port)
+ elif protocol == "local":
+ return LocalConnector()
else:
- raise ValueError("You must choose xmlrpc or netrpc")
+ raise ValueError("You must choose xmlrpc or netrpc or local")
def get_connection(hostname, protocol="xmlrpc", port='auto', database=None,
login=None, password=None, user_id=None):
diff --git a/addons/web/common/session.py b/addons/web/common/session.py
index d1997a3f903..670ab75e1e7 100644
--- a/addons/web/common/session.py
+++ b/addons/web/common/session.py
@@ -26,9 +26,8 @@ class OpenERPSession(object):
Used to store references to non-literal domains which need to be
round-tripped to the client browser.
"""
- def __init__(self, server='127.0.0.1', port=8069):
- self._server = server
- self._port = port
+ def __init__(self, config):
+ self.config = config
self._db = False
self._uid = False
self._login = False
@@ -42,7 +41,7 @@ class OpenERPSession(object):
self.client_timezone = False
def build_connection(self):
- return openerplib.get_connection(hostname=self._server, port=self._port,
+ return openerplib.get_connection(hostname=self.config.server_host, port=self.config.server_port,
database=self._db, login=self._login,
user_id=self._uid, password=self._password)
diff --git a/openerp-web.py b/openerp-web.py
index 92b411dd63e..e5b28c83e0a 100755
--- a/openerp-web.py
+++ b/openerp-web.py
@@ -56,7 +56,7 @@ import web.common.dispatch
if __name__ == "__main__":
(options, args) = optparser.parse_args(sys.argv[1:])
- options.backend = 'rpc'
+ options.backend = 'xmlrpc'
os.environ["TZ"] = "UTC"
From c845bef20657b57e83d44cc3dd3ded83ef058381 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse
Date: Sat, 24 Sep 2011 18:57:05 +0200
Subject: [PATCH 190/190] [IMP] web.common.sesion local backend part2
bzr revid: al@openerp.com-20110924165705-c0wd7hcup9ib74ry
---
addons/web/__init__.py | 6 ++++--
addons/web/common/openerplib/main.py | 4 ++--
addons/web/common/session.py | 13 +++++++++----
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index 6934ef1e81a..263e0b8be17 100644
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -2,16 +2,18 @@ import common
import controllers
import common.dispatch
import logging
+import optparse
_logger = logging.getLogger(__name__)
+class Options(object):
+ pass
+
def wsgi_postload():
import openerp.wsgi
import os
import tempfile
_logger.info("embedded mode")
- class Options(object):
- pass
o = Options()
o.dbfilter = '.*'
o.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions")
diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py
index 75941b4ee9e..33e8a4075f8 100644
--- a/addons/web/common/openerplib/main.py
+++ b/addons/web/common/openerplib/main.py
@@ -379,7 +379,7 @@ class Model(object):
records = self.read(record_ids, fields or [], context or {})
return records
-def get_connector(hostname, protocol="xmlrpc", port="auto"):
+def get_connector(hostname=None, protocol="xmlrpc", port="auto"):
"""
A shortcut method to easily create a connector to a remote server using XMLRPC or NetRPC.
@@ -398,7 +398,7 @@ def get_connector(hostname, protocol="xmlrpc", port="auto"):
else:
raise ValueError("You must choose xmlrpc or netrpc or local")
-def get_connection(hostname, protocol="xmlrpc", port='auto', database=None,
+def get_connection(hostname=None, protocol="xmlrpc", port='auto', database=None,
login=None, password=None, user_id=None):
"""
A shortcut method to easily create a connection to a remote OpenERP server.
diff --git a/addons/web/common/session.py b/addons/web/common/session.py
index 670ab75e1e7..c06763bebe2 100644
--- a/addons/web/common/session.py
+++ b/addons/web/common/session.py
@@ -39,11 +39,16 @@ class OpenERPSession(object):
self._lang = {}
self.remote_timezone = 'utc'
self.client_timezone = False
-
+
def build_connection(self):
- return openerplib.get_connection(hostname=self.config.server_host, port=self.config.server_port,
- database=self._db, login=self._login,
- user_id=self._uid, password=self._password)
+ if self.config.backend == 'local':
+ conn = openerplib.get_connection(protocol='local', database=self._db,
+ login=self._login, user_id=self._uid, password=self._password)
+ else:
+ conn = openerplib.get_connection(hostname=self.config.server_host,
+ port=self.config.server_port, database=self._db, login=self._login,
+ user_id=self._uid, password=self._password)
+ return conn
def proxy(self, service):
return self.build_connection().get_service(service)