From 8001a5f2b921281f9cedc82b44abc036508bf5b3 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 17 Aug 2011 14:48:26 +0530 Subject: [PATCH 01/49] [FIX] mrp,mrp_subproduct:sub_products qty is True when Product type is Variable lp bug: https://launchpad.net/bugs/794431 fixed bzr revid: aag@tinyerp.com-20110817091826-fkg4y3b6pbbh220e --- addons/mrp/mrp.py | 11 ++++++++--- addons/mrp/wizard/mrp_product_produce.py | 5 +++-- addons/mrp_subproduct/mrp_subproduct.py | 10 ++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index ec429488914..5c36579281e 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -680,6 +680,11 @@ class mrp_production(osv.osv): if production.move_created_ids: res = False return res + + def rest_qty_compute(self, cr, uid, obj, move_obj=None, context=None): + qty = obj.product_qty * sub_qty + res = {'product_qty': qty, 'sub_qty': 1} + return res def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None): """ To produce final product based on production mode (consume/consume&produce). @@ -694,7 +699,6 @@ class mrp_production(osv.osv): stock_mov_obj = self.pool.get('stock.move') production = self.browse(cr, uid, production_id, context=context) - produced_qty = 0 if production_mode == 'consume_produce': produced_qty = production_qty @@ -749,11 +753,12 @@ class mrp_production(osv.osv): for produce_product in production.move_created_ids: produced_qty = produced_products.get(produce_product.product_id.id, 0) - rest_qty = production.product_qty - produced_qty + get_qty = self.rest_qty_compute(cr, uid, production, produce_product) + rest_qty = get_qty['product_qty'] - produced_qty if rest_qty <= production_qty: production_qty = rest_qty if rest_qty > 0 : - stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, context=context) + stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty * get_qty['sub_qty'], context=context) for raw_product in production.move_lines2: new_parent_ids = [] diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py index 69fc3a9dd7d..dc9a235ff63 100644 --- a/addons/mrp/wizard/mrp_product_produce.py +++ b/addons/mrp/wizard/mrp_product_produce.py @@ -49,8 +49,9 @@ class mrp_product_produce(osv.osv_memory): context['active_id'], context=context) done = 0.0 for move in prod.move_created_ids2: - if not move.scrapped: - done += move.product_qty + if move.product_id == prod.product_id: + if not move.scrapped: + done += move.product_qty return (prod.product_qty - done) or prod.product_qty _defaults = { diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 130411987c1..1e43078955c 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -97,5 +97,15 @@ class mrp_production(osv.osv): self.pool.get('stock.move').create(cr, uid, data) return picking_id + def rest_qty_compute(self, cr, uid, obj, move_obj=None, context=None): + sub_obj = self.pool.get('mrp.subproduct') + sub_qty = 1 + sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_obj.product_id.id)] ) + if sub_id: + sub_qty = sub_obj.browse(cr ,uid, sub_id[0]).product_qty + qty = obj.product_qty * sub_qty + res = {'product_qty': qty, 'sub_qty': sub_qty} + return res + mrp_production() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 306da071e79c3373a29e7e747f15598b5fb473d7 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 17 Aug 2011 15:06:20 +0530 Subject: [PATCH 02/49] [IMP]mrp: Optimize code bzr revid: aag@tinyerp.com-20110817093620-c3bmophuut6n2to6 --- addons/mrp/mrp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 5c36579281e..8e917d8cac5 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -682,7 +682,7 @@ class mrp_production(osv.osv): return res def rest_qty_compute(self, cr, uid, obj, move_obj=None, context=None): - qty = obj.product_qty * sub_qty + qty = obj.product_qty res = {'product_qty': qty, 'sub_qty': 1} return res From f8db8e64b0b94fd07bd8d317469bb4138eb76fb5 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 17 Aug 2011 15:22:49 +0530 Subject: [PATCH 03/49] [IMP]mrp,mrp_subproducts: Optimize code bzr revid: aag@tinyerp.com-20110817095249-ujrm0onvzng60pad --- addons/mrp/mrp.py | 3 +-- addons/mrp_subproduct/mrp_subproduct.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 8e917d8cac5..88b0433e3f4 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -682,8 +682,7 @@ class mrp_production(osv.osv): return res def rest_qty_compute(self, cr, uid, obj, move_obj=None, context=None): - qty = obj.product_qty - res = {'product_qty': qty, 'sub_qty': 1} + res = {'product_qty': obj.product_qty, 'sub_qty': 1} return res def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None): diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 1e43078955c..499d941a1b8 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -103,8 +103,7 @@ class mrp_production(osv.osv): sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_obj.product_id.id)] ) if sub_id: sub_qty = sub_obj.browse(cr ,uid, sub_id[0]).product_qty - qty = obj.product_qty * sub_qty - res = {'product_qty': qty, 'sub_qty': sub_qty} + res = {'product_qty': obj.product_qty * sub_qty, 'sub_qty': sub_qty} return res mrp_production() From a648fdaccbd28812634cbccb0a0d1e1ae1819b95 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 17 Aug 2011 15:38:31 +0530 Subject: [PATCH 04/49] [IMP]mrp,mrp_subproducts: Optimize code - remove dic res bzr revid: aag@tinyerp.com-20110817100831-hrtypdvv921sz5o8 --- addons/mrp/mrp.py | 3 +-- addons/mrp_subproduct/mrp_subproduct.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 88b0433e3f4..5f8ac32c7d5 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -682,8 +682,7 @@ class mrp_production(osv.osv): return res def rest_qty_compute(self, cr, uid, obj, move_obj=None, context=None): - res = {'product_qty': obj.product_qty, 'sub_qty': 1} - return res + return {'product_qty': obj.product_qty, 'sub_qty': 1} def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None): """ To produce final product based on production mode (consume/consume&produce). diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 499d941a1b8..96b16bc19fb 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -103,8 +103,7 @@ class mrp_production(osv.osv): sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_obj.product_id.id)] ) if sub_id: sub_qty = sub_obj.browse(cr ,uid, sub_id[0]).product_qty - res = {'product_qty': obj.product_qty * sub_qty, 'sub_qty': sub_qty} - return res + return {'product_qty': obj.product_qty * sub_qty, 'sub_qty': sub_qty} mrp_production() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From cb99fda783295e9b666c8cd2d3fe44ac569d0bd1 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Tue, 23 Aug 2011 15:57:08 +0530 Subject: [PATCH 05/49] [FIX] mrp,mrp_subproduct:sub_products qty is True when Product type is Variable & sub product is in more than one BOM lp bug: https://launchpad.net/bugs/794431 fixed bzr revid: aag@tinyerp.com-20110823102708-itcfkm74hlhj6m3t --- addons/mrp/mrp.py | 8 +++++--- addons/mrp_subproduct/mrp_subproduct.py | 10 +++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 5f8ac32c7d5..fcea97a4960 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -681,8 +681,10 @@ class mrp_production(osv.osv): res = False return res - def rest_qty_compute(self, cr, uid, obj, move_obj=None, context=None): - return {'product_qty': obj.product_qty, 'sub_qty': 1} + def rest_qty_compute(self, cr, uid, production_id, move_id=None, context=None): + production_obj = self.pool.get('mrp.production') + production_browse = prod_obj.browse(cr, uid, production_id, context) + return {'product_qty': production_browse.product_qty, 'sub_qty': 1} def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None): """ To produce final product based on production mode (consume/consume&produce). @@ -751,7 +753,7 @@ class mrp_production(osv.osv): for produce_product in production.move_created_ids: produced_qty = produced_products.get(produce_product.product_id.id, 0) - get_qty = self.rest_qty_compute(cr, uid, production, produce_product) + get_qty = self.rest_qty_compute(cr, uid, production.id, produce_product.id) rest_qty = get_qty['product_qty'] - produced_qty if rest_qty <= production_qty: production_qty = rest_qty diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 96b16bc19fb..0b2672652c9 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -97,13 +97,17 @@ class mrp_production(osv.osv): self.pool.get('stock.move').create(cr, uid, data) return picking_id - def rest_qty_compute(self, cr, uid, obj, move_obj=None, context=None): + def rest_qty_compute(self, cr, uid, production_id, move_id=None, context=None): sub_obj = self.pool.get('mrp.subproduct') + move_obj = self.pool.get('stock.move') + production_obj = self.pool.get('mrp.production') + production_browse = production_obj.browse(cr, uid, production_id, context) + move_browse = move_obj.browse(cr, uid, move_id, context) sub_qty = 1 - sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_obj.product_id.id)] ) + sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_browse.product_id.id),('bom_id', '=', production_browse.bom_id.id)] ) if sub_id: sub_qty = sub_obj.browse(cr ,uid, sub_id[0]).product_qty - return {'product_qty': obj.product_qty * sub_qty, 'sub_qty': sub_qty} + return {'product_qty': production_browse.product_qty * sub_qty, 'sub_qty': sub_qty} mrp_production() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 29d6ef5f1fce56c26cfa5af4f638dd1161b7c88f Mon Sep 17 00:00:00 2001 From: "Dhara (OpenERP)" <> Date: Mon, 17 Oct 2011 20:39:13 -0700 Subject: [PATCH 06/49] [IMP] attachment order bzr revid: dhara_openerp-20111018033913-a4opfarbkvky6m9g --- addons/mail/mail_message.py | 10 +++++----- addons/mail/mail_thread.py | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 621eef59da5..ff751f291d1 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -334,8 +334,8 @@ class mail_message(osv.osv): 'subtype': msg_mime_subtype, 'body_text': plaintext_body 'body_html': html_body, - 'attachments': { 'file1': 'bytes', - 'file2': 'bytes' } + 'attachments': [('file1', 'bytes'), + ('file2', 'bytes') } # ... 'original': source_of_email, } @@ -416,7 +416,7 @@ class mail_message(osv.osv): body = tools.html2plaintext(body) msg['body_text'] = tools.ustr(body, encoding) - attachments = {} + attachments = [] if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''): body = "" if 'multipart/alternative' in msg.get('content-type', ''): @@ -432,7 +432,7 @@ class mail_message(osv.osv): if part.get_content_maintype()=='text': content = part.get_payload(decode=True) if filename: - attachments[filename] = content + attachments.append((filename, content)) content = tools.ustr(content, encoding) if part.get_content_subtype() == 'html': msg['body_html'] = content @@ -442,7 +442,7 @@ class mail_message(osv.osv): body = content elif part.get_content_maintype() in ('application', 'image'): if filename : - attachments[filename] = part.get_payload(decode=True) + attachments.append((filename,part.get_payload(decode=True))) else: res = part.get_payload(decode=True) body += tools.ustr(res, encoding) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index fa785c3517c..c8f7da9a5bb 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -201,7 +201,8 @@ class mail_thread(osv.osv): for thread in threads: to_attach = [] - for fname, fcontent in attachments.items(): + for attachment in attachments: + fname, fcontent = attachment if isinstance(fcontent, unicode): fcontent = fcontent.encode('utf-8') data_attach = { From 9ce3447d884fd6e03a78a65134c35e9b5bd178ee Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 19 Oct 2011 12:26:44 +0530 Subject: [PATCH 07/49] [IMP] When result is null then displayed message in listview for no any records found and filter is hide. bzr revid: bth@tinyerp.com-20111019065644-nalzsdy6k0klb7jb --- .../web_mobile/static/src/xml/web_mobile.xml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml index 775ac90c66c..f395600ae73 100644 --- a/addons/web_mobile/static/src/xml/web_mobile.xml +++ b/addons/web_mobile/static/src/xml/web_mobile.xml @@ -132,13 +132,18 @@
- + + No one record is created + + + +
From 7b5b0faafe22a77a3962238dd2d3c6646eb24bfd Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 19 Oct 2011 12:39:19 +0530 Subject: [PATCH 08/49] [IMP] Meetings are displayed. bzr revid: bth@tinyerp.com-20111019070919-yubxuakxhqr7prcf --- addons/web_mobile/static/src/js/form_mobile.js | 3 +++ addons/web_mobile/static/src/xml/web_mobile.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index 1cb1dfb494e..1c719855268 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -256,6 +256,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ if (view_fields[i].tag == 'group') { this.get_fields(view_fields[i].children, this.fields); } + if (view_fields[i].tag == 'level') { + this.get_fields(view_fields[i].children, this.fields); + } } return this.fields; }, diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml index f395600ae73..a51b75ee110 100644 --- a/addons/web_mobile/static/src/xml/web_mobile.xml +++ b/addons/web_mobile/static/src/xml/web_mobile.xml @@ -290,6 +290,9 @@ + + + From 00dd58370bb0ef5865392597f76ac8860865d085 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 19 Oct 2011 14:45:55 +0530 Subject: [PATCH 09/49] [IMP] Image displayed with the m2o,url & email type field in small screen. bzr revid: bth@tinyerp.com-20111019091555-ms7uds7k0ffti66e --- .../web_mobile/static/src/js/form_mobile.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index 1c719855268..14c7494deca 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -283,6 +283,18 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ $(this).val(dateresult); } } + $('[id^="'+id+'"]').find('#website').each(function(){ + $(this).css('display','inline-block'); + $(this).css('width','60%'); + }); + $('[id^="'+id+'"]').find('#email').each(function(){ + $(this).css('display','inline-block'); + $(this).css('width','60%'); + }); + $('[id^="'+id+'"]').find('#email_from').each(function(){ + $(this).css('display','inline-block'); + $(this).css('width','60%'); + }); }); // Temp: Selection set as disabled $('[id^="'+id+'"]').find('select').each(function() { @@ -300,6 +312,16 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ $(this).css('left', '-9999px'); }); }); + // image displayed with m2o field + $('[id^="'+id+'"]').find('div[class=ui-select]').each(function(){ + $(this).next().each(function(){ + if($(this).attr('id')=="formbutton"){ + $(this).prev().css('display','inline-table'); + $(this).prev().find('a').find('.ui-btn-inner').removeClass('ui-btn-inner'); + $(this).prev().find('a').find('span:first').css('padding-right','150px'); + } + }); + }); } } }); From 45b5fd73a219995e01d6904ca0e862c0fac97bde Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 19 Oct 2011 16:35:29 +0530 Subject: [PATCH 10/49] [FIX] Some minor issues with UI. bzr revid: bth@tinyerp.com-20111019110529-wu9jb6v847dutnww --- addons/web_mobile/static/src/xml/web_mobile.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml index a51b75ee110..17ac82253e2 100644 --- a/addons/web_mobile/static/src/xml/web_mobile.xml +++ b/addons/web_mobile/static/src/xml/web_mobile.xml @@ -153,12 +153,11 @@
-
- - - -
').appendTo('#moe'); - $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(openerp.web.qweb.render("ListView", {'records' : res})); + $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(openerp.web.qweb.render("ListView", {'records' : res,'data': additional})); $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head); $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){ $.mobile.changePage("#oe_menu", "slide", false, true); @@ -194,7 +201,11 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ } } } - $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(self.render({'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' })); + if(notebook){ + $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(self.render({'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' })); + }else{ + $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(self.render({'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields, 'values' : data_relational, 'temp_flag':'1' })); + } $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title); $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){ $.mobile.changePage("#oe_menu", "slide", false, true); @@ -241,7 +252,8 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ }else{ $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true); } - }); + }); + }); } }); $.mobile.changePage("#"+self.element_id, "slide", false, true); diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml index 69e499e36c4..9a07da21ebe 100644 --- a/addons/web_mobile/static/src/xml/web_mobile.xml +++ b/addons/web_mobile/static/src/xml/web_mobile.xml @@ -138,10 +138,21 @@
  • - - - - + + + + + + + +

    + + + + + +

    +
    • From e188f9bd724b7c2165bacd276b263e18d2495149 Mon Sep 17 00:00:00 2001 From: "Bharat (OpenERP)" Date: Tue, 8 Nov 2011 18:56:48 +0530 Subject: [PATCH 13/49] [FIX] account : invoice - incoherence between base amount and untaxed amount lp bug: https://launchpad.net/bugs/887367 fixed bzr revid: bde@tinyerp.com-20111108132648-lunqaa408axj1gau --- addons/account/account_invoice.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 8f873065014..b4fbfd75c4d 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1559,6 +1559,7 @@ class account_invoice_tax(osv.osv): for line in inv.invoice_line: for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']: + tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit']) val={} val['invoice_id'] = inv.id val['name'] = tax['name'] From e1d67534c6a44c949025bf4d2315c5c2e24465e4 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 9 Nov 2011 15:31:06 +0530 Subject: [PATCH 14/49] [Fix] mrp,mrp_subproduct:Add function _get_quantity_to_produce to calculate production qty and sub product qty lp bug: https://launchpad.net/bugs/794431 fixed bzr revid: aag@tinyerp.com-20111109100106-7vjyuxi55iq2k52k --- addons/mrp/mrp.py | 28 ++++++++++++++++++++----- addons/mrp_subproduct/mrp_subproduct.py | 16 +++++++++++--- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 4bf6fe99584..17e6e2273a7 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -679,11 +679,29 @@ class mrp_production(osv.osv): if production.move_created_ids: res = False return res - - def rest_qty_compute(self, cr, uid, production_id, move_id=None, context=None): + + def _get_quantity_to_produce(self, cr, uid, production_id, move_id=None, context=None): + + """ Compute Production Qty of product.This method will be overwritten by mrp_subproduct. + @return: Dictionary of values. + """ + if context is None: + context = {} + production_obj = self.pool.get('mrp.production') - production_browse = prod_obj.browse(cr, uid, production_id, context) - return {'product_qty': production_browse.product_qty, 'sub_qty': 1} + production_browse = production_obj.browse(cr, uid, production_id, context) + if context.get('product_qty',False): + product_qty = context['product_qty'] + sub_qty = context['sub_qty'] + else: + product_qty = production_browse.product_qty + sub_qty = 1 + res = {'product_qty': product_qty, 'sub_qty': sub_qty} + return res + + + + def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None): """ To produce final product based on production mode (consume/consume&produce). @@ -752,7 +770,7 @@ class mrp_production(osv.osv): for produce_product in production.move_created_ids: produced_qty = produced_products.get(produce_product.product_id.id, 0) - get_qty = self.rest_qty_compute(cr, uid, production.id, produce_product.id) + get_qty = self._get_quantity_to_produce(cr, uid, production.id, produce_product.id, context) rest_qty = get_qty['product_qty'] - produced_qty if rest_qty <= production_qty: production_qty = rest_qty diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 0b2672652c9..1ae67a38f94 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -97,7 +97,14 @@ class mrp_production(osv.osv): self.pool.get('stock.move').create(cr, uid, data) return picking_id - def rest_qty_compute(self, cr, uid, production_id, move_id=None, context=None): + def _get_quantity_to_produce(self, cr, uid, production_id, move_id=None, context=None): + + """ Compute Production Qty of product.This method is overwrite of mrp_production. + @return: Dictionary of values. + """ + if context is None: + context = {} + sub_obj = self.pool.get('mrp.subproduct') move_obj = self.pool.get('stock.move') production_obj = self.pool.get('mrp.production') @@ -106,8 +113,11 @@ class mrp_production(osv.osv): sub_qty = 1 sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_browse.product_id.id),('bom_id', '=', production_browse.bom_id.id)] ) if sub_id: - sub_qty = sub_obj.browse(cr ,uid, sub_id[0]).product_qty - return {'product_qty': production_browse.product_qty * sub_qty, 'sub_qty': sub_qty} + sub_qty = sub_obj.browse(cr ,uid, sub_id[0], context).product_qty + context ['product_qty'] = production_browse.product_qty * sub_qty + context ['sub_qty'] = sub_qty + return super(mrp_production, self)._get_quantity_to_produce(cr, uid, production_id, move_id, context=context) + mrp_production() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 2a0b2f3cc5a39751ee822b52017ea151f3d229a3 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 9 Nov 2011 16:04:52 +0530 Subject: [PATCH 15/49] [Fix] mrp,mrp_subproduct:Add Context in method bzr revid: aag@tinyerp.com-20111109103452-zk1kg7tppzdw90nh --- addons/mrp/mrp.py | 4 ++-- addons/mrp_subproduct/mrp_subproduct.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 17e6e2273a7..0fdfd66d7e6 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -689,7 +689,7 @@ class mrp_production(osv.osv): context = {} production_obj = self.pool.get('mrp.production') - production_browse = production_obj.browse(cr, uid, production_id, context) + production_browse = production_obj.browse(cr, uid, production_id, context=context) if context.get('product_qty',False): product_qty = context['product_qty'] sub_qty = context['sub_qty'] @@ -770,7 +770,7 @@ class mrp_production(osv.osv): for produce_product in production.move_created_ids: produced_qty = produced_products.get(produce_product.product_id.id, 0) - get_qty = self._get_quantity_to_produce(cr, uid, production.id, produce_product.id, context) + get_qty = self._get_quantity_to_produce(cr, uid, production.id, produce_product.id, context=context) rest_qty = get_qty['product_qty'] - produced_qty if rest_qty <= production_qty: production_qty = rest_qty diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 1ae67a38f94..427297f0a1c 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -111,9 +111,9 @@ class mrp_production(osv.osv): production_browse = production_obj.browse(cr, uid, production_id, context) move_browse = move_obj.browse(cr, uid, move_id, context) sub_qty = 1 - sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_browse.product_id.id),('bom_id', '=', production_browse.bom_id.id)] ) + sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_browse.product_id.id),('bom_id', '=', production_browse.bom_id.id)], context=context ) if sub_id: - sub_qty = sub_obj.browse(cr ,uid, sub_id[0], context).product_qty + sub_qty = sub_obj.browse(cr ,uid, sub_id[0], context=context).product_qty context ['product_qty'] = production_browse.product_qty * sub_qty context ['sub_qty'] = sub_qty return super(mrp_production, self)._get_quantity_to_produce(cr, uid, production_id, move_id, context=context) From 7431974eafaeeab0cb2a1a139096397ad4e4ff70 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 9 Nov 2011 16:06:04 +0530 Subject: [PATCH 16/49] [IMP]: remove blank space bzr revid: aag@tinyerp.com-20111109103604-mrnu9od0a3fniuhf --- addons/mrp/mrp.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 0fdfd66d7e6..7be913cbbe4 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -698,10 +698,6 @@ class mrp_production(osv.osv): sub_qty = 1 res = {'product_qty': product_qty, 'sub_qty': sub_qty} return res - - - - def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None): """ To produce final product based on production mode (consume/consume&produce). From d8dfd2b13d7e48cd1e841358c3298c4b91d3b7ff Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 9 Nov 2011 16:23:21 +0530 Subject: [PATCH 17/49] [IMP] mrp_subproduct:set variable as a default for subproduct_type and add tooltip bzr revid: aag@tinyerp.com-20111109105321-r55u6gtfbnjm0a8w --- addons/mrp_subproduct/mrp_subproduct.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 427297f0a1c..ffd7433d0ba 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -29,11 +29,11 @@ class mrp_subproduct(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True), 'product_qty': fields.float('Product Qty', required=True), 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), - 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True), + 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Production Type of Product"), 'bom_id': fields.many2one('mrp.bom', 'BoM'), } _defaults={ - 'subproduct_type': lambda *args: 'fixed' + 'subproduct_type': lambda *args: 'variable' } def onchange_product_id(self, cr, uid, ids, product_id, context=None): From daa579c9a3152feac5160c73c06f13b2c49c1bbb Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Wed, 9 Nov 2011 17:19:08 +0530 Subject: [PATCH 18/49] [FIX]: purchase: Fixed problem of cancelling PO was not cancelling related procurement, this was a problem of workflow of purchase order lp bug: https://launchpad.net/bugs/868456 fixed bzr revid: rpa@tinyerp.com-20111109114908-oci1p59e636hebsr --- addons/purchase/purchase.py | 5 +++-- addons/purchase/purchase_workflow.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 4c48d971d47..8604775c4f9 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -402,6 +402,7 @@ class purchase_order(osv.osv): return False def action_cancel(self, cr, uid, ids, context=None): + wf_service = netsvc.LocalService("workflow") for purchase in self.browse(cr, uid, ids, context=context): for pick in purchase.picking_ids: if pick.state not in ('draft','cancel'): @@ -409,7 +410,6 @@ class purchase_order(osv.osv): _('Unable to cancel this purchase order!'), _('You must first cancel all receptions related to this purchase order.')) for pick in purchase.picking_ids: - wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr) for inv in purchase.invoice_ids: if inv and inv.state not in ('cancel','draft'): @@ -417,11 +417,12 @@ class purchase_order(osv.osv): _('Unable to cancel this purchase order!'), _('You must first cancel all invoices related to this purchase order.')) if inv: - wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr) self.write(cr,uid,ids,{'state':'cancel'}) + for (id,name) in self.name_get(cr, uid, ids): message = _("Purchase order '%s' is cancelled.") % name + wf_service.trg_validate(uid, 'purchase.order', id, 'purchase_cancel', cr) self.log(cr, uid, id, message) return True diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml index aea6fa2b2ac..c978712c0a1 100644 --- a/addons/purchase/purchase_workflow.xml +++ b/addons/purchase/purchase_workflow.xml @@ -138,12 +138,12 @@ - cancel + purchase_cancel - cancel + purchase_cancel From 51bd79cb910c953186000e0b84a052ff66fbf149 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Wed, 9 Nov 2011 18:05:44 +0530 Subject: [PATCH 19/49] [FIX] account_asset: wrong calculation of first year lp bug: https://launchpad.net/bugs/876463 fixed bzr revid: psi@tinyerp.com-20111109123544-w9s4c9e4x6np11kg --- addons/account_asset/account_asset.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index bacd29f1607..4d2f729acc1 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -143,8 +143,11 @@ class account_asset_asset(osv.osv): depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context) amount_to_depr = residual_amount = asset.value_residual - - depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d') + if asset.prorata: + depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d') + else: + year = datetime.strptime(asset.purchase_date, '%Y-%m-%d').year + depreciation_date = datetime.strptime(str(year)+'-01-01', '%Y-%m-%d') day = depreciation_date.day month = depreciation_date.month year = depreciation_date.year From cbaf08b7dbad57452f4ec5a3d0fdac870ab0f424 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 9 Nov 2011 16:10:38 +0100 Subject: [PATCH 20/49] [IMP] mrp, mrp_subproduct: cleaner implementation of the fix for lp:794431 proposed by aag lp bug: https://launchpad.net/bugs/794431 fixed bzr revid: qdp-launchpad@openerp.com-20111109151038-oqo76jgzbd87t7v9 --- addons/mrp/mrp.py | 32 ++++++++------------ addons/mrp_subproduct/mrp_subproduct.py | 39 +++++++++++++------------ 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 7be913cbbe4..aeacf4a71a2 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -680,24 +680,16 @@ class mrp_production(osv.osv): res = False return res - def _get_quantity_to_produce(self, cr, uid, production_id, move_id=None, context=None): - - """ Compute Production Qty of product.This method will be overwritten by mrp_subproduct. - @return: Dictionary of values. + def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None): + """ Compute the factor to compute the qty of procucts to produce for the given production_id. By default, + it's always equal to the quantity encoded in the production order or the production wizard, but if the + module mrp_subproduct is installed, then we must use the move_id to identify the product to produce + and its quantity. + :param production_id: ID of the mrp.order + :param move_id: ID of the stock move that needs to be produced. Will be used in mrp_subproduct. + :return: The factor to apply to the quantity that we should produce for the given production order. """ - if context is None: - context = {} - - production_obj = self.pool.get('mrp.production') - production_browse = production_obj.browse(cr, uid, production_id, context=context) - if context.get('product_qty',False): - product_qty = context['product_qty'] - sub_qty = context['sub_qty'] - else: - product_qty = production_browse.product_qty - sub_qty = 1 - res = {'product_qty': product_qty, 'sub_qty': sub_qty} - return res + return 1 def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None): """ To produce final product based on production mode (consume/consume&produce). @@ -766,12 +758,12 @@ class mrp_production(osv.osv): for produce_product in production.move_created_ids: produced_qty = produced_products.get(produce_product.product_id.id, 0) - get_qty = self._get_quantity_to_produce(cr, uid, production.id, produce_product.id, context=context) - rest_qty = get_qty['product_qty'] - produced_qty + subproduct_factor = self._get_subproduct_factor(cr, uid, production.id, produce_product.id, context=context) + rest_qty = (subproduct_factor * production.product_qty) - produced_qty if rest_qty <= production_qty: production_qty = rest_qty if rest_qty > 0 : - stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty * get_qty['sub_qty'], context=context) + stock_mov_obj.action_consume(cr, uid, [produce_product.id], (subproduct_factor * production_qty), context=context) for raw_product in production.move_lines2: new_parent_ids = [] diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index ffd7433d0ba..bb3b6789574 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -29,11 +29,14 @@ class mrp_subproduct(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True), 'product_qty': fields.float('Product Qty', required=True), 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), - 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Production Type of Product"), + 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of subproducts will be set on the production orders using this BoM.\ + 'Fixed' depicts a situation where the quantity of created subproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\ + By opposition, 'Variable' means that the quantity will be computed as\ + '(quantity of subproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"), 'bom_id': fields.many2one('mrp.bom', 'BoM'), } _defaults={ - 'subproduct_type': lambda *args: 'variable' + 'subproduct_type': 'variable', } def onchange_product_id(self, cr, uid, ids, product_id, context=None): @@ -97,27 +100,27 @@ class mrp_production(osv.osv): self.pool.get('stock.move').create(cr, uid, data) return picking_id - def _get_quantity_to_produce(self, cr, uid, production_id, move_id=None, context=None): - - """ Compute Production Qty of product.This method is overwrite of mrp_production. - @return: Dictionary of values. + def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None): + """Compute the factor to compute the qty of procucts to produce for the given production_id. By default, + it's always equal to the quantity encoded in the production order or the production wizard, but with + the module mrp_subproduct installed it can differ for subproducts having type 'variable'. + :param production_id: ID of the mrp.order + :param move_id: ID of the stock move that needs to be produced. Identify the product to produce. + :return: The factor to apply to the quantity that we should produce for the given production order and stock move. """ - if context is None: - context = {} - sub_obj = self.pool.get('mrp.subproduct') move_obj = self.pool.get('stock.move') production_obj = self.pool.get('mrp.production') - production_browse = production_obj.browse(cr, uid, production_id, context) - move_browse = move_obj.browse(cr, uid, move_id, context) - sub_qty = 1 - sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_browse.product_id.id),('bom_id', '=', production_browse.bom_id.id)], context=context ) + production_browse = production_obj.browse(cr, uid, production_id, context=context) + move_browse = move_obj.browse(cr, uid, move_id, context=context) + subproduct_factor = 1 + sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_browse.product_id.id),('bom_id', '=', production_browse.bom_id.id), ('subproduct_type', '=', 'variable')], context=context) if sub_id: - sub_qty = sub_obj.browse(cr ,uid, sub_id[0], context=context).product_qty - context ['product_qty'] = production_browse.product_qty * sub_qty - context ['sub_qty'] = sub_qty - return super(mrp_production, self)._get_quantity_to_produce(cr, uid, production_id, move_id, context=context) - + subproduct_record = sub_obj.browse(cr ,uid, sub_id[0], context=context) + if subproduct_record.bom_id.product_qty: + subproduct_factor = subproduct_record.product_qty / subproduct_record.bom_id.product_qty + return subproduct_factor + return super(mrp_production, self)._get_subproduct_factor(cr, uid, production_id, move_id, context=context) mrp_production() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From a13a501e94c507aab57f0e86cf1941651fdc6a7c Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 10 Nov 2011 04:58:30 +0000 Subject: [PATCH 21/49] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20111110045830-fq54u6adwb1vbzqw --- addons/account/i18n/da.po | 16 +- addons/account_accountant/i18n/da.po | 12 +- addons/account_analytic_analysis/i18n/da.po | 10 +- addons/account_analytic_default/i18n/da.po | 10 +- addons/account_anglo_saxon/i18n/da.po | 107 +++++++++ addons/account_budget/i18n/da.po | 12 +- addons/account_cancel/i18n/da.po | 15 +- addons/account_chart/i18n/da.po | 10 +- addons/account_invoice_layout/i18n/da.po | 10 +- addons/account_sequence/i18n/da.po | 221 ++++++++++++++++++ .../analytic_journal_billing_rate/i18n/da.po | 95 ++++++++ addons/auction/i18n/da.po | 10 +- addons/base_action_rule/i18n/da.po | 12 +- addons/base_contact/i18n/da.po | 10 +- addons/base_setup/i18n/da.po | 151 +++++++----- addons/base_tools/i18n/da.po | 10 +- addons/base_vat/i18n/da.po | 31 ++- addons/crm/i18n/da.po | 11 +- addons/crm_caldav/i18n/da.po | 10 +- addons/decimal_precision/i18n/da.po | 69 ++++++ addons/delivery/i18n/da.po | 10 +- addons/document_webdav/i18n/da.po | 10 +- addons/event/i18n/da.po | 14 +- addons/google_map/i18n/da.po | 10 +- addons/html_view/i18n/da.po | 24 +- addons/idea/i18n/da.po | 28 +-- addons/knowledge/i18n/da.po | 155 ++++++++++++ addons/l10n_hn/i18n/ca.po | 4 +- addons/l10n_hn/i18n/es.po | 4 +- addons/l10n_hn/i18n/fr.po | 4 +- addons/l10n_hn/i18n/gl.po | 4 +- addons/l10n_hn/i18n/hu.po | 4 +- addons/l10n_hn/i18n/it.po | 4 +- addons/l10n_hn/i18n/pt_BR.po | 4 +- addons/l10n_hn/i18n/sr@latin.po | 4 +- addons/mrp/i18n/da.po | 10 +- addons/mrp/i18n/pt.po | 10 +- addons/mrp_jit/i18n/da.po | 10 +- addons/mrp_subproduct/i18n/pt.po | 10 +- addons/product_visible_discount/i18n/da.po | 81 +++++++ addons/project_retro_planning/i18n/da.po | 47 ++++ addons/purchase/i18n/da.po | 10 +- addons/purchase_analytic_plans/i18n/da.po | 51 ++++ addons/sale/i18n/da.po | 20 +- addons/sale_layout/i18n/da.po | 14 +- addons/stock/i18n/pt.po | 10 +- addons/stock_invoice_directly/i18n/da.po | 12 +- addons/stock_no_autopicking/i18n/da.po | 20 +- addons/thunderbird/i18n/da.po | 16 +- addons/wiki_sale_faq/i18n/da.po | 70 ++++++ 50 files changed, 1227 insertions(+), 279 deletions(-) create mode 100644 addons/account_anglo_saxon/i18n/da.po create mode 100644 addons/account_sequence/i18n/da.po create mode 100644 addons/analytic_journal_billing_rate/i18n/da.po create mode 100644 addons/decimal_precision/i18n/da.po create mode 100644 addons/knowledge/i18n/da.po create mode 100644 addons/product_visible_discount/i18n/da.po create mode 100644 addons/project_retro_planning/i18n/da.po create mode 100644 addons/purchase_analytic_plans/i18n/da.po create mode 100644 addons/wiki_sale_faq/i18n/da.po diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 448a89899b9..64893f3533f 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-11-01 21:03+0000\n" +"PO-Revision-Date: 2011-11-08 11:58+0000\n" "Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -2439,7 +2439,7 @@ msgstr "Bankafstemning" #. module: account #: report:account.invoice:0 msgid "Disc.(%)" -msgstr "" +msgstr "Rabatprocent" #. module: account #: report:account.general.ledger:0 @@ -2744,6 +2744,8 @@ msgid "" "Set if the amount of tax must be included in the base amount before " "computing the next taxes." msgstr "" +"Vælg: Hvis afgiftsbeløbet, skal indgå i beregningsgrundlaget for beregning " +"af de følgende afgifter" #. module: account #: help:account.journal,user_id:0 @@ -4789,7 +4791,7 @@ msgstr "" #. module: account #: report:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "" +msgstr "(Konto / Kontakt) Navn" #. module: account #: view:account.bank.statement:0 @@ -7125,7 +7127,7 @@ msgstr "" #. module: account #: field:account.tax.code,sum_period:0 msgid "Period Sum" -msgstr "" +msgstr "Periode sum" #. module: account #: help:account.tax,sequence:0 @@ -7257,7 +7259,7 @@ msgstr "" #: field:account.subscription,state:0 #: field:report.invoice.created,state:0 msgid "State" -msgstr "Stat" +msgstr "Tilstand" #. module: account #: help:account.open.closed.fiscalyear,fyear_id:0 diff --git a/addons/account_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po index 43a16e89f86..5b199bb2909 100644 --- a/addons/account_accountant/i18n/da.po +++ b/addons/account_accountant/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-11-17 08:53+0000\n" -"Last-Translator: Martin Pihl \n" +"PO-Revision-Date: 2011-11-08 10:35+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_accountant #: model:ir.module.module,description:account_accountant.module_meta_information @@ -27,8 +27,8 @@ msgid "" " " msgstr "" "\n" -"Dette modul giver administrator brugeren adgang til alle de regnskabsmæssige " -"funktioner som bogføringsjournaler og kontoplaner.\n" +"Dette modul giver brugeren admin adgang til alle regnskabsfunktioner som " +"bogføringsjournaler og kontoplaner.\n" " " #. module: account_accountant diff --git a/addons/account_analytic_analysis/i18n/da.po b/addons/account_analytic_analysis/i18n/da.po index 545c570647c..95f24a21b1f 100644 --- a/addons/account_analytic_analysis/i18n/da.po +++ b/addons/account_analytic_analysis/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-11-22 07:38+0000\n" -"Last-Translator: Martin Pihl \n" +"PO-Revision-Date: 2011-11-08 21:41+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_invoiced:0 @@ -134,7 +134,7 @@ msgstr "Bruger" #. module: account_analytic_analysis #: field:account.analytic.account,ca_to_invoice:0 msgid "Uninvoiced Amount" -msgstr "" +msgstr "Ufaktureret beløb" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin:0 diff --git a/addons/account_analytic_default/i18n/da.po b/addons/account_analytic_default/i18n/da.po index 2cb76cfc57e..7e1a64488e0 100644 --- a/addons/account_analytic_default/i18n/da.po +++ b/addons/account_analytic_default/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-29 12:18+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:24+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information @@ -65,7 +65,7 @@ msgstr "Plukseddel" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Conditions" -msgstr "" +msgstr "Betingelser" #. module: account_analytic_default #: help:account.analytic.default,company_id:0 diff --git a/addons/account_anglo_saxon/i18n/da.po b/addons/account_anglo_saxon/i18n/da.po new file mode 100644 index 00000000000..bf144945725 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/da.po @@ -0,0 +1,107 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-11-09 21:36+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: sql_constraint:purchase.order:0 +msgid "Order Reference must be unique !" +msgstr "Ordre reference skal være unik !" + +#. module: account_anglo_saxon +#: constraint:product.category:0 +msgid "Error ! You can not create recursive categories." +msgstr "Fejl ! Du kan ikke oprette rekusive katagorier." + +#. module: account_anglo_saxon +#: constraint:product.template:0 +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line +msgid "Invoice Line" +msgstr "Fakturalinie" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_purchase_order +msgid "Purchase Order" +msgstr "Indkøbsordre" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_template +msgid "Product Template" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_category +msgid "Product Category" +msgstr "Produkt katagori" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Accounting for Anglo Saxon countries" +msgstr "" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice +msgid "Invoice" +msgstr "Faktura" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_stock_picking +msgid "Picking List" +msgstr "Plukliste" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by\n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries\n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales.\n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at the moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account\n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account.\n" +" Secondly, price differences between actual purchase price and fixed " +"product standard price are booked on a separate account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" diff --git a/addons/account_budget/i18n/da.po b/addons/account_budget/i18n/da.po index 4657e9c8f94..90ba071a726 100644 --- a/addons/account_budget/i18n/da.po +++ b/addons/account_budget/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-23 06:03+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:25+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_budget #: field:crossovered.budget,creating_user_id:0 @@ -25,7 +25,7 @@ msgstr "" #. module: account_budget #: selection:crossovered.budget,state:0 msgid "Confirmed" -msgstr "" +msgstr "Bekræftet" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.open_budget_post_form @@ -47,7 +47,7 @@ msgstr "" #. module: account_budget #: view:crossovered.budget:0 msgid "Confirm" -msgstr "" +msgstr "Godkend" #. module: account_budget #: field:crossovered.budget,validating_user_id:0 diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po index 12dea22e2d0..8fa64b04a48 100644 --- a/addons/account_cancel/i18n/da.po +++ b/addons/account_cancel/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-11-20 07:57+0000\n" -"Last-Translator: Martin Pihl \n" +"PO-Revision-Date: 2011-11-08 10:42+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_cancel #: model:ir.module.module,description:account_cancel.module_meta_information @@ -25,8 +25,13 @@ msgid "" "journal. If set to true it allows user to cancel entries & invoices.\n" " " msgstr "" +"\n" +" Modulet tilføjer feltet \"Tillad annullering af poster\" til formular " +"visning af bogføringsjournalen. Hvis feltet er afkrydset tillader det " +"brugeren at annullere poster og fakturaer.\n" +" " #. module: account_cancel #: model:ir.module.module,shortdesc:account_cancel.module_meta_information msgid "Account Cancel" -msgstr "" +msgstr "Annuller post" diff --git a/addons/account_chart/i18n/da.po b/addons/account_chart/i18n/da.po index 033ca634ec8..21f9528cfe6 100644 --- a/addons/account_chart/i18n/da.po +++ b/addons/account_chart/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-11-20 07:54+0000\n" -"Last-Translator: Martin Pihl \n" +"PO-Revision-Date: 2011-11-08 22:06+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_chart #: model:ir.module.module,description:account_chart.module_meta_information msgid "Remove minimal account chart" -msgstr "Fjern minimal kontoplan" +msgstr "Fjern kontoplan" #. module: account_chart #: model:ir.module.module,shortdesc:account_chart.module_meta_information diff --git a/addons/account_invoice_layout/i18n/da.po b/addons/account_invoice_layout/i18n/da.po index cda7b3b0d94..a7321fbf92c 100644 --- a/addons/account_invoice_layout/i18n/da.po +++ b/addons/account_invoice_layout/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-12 17:17+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:26+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_invoice_layout #: selection:account.invoice.line,state:0 msgid "Sub Total" -msgstr "" +msgstr "Sub total" #. module: account_invoice_layout #: report:account.invoice.layout:0 diff --git a/addons/account_sequence/i18n/da.po b/addons/account_sequence/i18n/da.po new file mode 100644 index 00000000000..d7604035633 --- /dev/null +++ b/addons/account_sequence/i18n/da.po @@ -0,0 +1,221 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-11-09 21:40+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: account_sequence +#: view:account.sequence.installer:0 +#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer +msgid "Account Sequence Application Configuration" +msgstr "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create entries on different periods/journals in the same move" +msgstr "" + +#. module: account_sequence +#: help:account.move,internal_sequence_number:0 +#: help:account.move.line,internal_sequence_number:0 +msgid "Internal Sequence Number" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,number_next:0 +msgid "Next number of this sequence" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,number_next:0 +msgid "Next Number" +msgstr "Næste nummer" + +#. module: account_sequence +#: field:account.sequence.installer,number_increment:0 +msgid "Increment Number" +msgstr "" + +#. module: account_sequence +#: model:ir.module.module,description:account_sequence.module_meta_information +msgid "" +"\n" +" This module maintains internal sequence number for accounting entries.\n" +" " +msgstr "" + +#. module: account_sequence +#: model:ir.module.module,shortdesc:account_sequence.module_meta_information +msgid "Entries Sequence Numbering" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,number_increment:0 +msgid "The next number of the sequence will be incremented by this number" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure Your Account Sequence Application" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,progress:0 +msgid "Configuration Progress" +msgstr "Konfigurationsfremgang" + +#. module: account_sequence +#: help:account.sequence.installer,suffix:0 +msgid "Suffix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,company_id:0 +msgid "Company" +msgstr "Firma" + +#. module: account_sequence +#: help:account.journal,internal_sequence_id:0 +msgid "" +"This sequence will be used to maintain the internal number for the journal " +"entries related to this journal." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,padding:0 +msgid "Number padding" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_sequence +#: field:account.move,internal_sequence_number:0 +#: field:account.move.line,internal_sequence_number:0 +msgid "Internal Number" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "Company must be same for its related account and period." +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,padding:0 +msgid "" +"OpenERP will automatically adds some '0' on the left of the 'Next Number' to " +"get the required padding size." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,name:0 +msgid "Name" +msgstr "Navn" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on closed account." +msgstr "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create more than one move per period on centralized journal" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "Forkert kredit eller debet værdi i posteringerne!" + +#. module: account_sequence +#: field:account.journal,internal_sequence_id:0 +msgid "Internal Sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_sequence_installer +msgid "account.sequence.installer" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure" +msgstr "Konfigurer" + +#. module: account_sequence +#: help:account.sequence.installer,prefix:0 +msgid "Prefix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move +msgid "Account Entry" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,suffix:0 +msgid "Suffix" +msgstr "Suffiks" + +#. module: account_sequence +#: field:account.sequence.installer,config_logo:0 +msgid "Image" +msgstr "Billede" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "title" +msgstr "titel" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,prefix:0 +msgid "Prefix" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "" +"You can not create move line on receivable/payable account without partner" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_journal +msgid "Journal" +msgstr "Journal" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "You can enhance the Account Sequence Application by installing ." +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on view account." +msgstr "" diff --git a/addons/analytic_journal_billing_rate/i18n/da.po b/addons/analytic_journal_billing_rate/i18n/da.po new file mode 100644 index 00000000000..3ad40b63e32 --- /dev/null +++ b/addons/analytic_journal_billing_rate/i18n/da.po @@ -0,0 +1,95 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-03 16:56+0000\n" +"PO-Revision-Date: 2011-11-09 21:41+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: analytic_journal_billing_rate +#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information +msgid "" +"\n" +"\n" +" This module allows you to define what is the default invoicing rate for " +"a specific journal on a given account. This is mostly used when a user " +"encodes his timesheet: the values are retrieved and the fields are auto-" +"filled... but the possibility to change these values is still available.\n" +"\n" +" Obviously if no data has been recorded for the current account, the " +"default value is given as usual by the account data so that this module is " +"perfectly compatible with older configurations.\n" +"\n" +" " +msgstr "" + +#. module: analytic_journal_billing_rate +#: field:analytic_journal_rate_grid,journal_id:0 +msgid "Analytic Journal" +msgstr "" + +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice +msgid "Invoice" +msgstr "Faktura" + +#. module: analytic_journal_billing_rate +#: view:analytic_journal_rate_grid:0 +msgid "Billing Rate per Journal for this Analytic Account" +msgstr "" + +#. module: analytic_journal_billing_rate +#: field:analytic_journal_rate_grid,account_id:0 +#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account +msgid "Analytic Account" +msgstr "" + +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid +msgid "Relation table between journals and billing rates" +msgstr "" + +#. module: analytic_journal_billing_rate +#: field:account.analytic.account,journal_rate_ids:0 +msgid "Invoicing Rate per Journal" +msgstr "" + +#. module: analytic_journal_billing_rate +#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information +msgid "" +"Analytic Journal Billing Rate, Define the default invoicing rate for a " +"specific journal" +msgstr "" + +#. module: analytic_journal_billing_rate +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "" + +#. module: analytic_journal_billing_rate +#: field:analytic_journal_rate_grid,rate_id:0 +msgid "Invoicing Rate" +msgstr "" + +#. module: analytic_journal_billing_rate +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "" + +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "" diff --git a/addons/auction/i18n/da.po b/addons/auction/i18n/da.po index 21f42c50265..8ff7a76f6fc 100644 --- a/addons/auction/i18n/da.po +++ b/addons/auction/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-23 14:47+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:27+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: auction #: model:ir.ui.menu,name:auction.auction_report_menu msgid "Reporting" -msgstr "" +msgstr "Rapportering" #. module: auction #: model:ir.model,name:auction.model_auction_taken diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po index 9424977f407..06244915efc 100644 --- a/addons/base_action_rule/i18n/da.po +++ b/addons/base_action_rule/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-26 15:35+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:29+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_action_rule #: help:base.action.rule,act_mail_to_user:0 @@ -46,7 +46,7 @@ msgstr "" #. module: base_action_rule #: field:base.action.rule,model_id:0 msgid "Object" -msgstr "" +msgstr "Objekt" #. module: base_action_rule #: field:base.action.rule,act_mail_to_email:0 @@ -66,7 +66,7 @@ msgstr "E-mail fra" #. module: base_action_rule #: view:base.action.rule:0 msgid "Email Body" -msgstr "" +msgstr "Email indhold" #. module: base_action_rule #: selection:base.action.rule,trg_date_range_type:0 diff --git a/addons/base_contact/i18n/da.po b/addons/base_contact/i18n/da.po index fb1ca893595..da5f890c185 100644 --- a/addons/base_contact/i18n/da.po +++ b/addons/base_contact/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-29 12:07+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:31+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_contact #: field:res.partner.contact,title:0 @@ -25,7 +25,7 @@ msgstr "Titel" #. module: base_contact #: view:res.partner.address:0 msgid "# of Contacts" -msgstr "" +msgstr "# kontakter" #. module: base_contact #: field:res.partner.job,fax:0 diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po index ff3ff65cf8c..e6c165e4cf3 100644 --- a/addons/base_setup/i18n/da.po +++ b/addons/base_setup/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-11-02 16:15+0000\n" +"PO-Revision-Date: 2011-11-08 10:30+0000\n" "Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_setup #: field:base.setup.company,city:0 @@ -35,7 +35,7 @@ msgstr "Fakturering" #. module: base_setup #: field:base.setup.installer,hr:0 msgid "Human Resources" -msgstr "Human Resources" +msgstr "Personale (HR)" #. module: base_setup #: field:base.setup.company,email:0 @@ -45,7 +45,7 @@ msgstr "E-mail" #. module: base_setup #: field:base.setup.company,account_no:0 msgid "Bank Account No" -msgstr "Bank konto nr." +msgstr "Bankkonto nr." #. module: base_setup #: field:base.setup.installer,profile_tools:0 @@ -55,7 +55,7 @@ msgstr "Ekstra værktøjer" #. module: base_setup #: field:base.setup.company,rml_footer1:0 msgid "Report Footer 1" -msgstr "Rapport fod 1" +msgstr "Rapport sidefod 1" #. module: base_setup #: help:base.setup.installer,mrp:0 @@ -63,6 +63,7 @@ msgid "" "Helps you manage your manufacturing processes and generate reports on those " "processes." msgstr "" +"Hjælper med at styre produktionsprocesser og lave rapporter over disse." #. module: base_setup #: help:base.setup.installer,marketing:0 @@ -72,17 +73,17 @@ msgstr "Hjælper dig med din maketingskampagne skridt for skridt" #. module: base_setup #: view:base.setup.config:0 msgid "Your database is now created." -msgstr "Din database er ny oprettet" +msgstr "Din database er nu oprettet" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 msgid "Point of Sale" -msgstr "" +msgstr "Salgssted" #. module: base_setup #: field:base.setup.installer,association:0 msgid "Associations" -msgstr "Foreninger" +msgstr "Organisationer" #. module: base_setup #: help:base.setup.installer,account_accountant:0 @@ -90,23 +91,25 @@ msgid "" "Helps you handle your accounting needs, if you are not an accountant, we " "suggest you to install only the Invoicing " msgstr "" +"Hjælper dig med at håndtere dine regnskabsmæssige behov. Hvis du ikke er " +"revisor, foreslår vi dig kun at installere faktureringsmodulet " #. module: base_setup #: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" -msgstr "Følgende brugere er installeret \n" +msgstr "Følgende brugere er installeret: \n" #. module: base_setup #: field:base.setup.company,progress:0 #: field:base.setup.installer,progress:0 msgid "Configuration Progress" -msgstr "Konfigurations fremskridt" +msgstr "Konfigurationsfremgang" #. module: base_setup #: field:base.setup.company,rml_footer2:0 msgid "Report Footer 2" -msgstr "Rapport sidefod" +msgstr "Rapport sidefod 2" #. module: base_setup #: field:base.setup.company,currency:0 @@ -117,7 +120,7 @@ msgstr "Valuta" #. module: base_setup #: field:base.setup.company,state_id:0 msgid "Fed. State" -msgstr "" +msgstr "Delstat" #. module: base_setup #: field:base.setup.installer,marketing:0 @@ -127,12 +130,12 @@ msgstr "Markedsføring" #. module: base_setup #: field:base.setup.company,company_id:0 msgid "Company" -msgstr "Virksomhed" +msgstr "Firma" #. module: base_setup #: field:base.setup.installer,sale:0 msgid "Sales Management" -msgstr "Salgsledelse" +msgstr "Salgsstyring" #. module: base_setup #: help:base.setup.installer,profile_tools:0 @@ -140,8 +143,8 @@ msgid "" "Lets you install various interesting but non-essential tools like Survey, " "Lunch and Ideas box." msgstr "" -"Lader dig installere forskellige interessante, men ikke-væsentlige værktøjer " -"som f.eks. idé boks." +"Du kan installere forskellige interessante, men ikke afgørende værktøjer som " +"meningsmåling, frokost og idéer." #. module: base_setup #: view:base.setup.config:0 @@ -150,7 +153,7 @@ msgid "" "an administrator." msgstr "" "Du kan starte med at konfigurere systemet eller tilslutte dig direkte til " -"databasen som en administrator." +"databasen som administrator." #. module: base_setup #: field:base.setup.installer,report_designer:0 @@ -160,12 +163,12 @@ msgstr "Avanceret rapportering" #. module: base_setup #: field:base.setup.company,phone:0 msgid "Phone" -msgstr "Tlf. nr." +msgstr "Telefon" #. module: base_setup #: view:base.setup.company:0 msgid "res_config_contents" -msgstr "" +msgstr "res_config_contents" #. module: base_setup #: view:base.setup.company:0 @@ -173,8 +176,8 @@ msgid "" "Your company information will be used to personalize documents issued with " "OpenERP such as invoices, sales orders and much more." msgstr "" -"Dine virksomheds oplysninger vil blive brugt til at personliggøre dokumenter " -"udstedt med OpenERP såsom fakturaer, salgsordrer og meget mere." +"Dine virksomhedsoplysninger vil blive brugt til at individualisere " +"dokumenter fra OpenERP som fakturaer, salgsordrer m.m." #. module: base_setup #: view:base.setup.installer:0 @@ -184,7 +187,7 @@ msgstr "titel" #. module: base_setup #: field:base.setup.installer,knowledge:0 msgid "Knowledge Management" -msgstr "Knowledge Management" +msgstr "Videnstyring" #. module: base_setup #: model:ir.module.module,description:base_setup.module_meta_information @@ -205,18 +208,17 @@ msgid "" " " msgstr "" "\n" -" Dette modul implementerer en konfiguration, der hjælper brugeren\n" -" til at konfigurere en ny database på systemet.\n" +" Dette modul implementerer et konfigurationssystem, der hjælper brugeren\n" +" med at konfigurere systemet ved installation af en ny database.\n" "\n" -" Det giver dig mulighed for at vælge mellem en liste af profiler for at " -"installere:\n" +" Det giver dig mulighed for at installere forskellige profiler:\n" " * Minimal profil\n" " * Kun regnskab\n" " * Servicevirksomhed\n" " * Produktionsvirksomhed\n" "\n" -" Det stiller også spørgsmål som hjælper med at oprette sidehoved,\n" -" sidefod, kontokort og sprog\n" +" Modulet hjælper dig også med at oprette dit firma, sidehoved,\n" +" sidefod, kontoplan og sprog.\n" " " #. module: base_setup @@ -225,8 +227,8 @@ msgid "" "Installs a preselected set of OpenERP applications which will help you " "manage your industry." msgstr "" -"Installerer en forudvalgt sæt OpenERP applikationer, der vil hjælpe dig med " -"at administrere din branche." +"Installerer en sæt OpenERP moduler, der vil hjælpe dig med at administrere " +"din branche." #. module: base_setup #: help:base.setup.installer,project:0 @@ -234,8 +236,8 @@ msgid "" "Helps you manage your projects and tasks by tracking them, generating " "plannings, etc..." msgstr "" -"Hjælper dig med at administrere dine projekter og opgaver ved at spore dem, " -"generere planlægning, osv. .." +"Hjælper dig med at styre dine projekter og opgaver ved at spore dem, lave " +"planlægning, osv. .." #. module: base_setup #: field:base.setup.company,name:0 @@ -245,7 +247,7 @@ msgstr "Firmanavn" #. module: base_setup #: view:base.setup.config:0 msgid "Skip Configuration Wizards" -msgstr "Spring over konfigurations wizard" +msgstr "Spring konfigurationsguide over" #. module: base_setup #: help:base.setup.installer,hr:0 @@ -253,6 +255,8 @@ msgid "" "Helps you manage your human resources by encoding your employees structure, " "generating work sheets, tracking attendance and more." msgstr "" +"Hjælper dig med at styre dit personale ved at indkode dine medarbejderes " +"struktur, opret arbejdsplaner, checke fremmøde og m.m." #. module: base_setup #: help:base.setup.installer,account_voucher:0 @@ -260,6 +264,8 @@ msgid "" "Allows you to create your invoices and track the payments. It is an easier " "version of the accounting module for managers who are not accountants." msgstr "" +"Lader dig oprette fakturaer og spore betalinger. Det er en lettere udgave af " +"regnskabsmodulet for ledere, der ikke er regnskabskyndige.." #. module: base_setup #: model:ir.model,name:base_setup.model_base_setup_company @@ -272,7 +278,7 @@ msgid "" "Helps you manage your purchase-related processes such as requests for " "quotations, supplier invoices, etc..." msgstr "" -"Hjælper dig med at styre dit køb-relaterede processer såsom anmodninger om " +"Hjælper dig med at styre dine indkøbsrelaterede processer som anmodninger om " "tilbud, leverandørfakturaer, osv. .." #. module: base_setup @@ -282,6 +288,9 @@ msgid "" "We suggest you to put bank information here:\n" "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701" msgstr "" +"Denne sætning vises nederst i dine rapporter.\n" +"Vi forslår at vise bankoplysninger her:\n" +"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - Moms: BE0477.472.701" #. module: base_setup #: field:base.setup.company,street2:0 @@ -301,12 +310,12 @@ msgstr "Land" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_base_setup msgid "Setup" -msgstr "Setup" +msgstr "Opsætning" #. module: base_setup #: field:base.setup.installer,account_accountant:0 msgid "Accounting & Finance" -msgstr "Regnskab & Finans" +msgstr "Regnskab & finans" #. module: base_setup #: field:base.setup.installer,auction:0 @@ -321,7 +330,7 @@ msgstr "Postnr" #. module: base_setup #: view:base.setup.config:0 msgid "Start Configuration" -msgstr "Start konfiguration" +msgstr "Startkonfiguration" #. module: base_setup #: help:base.setup.installer,knowledge:0 @@ -329,8 +338,8 @@ msgid "" "Lets you install addons geared towards sharing knowledge with and between " "your employees." msgstr "" -"Lader dig installere addons rettet mod at dele viden med og mellem dine " -"medarbejdere." +"Lader dig installere tillægsmodul beregnet til at dele viden med og mellem " +"dine medarbejdere." #. module: base_setup #: view:base.setup.installer:0 @@ -338,15 +347,14 @@ msgid "" "Select the Applications you want your system to cover. If you are not sure " "about your exact needs at this stage, you can easily install them later." msgstr "" -"Vælg de programmer, du ønsker dit system skal indeholde. Hvis du ikke er " -"sikker på netop dine behov på nuvræendetidspunkt, kan du nemt installere dem " -"senere." +"Vælg de moduler, som dit system skal indeholde. Hvis du ikke er sikker dine " +"præcise behov på nuværende tidspunkt, kan du nemt installere dem senere." #. module: base_setup #: view:base.setup.company:0 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company msgid "Company Configuration" -msgstr "Firma opsætning" +msgstr "Firmaopsætning" #. module: base_setup #: field:base.setup.company,logo:0 @@ -360,31 +368,33 @@ msgid "" "simplified payment mode encoding, automatic picking lists generation and " "more." msgstr "" +"Hjælper dig med at få det bedste ud af dit detailhandelssystem med hurtigt " +"salg, enkel betaling, automatisk plukliste m.m." #. module: base_setup #: field:base.setup.installer,purchase:0 msgid "Purchase Management" -msgstr "Indkøbs administration" +msgstr "Indkøbsstyring" #. module: base_setup #: help:base.setup.installer,sale:0 msgid "Helps you handle your quotations, sale orders and invoicing." -msgstr "" +msgstr "Hjælper dig med dina tilbud, salgsordre och fakturer." #. module: base_setup #: field:base.setup.installer,stock:0 msgid "Warehouse Management" -msgstr "Lager administration" +msgstr "Lagerstyrning" #. module: base_setup #: field:base.setup.installer,project:0 msgid "Project Management" -msgstr "Projekt administration" +msgstr "Projektstyring" #. module: base_setup #: field:base.setup.config,installed_users:0 msgid "Installed Users" -msgstr "" +msgstr "Installerede brugere" #. module: base_setup #: view:base.setup.config:0 @@ -394,7 +404,7 @@ msgstr "Ny database" #. module: base_setup #: field:base.setup.installer,crm:0 msgid "Customer Relationship Management" -msgstr "" +msgstr "Kundestyring (CRM)" #. module: base_setup #: help:base.setup.installer,auction:0 @@ -402,6 +412,8 @@ msgid "" "Installs a preselected set of OpenERP applications selected to help you " "manage your auctions as well as the business processes around them." msgstr "" +"Installerer et sæt OpenERP moduler, som hjælper med at styre auktioner og " +"tilhørende forretningsprocesserne." #. module: base_setup #: help:base.setup.company,rml_header1:0 @@ -410,6 +422,9 @@ msgid "" "We suggest you to put a slogan here:\n" "\"Open Source Business Solutions\"." msgstr "" +"Denne sætning vises i øverste højre hjørne af dine rapporter.\n" +"Vi foreslår at indsætte et slogan her:\n" +"\"Open Source fimaløsninger\"." #. module: base_setup #: help:base.setup.installer,report_designer:0 @@ -417,28 +432,30 @@ msgid "" "Lets you install various tools to simplify and enhance OpenERP's report " "creation." msgstr "" +"Lader dig installere diverse værktøjer til forenkle og forbedre udvikling af " +"rapporter i OpenERP." #. module: base_setup #: field:base.setup.company,rml_header1:0 msgid "Report Header" -msgstr "" +msgstr "Rapporthoved" #. module: base_setup #: view:base.setup.config:0 msgid "Information about your new database" -msgstr "" +msgstr "Information om din nye database" #. module: base_setup #: field:base.setup.company,config_logo:0 #: field:base.setup.config,config_logo:0 #: field:base.setup.installer,config_logo:0 msgid "Image" -msgstr "" +msgstr "Billede" #. module: base_setup #: field:base.setup.installer,product_expiry:0 msgid "Food Industry" -msgstr "" +msgstr "Fødevareindustri" #. module: base_setup #: field:base.setup.installer,mrp:0 @@ -448,7 +465,7 @@ msgstr "Produktion" #. module: base_setup #: view:base.setup.company:0 msgid "Your Logo - Use a size of about 450x150 pixels." -msgstr "" +msgstr "Dit Logo - Brug en størrelse på ca. 450x150 pixels." #. module: base_setup #: help:base.setup.company,rml_footer1:0 @@ -457,16 +474,19 @@ msgid "" "We suggest you to write legal sentences here:\n" "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" msgstr "" +"Denne sætning vises nederst i dine rapporter.\n" +"Vi forslår at vise kontaktoplysninger her:\n" +"Web: http://openerp.com - Fax: +32 81 733 501 - Fortis Bank: 126-2013269-07" #. module: base_setup #: field:base.setup.company,website:0 msgid "Company Website" -msgstr "Virksomhedens hjemmeside" +msgstr "Firmaets hjemmeside" #. module: base_setup #: view:base.setup.installer:0 msgid "Install Specific Industry Applications" -msgstr "" +msgstr "Installerer specifikke branchemoduler" #. module: base_setup #: field:base.setup.company,street:0 @@ -476,18 +496,18 @@ msgstr "Gade" #. module: base_setup #: view:base.setup.company:0 msgid "Configure Your Company Information" -msgstr "" +msgstr "Opsætter dit firmaoplysninger" #. module: base_setup #: help:base.setup.company,website:0 msgid "Example: http://openerp.com" -msgstr "" +msgstr "Eksempel: http://openerp.com" #. module: base_setup #: view:base.setup.installer:0 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer msgid "Install Applications" -msgstr "" +msgstr "Installer moduler" #. module: base_setup #: help:base.setup.installer,crm:0 @@ -496,18 +516,21 @@ msgid "" "or issues. Can automatically send reminders, escalate requests or trigger " "business-specific actions based on standard events." msgstr "" +"Hjælper med at spore og styre kunderelationer, som potentielle kunder, " +"forespørgsler eller emner. Kan automatisk sende rykkere, fremme tilbud eller " +"udløse forretningsspecifikke handlinger baseret på standard begivenheder." #. module: base_setup #: help:base.setup.installer,stock:0 msgid "" "Helps you manage your inventory and main stock operations: delivery orders, " "receptions, etc." -msgstr "" +msgstr "Hjælper med lageroperationer: Levering, modtagelse osv." #. module: base_setup #: model:ir.module.module,shortdesc:base_setup.module_meta_information msgid "Base Setup" -msgstr "" +msgstr "Basal opsætning" #. module: base_setup #: help:base.setup.installer,association:0 @@ -515,11 +538,13 @@ msgid "" "Installs a preselected set of OpenERP applications which will help you " "manage your association more efficiently." msgstr "" +"Installerer OpwnERP moduler, som hjælper med styring af forbindelser mere " +"effektivt." #. module: base_setup #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" -msgstr "" +msgstr "base.setup.config" #~ msgid "Point of Sales" #~ msgstr "Point of sales" diff --git a/addons/base_tools/i18n/da.po b/addons/base_tools/i18n/da.po index c4865608d95..017d4b51952 100644 --- a/addons/base_tools/i18n/da.po +++ b/addons/base_tools/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-23 15:37+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 10:44+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_tools #: model:ir.module.module,shortdesc:base_tools.module_meta_information msgid "Common base for tools modules" -msgstr "" +msgstr "Fælles grundlag for værktøjsmoduler" #. module: base_tools #: model:ir.module.module,description:base_tools.module_meta_information diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po index 9a22ae44fcc..4941d1a3065 100644 --- a/addons/base_vat/i18n/da.po +++ b/addons/base_vat/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-11-17 08:50+0000\n" -"Last-Translator: SmartWi \n" +"PO-Revision-Date: 2011-11-08 10:58+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_vat #: code:addons/base_vat/base_vat.py:87 @@ -24,6 +24,8 @@ msgid "" "The Vat does not seems to be correct. You should have entered something like " "this %s" msgstr "" +"Momsen ser ikke ud til at være korrekt. Der skulle være indtastet noget " +"svarende til dette %s" #. module: base_vat #: model:ir.module.module,description:base_vat.module_meta_information @@ -38,22 +40,31 @@ msgid "" "countries.\n" " " msgstr "" +"\n" +" Aktiverer CVR-nr. (momsnr.) for kontakten. Checker gyldigheden af CVR-" +"nr. (momsnr.)\n" +"\n" +" Dette modul bruger metoder beskrevet på http://sima-pc.com/nif.php for " +"at\n" +" checke gyldigheden af CVR-nr. (momsnr.) tilknyttet kontakter i EU-" +"landene.\n" +" " #. module: base_vat #: model:ir.module.module,shortdesc:base_vat.module_meta_information msgid "Base VAT - To check VAT number validity" -msgstr "" +msgstr "Moms grundlag - Til at checke CVR-nr. (momsnr.) gyldighed" #. module: base_vat #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "Fejl! Man kan ikke oprette rekursuve associerede medlemmer." #. module: base_vat #: code:addons/base_vat/base_vat.py:88 #, python-format msgid "The VAT is invalid, It should begin with the country code" -msgstr "" +msgstr "CVR-nr. (momsnr.) er ugyldigt. Det skal starte med landekode." #. module: base_vat #: help:res.partner,vat_subjected:0 @@ -61,16 +72,18 @@ msgid "" "Check this box if the partner is subjected to the VAT. It will be used for " "the VAT legal statement." msgstr "" +"Afkryds dette felt, hvis kontakten er momsregistreret. Det bruges til " +"momsbestemmelser." #. module: base_vat #: model:ir.model,name:base_vat.model_res_partner msgid "Partner" -msgstr "" +msgstr "Kontakt" #. module: base_vat #: field:res.partner,vat_subjected:0 msgid "VAT Legal Statement" -msgstr "Moms bestemmelser" +msgstr "Momsbestemmelser" #~ msgid "VAT" #~ msgstr "Moms" diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po index aae44c7b084..f7b7feadb2a 100644 --- a/addons/crm/i18n/da.po +++ b/addons/crm/i18n/da.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-10-26 14:18+0000\n" -"Last-Translator: Nicholas Christian Langkjær Ipsen " -"\n" +"PO-Revision-Date: 2011-11-08 21:47+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: crm #: view:crm.lead.report:0 @@ -43,7 +42,7 @@ msgstr "Månedligt" #. module: crm #: view:crm.opportunity2phonecall:0 msgid "Schedule a PhoneCall" -msgstr "" +msgstr "Planlæg et telefon kald" #. module: crm #: model:ir.model,name:crm.model_crm_case_stage diff --git a/addons/crm_caldav/i18n/da.po b/addons/crm_caldav/i18n/da.po index d79cc099c5c..2d68bcce53e 100644 --- a/addons/crm_caldav/i18n/da.po +++ b/addons/crm_caldav/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-11-22 07:37+0000\n" -"Last-Translator: Martin Pihl \n" +"PO-Revision-Date: 2011-11-08 21:45+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: crm_caldav #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse @@ -43,4 +43,4 @@ msgstr "" #. module: crm_caldav #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse msgid "Synchronyze this calendar" -msgstr "" +msgstr "Synkronisere denne kalender" diff --git a/addons/decimal_precision/i18n/da.po b/addons/decimal_precision/i18n/da.po new file mode 100644 index 00000000000..28871b4c50d --- /dev/null +++ b/addons/decimal_precision/i18n/da.po @@ -0,0 +1,69 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-08 11:35+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: decimal_precision +#: field:decimal.precision,digits:0 +msgid "Digits" +msgstr "Cifre" + +#. module: decimal_precision +#: view:decimal.precision:0 +msgid "Decimal Precision" +msgstr "Betydende decimaler" + +#. module: decimal_precision +#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form +#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form +msgid "Decimal Accuracy Definitions" +msgstr "Definition af betydende decimaler" + +#. module: decimal_precision +#: model:ir.module.module,description:decimal_precision.module_meta_information +msgid "" +"\n" +"This module allows to configure the price accuracy you need for different " +"kind\n" +"of usage: accounting, sales, purchases, ...\n" +"\n" +"The decimal precision is configured per company.\n" +msgstr "" +"\n" +"Dette modul giver dig mulighed indstille prisnøjagtigheden til forskellig " +"brug:\n" +"Bogføring, salg, indkøb osv.\n" + +#. module: decimal_precision +#: field:decimal.precision,name:0 +msgid "Usage" +msgstr "Anvendelse" + +#. module: decimal_precision +#: sql_constraint:decimal.precision:0 +msgid "Only one value can be defined for each given usage!" +msgstr "Kun een værdi kan defineres for hver anvendelse!" + +#. module: decimal_precision +#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information +msgid "Decimal Precision Configuration" +msgstr "Opsætning af betydende decimaler" + +#. module: decimal_precision +#: model:ir.model,name:decimal_precision.model_decimal_precision +msgid "decimal.precision" +msgstr "decimal.precision" diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po index 7e4992e9a97..5c121017845 100644 --- a/addons/delivery/i18n/da.po +++ b/addons/delivery/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-18 16:52+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:36+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: delivery #: report:sale.shipping:0 @@ -25,7 +25,7 @@ msgstr "" #. module: delivery #: model:product.template,name:delivery.delivery_product_product_template msgid "Delivery by Poste" -msgstr "" +msgstr "Levering med post" #. module: delivery #: view:delivery.grid:0 diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po index db4315d50b2..c45213396d2 100644 --- a/addons/document_webdav/i18n/da.po +++ b/addons/document_webdav/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-10-13 07:44+0000\n" -"Last-Translator: Martin Pihl \n" +"PO-Revision-Date: 2011-11-08 21:52+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: document_webdav #: field:document.webdav.dir.property,create_date:0 @@ -56,7 +56,7 @@ msgstr "" #: view:document.webdav.dir.property:0 #: view:document.webdav.file.property:0 msgid "Group By..." -msgstr "" +msgstr "Gruppér efter..." #. module: document_webdav #: view:document.directory:0 diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po index 12421bacfd9..9db53ff2a77 100644 --- a/addons/event/i18n/da.po +++ b/addons/event/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-23 14:35+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-09 21:21+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: event #: view:event.event:0 @@ -42,7 +42,7 @@ msgstr "Hovedtaler" #: view:event.registration:0 #: view:report.event.registration:0 msgid "Group By..." -msgstr "" +msgstr "Gruppér efter..." #. module: event #: field:event.event,register_min:0 @@ -57,7 +57,7 @@ msgstr "" #. module: event #: field:event.registration.badge,title:0 msgid "Title" -msgstr "" +msgstr "Titel" #. module: event #: field:event.event,mail_registr:0 @@ -83,7 +83,7 @@ msgstr "" #. module: event #: view:partner.event.registration:0 msgid "_Close" -msgstr "" +msgstr "_Luk" #. module: event #: model:event.event,name:event.event_0 diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po index c55729d97fd..391cd357fa5 100644 --- a/addons/google_map/i18n/da.po +++ b/addons/google_map/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-11-20 07:53+0000\n" -"Last-Translator: Martin Pihl \n" +"PO-Revision-Date: 2011-11-08 21:48+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: google_map #: view:res.partner:0 @@ -48,7 +48,7 @@ msgstr "" #. module: google_map #: model:ir.module.module,shortdesc:google_map.module_meta_information msgid "Google Map" -msgstr "Google Kort" +msgstr "Google kort" #. module: google_map #: model:ir.model,name:google_map.model_res_partner_address diff --git a/addons/html_view/i18n/da.po b/addons/html_view/i18n/da.po index e340fd0f736..2c33fe8b010 100644 --- a/addons/html_view/i18n/da.po +++ b/addons/html_view/i18n/da.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-24 09:55+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:09+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: html_view #: field:html.view,name:0 msgid "Name" -msgstr "" +msgstr "Navn" #. module: html_view #: field:html.view,comp_id:0 msgid "Company" -msgstr "Virksomhed" +msgstr "Firma" #. module: html_view #: model:ir.actions.act_window,name:html_view.action_html_view_form @@ -36,17 +36,17 @@ msgstr "HTML test" #. module: html_view #: view:html.view:0 msgid "Html Example" -msgstr "" +msgstr "HTML eksempel" #. module: html_view #: model:ir.module.module,shortdesc:html_view.module_meta_information msgid "Html View" -msgstr "" +msgstr "HTML visning" #. module: html_view #: field:html.view,bank_ids:0 msgid "Banks" -msgstr "" +msgstr "Banker" #. module: html_view #: model:ir.module.module,description:html_view.module_meta_information @@ -56,8 +56,12 @@ msgid "" "view.\n" " " msgstr "" +"\n" +" Dette er testmodulet, der viser understøttelse af HTML tags i en normal " +"XML formular.\n" +" " #. module: html_view #: model:ir.model,name:html_view.model_html_view msgid "html.view" -msgstr "" +msgstr "html.view" diff --git a/addons/idea/i18n/da.po b/addons/idea/i18n/da.po index f26f0d38ffe..e285d0d1135 100644 --- a/addons/idea/i18n/da.po +++ b/addons/idea/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-11-01 20:17+0000\n" +"PO-Revision-Date: 2011-11-08 21:34+0000\n" "Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: idea #: help:idea.category,visibility:0 @@ -154,7 +154,7 @@ msgstr "Idéstemme" #. module: idea #: field:idea.category,parent_id:0 msgid "Parent Categories" -msgstr "" +msgstr "Forældrekategorier" #. module: idea #: selection:idea.idea,my_vote:0 @@ -443,7 +443,7 @@ msgstr "Brugernavn" #. module: idea #: model:ir.model,name:idea.model_idea_vote_stat msgid "Idea Votes Statistics" -msgstr "" +msgstr "Stemme statistik" #. module: idea #: field:idea.comment,user_id:0 @@ -451,7 +451,7 @@ msgstr "" #: field:idea.vote,user_id:0 #: view:report.vote:0 msgid "User" -msgstr "Bruger" +msgstr "User" #. module: idea #: field:idea.vote,date:0 @@ -461,7 +461,7 @@ msgstr "Dato" #. module: idea #: view:idea.post.vote:0 msgid "Post" -msgstr "" +msgstr "Send" #. module: idea #: field:idea.idea,my_vote:0 @@ -512,7 +512,7 @@ msgstr "Historik" #. module: idea #: view:idea.idea:0 msgid "Vots Statistics" -msgstr "" +msgstr "Stemme statistik" #. module: idea #: field:report.vote,date:0 @@ -551,7 +551,7 @@ msgstr "Luk" #: view:idea.idea:0 #: view:report.vote:0 msgid "Open" -msgstr "Åbn" +msgstr "Åben" #. module: idea #: view:report.vote:0 @@ -640,17 +640,17 @@ msgstr "April" #. module: idea #: field:idea.idea,count_comments:0 msgid "Count of comments" -msgstr "" +msgstr "Antal kommentarer" #. module: idea #: field:idea.vote,score:0 msgid "Vote Status" -msgstr "" +msgstr "Stemme status" #. module: idea #: field:idea.idea,vote_avg:0 msgid "Average Score" -msgstr "" +msgstr "Gennemsnitlig score" #. module: idea #: field:idea.comment,idea_id:0 @@ -662,7 +662,7 @@ msgstr "" #: view:report.vote:0 #: field:report.vote,idea_id:0 msgid "Idea" -msgstr "" +msgstr "Idé" #. module: idea #: view:idea.idea:0 @@ -672,7 +672,7 @@ msgstr "Godkend" #. module: idea #: field:idea.post.vote,vote:0 msgid "Post Vote" -msgstr "" +msgstr "Send stemme" #. module: idea #: view:report.vote:0 diff --git a/addons/knowledge/i18n/da.po b/addons/knowledge/i18n/da.po new file mode 100644 index 00000000000..f198a77905b --- /dev/null +++ b/addons/knowledge/i18n/da.po @@ -0,0 +1,155 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-09 21:31+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: knowledge +#: model:ir.ui.menu,name:knowledge.menu_document +msgid "Knowledge" +msgstr "Viden" + +#. module: knowledge +#: help:knowledge.installer,wiki_quality_manual:0 +msgid "Creates an example skeleton for a standard quality manual." +msgstr "" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "Share information within the company with these specific Addons." +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,document_ftp:0 +msgid "Shared Repositories (FTP)" +msgstr "" + +#. module: knowledge +#: model:ir.module.module,shortdesc:knowledge.module_meta_information +msgid "Knowledge Management System" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,wiki:0 +msgid "Collaborative Content (Wiki)" +msgstr "" + +#. module: knowledge +#: help:knowledge.installer,document_ftp:0 +msgid "" +"Provides an FTP access to your OpenERP's Document Management System. It lets " +"you access attachments and virtual documents through a standard FTP client." +msgstr "" + +#. module: knowledge +#: help:knowledge.installer,document_webdav:0 +msgid "" +"Provides a WebDAV access to your OpenERP's Document Management System. Lets " +"you access attachments and virtual documents through your standard file " +"browser." +msgstr "" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "Configure" +msgstr "Konfigurer" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "title" +msgstr "titel" + +#. module: knowledge +#: model:ir.module.module,description:knowledge.module_meta_information +msgid "" +"Installer for knowledge-based tools\n" +" " +msgstr "" + +#. module: knowledge +#: model:ir.ui.menu,name:knowledge.menu_document_configuration +msgid "Configuration" +msgstr "Konfiguration" + +#. module: knowledge +#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer +msgid "Knowledge Modules Installation" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,wiki_quality_manual:0 +msgid "Quality Manual" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,document_webdav:0 +msgid "Shared Repositories (WebDAV)" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,progress:0 +msgid "Configuration Progress" +msgstr "Konfigurationsfremgang" + +#. module: knowledge +#: help:knowledge.installer,wiki_faq:0 +msgid "" +"Creates a skeleton internal FAQ pre-filled with documentation about " +"OpenERP's Document Management System." +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,wiki_faq:0 +msgid "Internal FAQ" +msgstr "" + +#. module: knowledge +#: model:ir.ui.menu,name:knowledge.menu_document2 +msgid "Collaborative Content" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,config_logo:0 +msgid "Image" +msgstr "Billede" + +#. module: knowledge +#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer +#: view:knowledge.installer:0 +msgid "Knowledge Application Configuration" +msgstr "" + +#. module: knowledge +#: model:ir.model,name:knowledge.model_knowledge_installer +msgid "knowledge.installer" +msgstr "" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "Configure Your Knowledge Application" +msgstr "" + +#. module: knowledge +#: help:knowledge.installer,wiki:0 +msgid "" +"Lets you create wiki pages and page groups in order to keep track of " +"business knowledge and share it with and between your employees." +msgstr "" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "Content templates" +msgstr "" diff --git a/addons/l10n_hn/i18n/ca.po b/addons/l10n_hn/i18n/ca.po index 24de725e214..aad943ef40d 100644 --- a/addons/l10n_hn/i18n/ca.po +++ b/addons/l10n_hn/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/es.po b/addons/l10n_hn/i18n/es.po index 54a8a33376c..fa71768c797 100644 --- a/addons/l10n_hn/i18n/es.po +++ b/addons/l10n_hn/i18n/es.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/fr.po b/addons/l10n_hn/i18n/fr.po index f61ad5dae13..9d2e759a734 100644 --- a/addons/l10n_hn/i18n/fr.po +++ b/addons/l10n_hn/i18n/fr.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/gl.po b/addons/l10n_hn/i18n/gl.po index ef2997a1875..0c718c8e4eb 100644 --- a/addons/l10n_hn/i18n/gl.po +++ b/addons/l10n_hn/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/hu.po b/addons/l10n_hn/i18n/hu.po index 305ba7c6e40..8cb0490fdaa 100644 --- a/addons/l10n_hn/i18n/hu.po +++ b/addons/l10n_hn/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/it.po b/addons/l10n_hn/i18n/it.po index 36b0d853598..b2cbae2b860 100644 --- a/addons/l10n_hn/i18n/it.po +++ b/addons/l10n_hn/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/pt_BR.po b/addons/l10n_hn/i18n/pt_BR.po index 811711bfd59..85231507ac5 100644 --- a/addons/l10n_hn/i18n/pt_BR.po +++ b/addons/l10n_hn/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/sr@latin.po b/addons/l10n_hn/i18n/sr@latin.po index 861c48c341e..60d3fcb2dec 100644 --- a/addons/l10n_hn/i18n/sr@latin.po +++ b/addons/l10n_hn/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po index 36d205ac301..17a13380616 100644 --- a/addons/mrp/i18n/da.po +++ b/addons/mrp/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-22 19:10+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-09 21:53+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: mrp #: field:mrp.production,move_created_ids:0 @@ -74,7 +74,7 @@ msgstr "" #: field:mrp.production,picking_id:0 #: field:mrp.production.order,picking_id:0 msgid "Picking list" -msgstr "" +msgstr "Pluk liste" #. module: mrp #: code:addons/mrp/report/price.py:121 diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po index bfc38acb0ad..f67b9afca9c 100644 --- a/addons/mrp/i18n/pt.po +++ b/addons/mrp/i18n/pt.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-12-21 06:10+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2011-11-09 17:38+0000\n" +"Last-Translator: DReis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: mrp #: field:mrp.production,move_created_ids:0 @@ -376,7 +376,7 @@ msgstr "Quantidade" #. module: mrp #: field:mrp.production.workcenter.line,hour:0 msgid "Nbr of hours" -msgstr "Número de horas" +msgstr "N.º de horas" #. module: mrp #: view:mrp.production:0 diff --git a/addons/mrp_jit/i18n/da.po b/addons/mrp_jit/i18n/da.po index b501c281dfd..e7887542f67 100644 --- a/addons/mrp_jit/i18n/da.po +++ b/addons/mrp_jit/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2009-11-17 07:31+0000\n" -"Last-Translator: SmartWi \n" +"PO-Revision-Date: 2011-11-08 11:44+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: mrp_jit #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information msgid "MRP JIT" -msgstr "MRP JIT" +msgstr "MRP Just In Time" #. module: mrp_jit #: model:ir.module.module,description:mrp_jit.module_meta_information diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_subproduct/i18n/pt.po index 0aef00a5ab0..8ec1ced1ec6 100644 --- a/addons/mrp_subproduct/i18n/pt.po +++ b/addons/mrp_subproduct/i18n/pt.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-03 16:58+0000\n" -"PO-Revision-Date: 2010-12-09 08:35+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2011-11-09 17:33+0000\n" +"Last-Translator: DReis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: mrp_subproduct #: field:mrp.subproduct,product_id:0 @@ -97,7 +97,7 @@ msgstr "UOM" #. module: mrp_subproduct #: constraint:mrp.bom:0 msgid "Error ! You can not create recursive BoM." -msgstr "" +msgstr "Erro! Não pode criar BoM's recursivos." #. module: mrp_subproduct #: view:mrp.bom:0 diff --git a/addons/product_visible_discount/i18n/da.po b/addons/product_visible_discount/i18n/da.po new file mode 100644 index 00000000000..92f78c208b1 --- /dev/null +++ b/addons/product_visible_discount/i18n/da.po @@ -0,0 +1,81 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-08 11:47+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:147 +#, python-format +msgid "No Purchase Pricelist Found !" +msgstr "Kunne ikke finde indkøbsprisliste!" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:155 +#, python-format +msgid "No Sale Pricelist Found " +msgstr "Kunne ikke finde salgsprisliste! " + +#. module: product_visible_discount +#: model:ir.module.module,description:product_visible_discount.module_meta_information +msgid "" +"\n" +" This module lets you calculate discounts on Sale Order lines and Invoice " +"lines base on the partner's pricelist.\n" +" To this end, a new check box named \"Visible Discount\" is added to the " +"pricelist form.\n" +" Example:\n" +" For the product PC1 and the partner \"Asustek\": if listprice=450, " +"and the price calculated using Asustek's pricelist is 225\n" +" If the check box is checked, we will have on the sale order line: " +"Unit price=450, Discount=50,00, Net price=225\n" +" If the check box is unchecked, we will have on Sale Order and " +"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n" +" " +msgstr "" + +#. module: product_visible_discount +#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information +#: field:product.pricelist,visible_discount:0 +msgid "Visible Discount" +msgstr "Synlig rabat" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_account_invoice_line +msgid "Invoice Line" +msgstr "Fakturalinie" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:155 +#, python-format +msgid "You must first define a pricelist for Customer !" +msgstr "Man skal først definere en prisliste til kunden!" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_product_pricelist +msgid "Pricelist" +msgstr "Prisliste" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:147 +#, python-format +msgid "You must first define a pricelist for Supplier !" +msgstr "Man skal først definere en prisliste til leverandøren!" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_sale_order_line +msgid "Sales Order Line" +msgstr "Salgsordrelinie" diff --git a/addons/project_retro_planning/i18n/da.po b/addons/project_retro_planning/i18n/da.po new file mode 100644 index 00000000000..9003e2af861 --- /dev/null +++ b/addons/project_retro_planning/i18n/da.po @@ -0,0 +1,47 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-08 11:48+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: project_retro_planning +#: model:ir.model,name:project_retro_planning.model_project_project +msgid "Project" +msgstr "Projekt" + +#. module: project_retro_planning +#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information +msgid "Project Retro planning" +msgstr "" + +#. module: project_retro_planning +#: model:ir.module.module,description:project_retro_planning.module_meta_information +msgid "" +"\n" +" - If end date of project is changed\n" +" then the deadline date and start date for all the tasks will " +"change accordingly " +msgstr "" + +#. module: project_retro_planning +#: constraint:project.project:0 +msgid "Error! project start-date must be lower then project end-date." +msgstr "" + +#. module: project_retro_planning +#: constraint:project.project:0 +msgid "Error! You cannot assign escalation to the same project!" +msgstr "" diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po index fc89ea5fc5e..4c366d8124d 100644 --- a/addons/purchase/i18n/da.po +++ b/addons/purchase/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-19 08:04+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:35+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -76,7 +76,7 @@ msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Not Invoiced" -msgstr "" +msgstr "Ikke faktureret" #. module: purchase #: field:purchase.order,dest_address_id:0 diff --git a/addons/purchase_analytic_plans/i18n/da.po b/addons/purchase_analytic_plans/i18n/da.po new file mode 100644 index 00000000000..7679cbef497 --- /dev/null +++ b/addons/purchase_analytic_plans/i18n/da.po @@ -0,0 +1,51 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-03 16:58+0000\n" +"PO-Revision-Date: 2011-11-08 11:49+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: purchase_analytic_plans +#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line +msgid "Purchase Order Line" +msgstr "Indkøbsordrelinie" + +#. module: purchase_analytic_plans +#: sql_constraint:purchase.order:0 +msgid "Order Reference must be unique !" +msgstr "Ordre reference skal være unik" + +#. module: purchase_analytic_plans +#: field:purchase.order.line,analytics_id:0 +msgid "Analytic Distribution" +msgstr "" + +#. module: purchase_analytic_plans +#: model:ir.model,name:purchase_analytic_plans.model_purchase_order +msgid "Purchase Order" +msgstr "Indkøbsordre" + +#. module: purchase_analytic_plans +#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information +msgid "Purchase Analytic Distribution Management" +msgstr "" + +#. module: purchase_analytic_plans +#: model:ir.module.module,description:purchase_analytic_plans.module_meta_information +msgid "" +"\n" +" The base module to manage analytic distribution and purchase orders.\n" +" " +msgstr "" diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po index 51f05793939..f0c4e392425 100644 --- a/addons/sale/i18n/da.po +++ b/addons/sale/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-11-05 12:32+0000\n" +"PO-Revision-Date: 2011-11-08 17:59+0000\n" "Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-06 05:23+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: sale #: view:board.board:0 @@ -59,7 +59,7 @@ msgstr "Dag" #: model:process.transition.action,name:sale.process_transition_action_cancelorder0 #: view:sale.order:0 msgid "Cancel Order" -msgstr "Annuler ordre" +msgstr "Annuller ordre" #. module: sale #: view:sale.config.picking_policy:0 @@ -162,7 +162,7 @@ msgstr "Standard betalingsbetinelser" #. module: sale #: model:ir.actions.act_window,name:sale.action_config_picking_policy msgid "Configure Picking Policy for Sales Order" -msgstr "" +msgstr "Konfigurerer plukpolitik for salgsorder" #. module: sale #: view:sale.order:0 @@ -185,7 +185,7 @@ msgstr "" #. module: sale #: help:sale.make.invoice,grouped:0 msgid "Check the box to group the invoices for the same customers" -msgstr "" +msgstr "Afkryds for at gruppere fakturaer pr. kunde." #. module: sale #: selection:sale.order,invoice_quantity:0 @@ -200,13 +200,13 @@ msgstr "Salg pr. sælger" #. module: sale #: field:sale.order.line,move_ids:0 msgid "Inventory Moves" -msgstr "" +msgstr "Lagerbevægelser" #. module: sale #: field:sale.order,name:0 #: field:sale.order.line,order_id:0 msgid "Order Reference" -msgstr "" +msgstr "Ordre referense" #. module: sale #: view:sale.order:0 @@ -224,6 +224,8 @@ msgid "" "The invoice is created automatically if the shipping policy is 'Invoice from " "pick' or 'Invoice on order after delivery'." msgstr "" +"Fakturaen laves automatisk hvis leveringspolitiken er 'Fakturer på grundlag " +"af plukliste' eller 'Fakturer på grundlag af ordre efter levering'." #. module: sale #: model:ir.model,name:sale.model_sale_make_invoice @@ -245,6 +247,8 @@ msgstr "Rabat (%)" msgid "" "This is the days added to what you promise to customers for security purpose" msgstr "" +"Det er det antal dage som du lägger till det datum som du lovat kunden av " +"säkerhetsskäl" #. module: sale #: view:board.board:0 diff --git a/addons/sale_layout/i18n/da.po b/addons/sale_layout/i18n/da.po index cfe4d50326a..d27e07c62ae 100644 --- a/addons/sale_layout/i18n/da.po +++ b/addons/sale_layout/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-09-24 17:46+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-08 22:33+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: sale_layout #: selection:sale.order.line,layout_type:0 @@ -39,7 +39,7 @@ msgstr "" #. module: sale_layout #: selection:sale.order.line,layout_type:0 msgid "Title" -msgstr "" +msgstr "Titel" #. module: sale_layout #: report:sale.order.layout:0 @@ -49,7 +49,7 @@ msgstr "" #. module: sale_layout #: selection:sale.order.line,layout_type:0 msgid "Note" -msgstr "" +msgstr "Notat" #. module: sale_layout #: report:sale.order.layout:0 @@ -69,7 +69,7 @@ msgstr "Ordre linier" #. module: sale_layout #: report:sale.order.layout:0 msgid "Disc.(%)" -msgstr "" +msgstr "Rabat (%)" #. module: sale_layout #: field:sale.order.line,layout_type:0 diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po index 9c6d46ea564..32e56c8a088 100644 --- a/addons/stock/i18n/pt.po +++ b/addons/stock/i18n/pt.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-05-05 13:33+0000\n" -"Last-Translator: João Mouro \n" +"PO-Revision-Date: 2011-11-09 17:23+0000\n" +"Last-Translator: DReis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: stock #: field:product.product,track_outgoing:0 @@ -322,7 +322,7 @@ msgstr "Lote de produção" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action msgid "Units of Measure Categories" -msgstr "" +msgstr "Categorias de unidades de medida" #. module: stock #: help:stock.incoterms,code:0 diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po index a88e77396a1..a0879d0ff69 100644 --- a/addons/stock_invoice_directly/i18n/da.po +++ b/addons/stock_invoice_directly/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-03 16:58+0000\n" -"PO-Revision-Date: 2009-11-17 10:52+0000\n" -"Last-Translator: SmartWi \n" +"PO-Revision-Date: 2011-11-08 11:51+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: stock_invoice_directly #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking msgid "Partial Picking" -msgstr "" +msgstr "Delvis plukning" #. module: stock_invoice_directly #: model:ir.module.module,description:stock_invoice_directly.module_meta_information @@ -34,4 +34,4 @@ msgstr "" #. module: stock_invoice_directly #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information msgid "Invoice Picking Directly" -msgstr "Direkte faktura træk" +msgstr "Direkte faktura plukning" diff --git a/addons/stock_no_autopicking/i18n/da.po b/addons/stock_no_autopicking/i18n/da.po index b2937002baa..bdd4c196c8f 100644 --- a/addons/stock_no_autopicking/i18n/da.po +++ b/addons/stock_no_autopicking/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-03 16:58+0000\n" -"PO-Revision-Date: 2009-11-17 10:53+0000\n" -"Last-Translator: SmartWi \n" +"PO-Revision-Date: 2011-11-08 11:54+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: stock_no_autopicking #: model:ir.model,name:stock_no_autopicking.model_product_product msgid "Product" -msgstr "Vare" +msgstr "Produkt" #. module: stock_no_autopicking #: model:ir.module.module,description:stock_no_autopicking.module_meta_information @@ -47,27 +47,27 @@ msgstr "Produktionsordre" #. module: stock_no_autopicking #: field:product.product,auto_pick:0 msgid "Auto Picking" -msgstr "Automatisk træk" +msgstr "Automatisk plukning" #. module: stock_no_autopicking #: help:product.product,auto_pick:0 msgid "Auto picking for raw materials of production orders." -msgstr "Automatisk træk af råmatriale i produktionsordre" +msgstr "Automatisk plukning af råmatriale i produktionsordre" #. module: stock_no_autopicking #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Fejl: Forkert EAN-kode" #. module: stock_no_autopicking #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information msgid "Stock No Auto-Picking" -msgstr "Ingen automatisk lagertræk" +msgstr "Ingen automatisk lagerplukning" #. module: stock_no_autopicking #: constraint:mrp.production:0 msgid "Order quantity cannot be negative or zero !" -msgstr "" +msgstr "Ordre antal kan ikke være negativ eller 0." #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Ugyldig XML for View Architecture!" diff --git a/addons/thunderbird/i18n/da.po b/addons/thunderbird/i18n/da.po index 7d8794fd4ec..f098ae333f9 100644 --- a/addons/thunderbird/i18n/da.po +++ b/addons/thunderbird/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-09-22 20:28+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-11-09 21:50+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: thunderbird #: field:thunderbird.installer,plugin_file:0 @@ -50,7 +50,7 @@ msgstr "" #. module: thunderbird #: view:thunderbird.installer:0 msgid "_Close" -msgstr "" +msgstr "_Luk" #. module: thunderbird #: field:thunderbird.installer,pdf_file:0 @@ -65,7 +65,7 @@ msgstr "Beskrivelse:" #. module: thunderbird #: view:thunderbird.installer:0 msgid "title" -msgstr "" +msgstr "titel" #. module: thunderbird #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird @@ -94,7 +94,7 @@ msgstr "" #: field:thunderbird.installer,name:0 #: field:thunderbird.installer,pdf_name:0 msgid "File name" -msgstr "Fil Navn" +msgstr "Filnavn" #. module: thunderbird #: view:thunderbird.installer:0 @@ -104,7 +104,7 @@ msgstr "" #. module: thunderbird #: field:thunderbird.installer,progress:0 msgid "Configuration Progress" -msgstr "" +msgstr "Konfigurationsfremgang" #. module: thunderbird #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer diff --git a/addons/wiki_sale_faq/i18n/da.po b/addons/wiki_sale_faq/i18n/da.po new file mode 100644 index 00000000000..6a60c08ca2c --- /dev/null +++ b/addons/wiki_sale_faq/i18n/da.po @@ -0,0 +1,70 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:16+0000\n" +"PO-Revision-Date: 2011-11-09 20:09+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: wiki_sale_faq +#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form +#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files +#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales +msgid "Documents" +msgstr "Dokumenter" + +#. module: wiki_sale_faq +#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test +msgid "Wiki Pages" +msgstr "" + +#. module: wiki_sale_faq +#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki +msgid "FAQ" +msgstr "FAQ" + +#. module: wiki_sale_faq +#: model:ir.module.module,description:wiki_sale_faq.module_meta_information +msgid "" +"This module provides a wiki FAQ Template\n" +" " +msgstr "" +"Dette modul leverer en wiki FAQ skabelon\n" +" " + +#. module: wiki_sale_faq +#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test +msgid "" +"Wiki pages allow you to share ideas and questions with coworkers. You can " +"create a new document that can be linked to one or several applications " +"(specifications of a project, FAQ for sales teams, etc.). Keywords can be " +"used to easily tag wiki pages. You should use this application with the " +"OpenERP web client interface." +msgstr "" + +#. module: wiki_sale_faq +#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information +msgid "Wiki -Sale - FAQ" +msgstr "" + +#. module: wiki_sale_faq +#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form +msgid "" +"Documents give you access to all files attached to any record. It is a " +"repository of all documents such as emails, project-related attachments or " +"any other documents. From this view, you can search through the content of " +"the documents. OpenERP automatically assign meta data based on the record " +"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW " +"and .PDF documents." +msgstr "" From ffbdc3fc1e5408b41b0e70a364d548c8feb22e67 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 10 Nov 2011 12:11:45 +0530 Subject: [PATCH 22/49] [FIX] Fixing issues related o2m relational field in notebook. bzr revid: bth@tinyerp.com-20111110064145-trcvnzyibt4wxwf9 --- .../web_mobile/static/src/js/form_mobile.js | 18 +++++++++--------- .../web_mobile/static/src/xml/web_mobile.xml | 19 ++++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index 75058bbf8e9..598f3c29739 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -93,17 +93,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children); var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields; var notebook=fields[get_fields[i].attrs.name].views.form.arch; - if(notebook){ - var til = notebook.attrs.string; - } } } } - } - - if(notebook){ - $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord,'til': til })); - }else{ $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord})); } self.formatdata(get_fields, fields, result, self.datarecord,'page_content','element'); @@ -186,6 +178,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ } if(!$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html()){ $('
    ').appendTo('#moe'); + for (var k = 0; k < notebooks.children.length; k++) { if (notebooks.children[k].attrs.string == lastid) { get_fields = self.get_fields(notebooks.children[k].children); @@ -240,7 +233,11 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ } } }); - self.formatdata(get_fields_test, fields_test, result, data_relational,'oe_form_'+listid+result.fields[relational].relation,'element'); + if(notebook){ + self.formatdata(get_fields_test, fields_test, result, data_relational,'oe_form_'+listid+result.fields[relational].relation,'element'); + }else{ + self.formatdata(get_fields_test, fields, result, data_relational,'oe_form_'+listid+result.fields[relational].relation,'element'); + } $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true); self.formatdata('', '', '', '','oe_form_'+listid+result.fields[relational].relation,'slider'); }else{ @@ -271,6 +268,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ if (view_fields[i].tag == 'level') { this.get_fields(view_fields[i].children, this.fields); } + if (view_fields[i].tag == 'page') { + this.get_fields(view_fields[i].children, this.fields); + } } return this.fields; }, diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml index 9a07da21ebe..8299d40c171 100644 --- a/addons/web_mobile/static/src/xml/web_mobile.xml +++ b/addons/web_mobile/static/src/xml/web_mobile.xml @@ -168,7 +168,7 @@
    - +
    @@ -346,4 +347,4 @@     - + \ No newline at end of file From a1dfda310b032d0d025417ac4df4722d69f41ca5 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Thu, 10 Nov 2011 12:51:48 +0530 Subject: [PATCH 23/49] [IMP] Minor change. bzr revid: jra@tinyerp.com-20111110072148-4lcpu2m3vir86xul --- addons/web_mobile/static/src/js/chrome_mobile.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index 99b9651fa7b..516de784adc 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -20,13 +20,10 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({ openerp.web.qweb.add_template("xml/web_mobile.xml"); var params = {}; this.$element.html(this.render()); - this.session = new openerp.web.Session("oe_errors"); this.crashmanager = new openerp.web.CrashManager(this); this.login = new openerp.web_mobile.Login(this, "oe_login"); -// this.session.on_session_invalid.add(this.login.do_ask_login); }, start: function() { - this.session.start(); this.login.start(); } }); From 390b83c7fcc2d11f8cd451866cbfba3cedecf73c Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 10 Nov 2011 10:32:21 +0100 Subject: [PATCH 24/49] [fix] problem in form open popup a form select create popup lp bug: https://launchpad.net/bugs/888395 fixed bzr revid: nicolas.vanhoren@openerp.com-20111110093221-u1ry76juajt6c1lz --- addons/web/static/src/js/core.js | 15 ++++++--------- addons/web/static/src/js/view_form.js | 6 ++++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 1929c573e42..0b49e1cc52d 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -887,8 +887,11 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W */ render_element: function() { var rendered = this.render(); - if (rendered || rendered === "") - this.$element = $(rendered); + if (rendered) { + var elem = $(rendered); + this.$element.replaceWith(elem); + this.$element = elem; + } return this; }, /** @@ -900,7 +903,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W render: function (additional) { if (this.template) return openerp.web.qweb.render(this.template, _.extend({widget: this}, additional || {})); - return false; + return null; }, /** * Method called after rendering. Mostly used to bind actions, perform asynchronous @@ -912,12 +915,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W * @returns {jQuery.Deferred} */ start: function() { - /* The default implementation is only useful for retro-compatibility, it is - not necessary to call it using _super() when using Widget for new components. */ - if (!this.$element) { - var tmp = document.getElementById(this.element_id); - this.$element = tmp ? $(tmp) : undefined; - } return $.Deferred().done().promise(); }, /** diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 15790d3c1c0..f532ea4a538 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2419,7 +2419,8 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope }, read_function: null}); this.initial_ids = this.options.initial_ids; this.created_elements = []; - openerp.web.form.dialog(this.render(), {close:function() { + this.render_element(); + openerp.web.form.dialog(this.$element, {close:function() { self.check_exit(); }}); this.start(); @@ -2607,7 +2608,8 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp this.row_id = row_id; this.context = context || {}; this.options = _.defaults(options || {}, {"auto_write": true}); - jQuery(this.render()).dialog({title: '', + this.render_element(); + this.$element.dialog({title: '', modal: true, width: 960, height: 600}); From a11dfc5e3578c583847e119830723047fa38bc76 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 11:07:52 +0100 Subject: [PATCH 25/49] [IMP] open non-editable m2o links inline (replace current record) rather than in a popup bzr revid: xmo@openerp.com-20111110100752-6x11ros4z1fhp0gc --- addons/web/static/src/js/view_form.js | 34 ++++++++++++++++----------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f532ea4a538..cd02267d0bc 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3015,7 +3015,7 @@ openerp.web.form.FieldSelectionReadonly = openerp.web.form.FieldReadonly.extend( this.$element.find('div').text(option ? option[1] : this.values[0][1]); } }); -openerp.web.form.FieldMany2OneReadonly = openerp.web.form.FieldCharReadonly.extend({ +openerp.web.form.FieldMany2OneReadonly = openerp.web.form.FieldURIReadonly.extend({ set_value: function (value) { value = value || null; this.invalid = false; @@ -3025,21 +3025,27 @@ openerp.web.form.FieldMany2OneReadonly = openerp.web.form.FieldCharReadonly.exte self.on_value_changed(); var real_set_value = function(rval) { self.value = rval; - var div = $(self.$element.find('div')); - div.html(''); - var a = $(div.find("a")); - a.text(rval ? rval[1] : ''); - a.click(function() { - var pop = new openerp.web.form.FormOpenPopup(self.view); - pop.show_element(self.field.relation, self.value[0],self.build_context(), {readonly:true}); - }); + self.$element.find('a') + .unbind('click') + .text(rval ? rval[1] : '') + .click(function () { + self.do_action({ + type: 'ir.actions.act_window', + res_model: self.field.relation, + res_id: self.value[0], + context: self.build_context(), + views: [[false, 'form']], + target: 'current' + }); + return false; + }); }; if (value && !(value instanceof Array)) { - var dataset = new openerp.web.DataSetStatic( - this, this.field.relation, self.build_context()); - dataset.name_get([value], function(data) { - real_set_value(data[0]); - }).fail(function() {self.tmp_value = undefined;}); + new openerp.web.DataSetStatic( + this, this.field.relation, self.build_context()) + .name_get([value], function(data) { + real_set_value(data[0]); + }); } else { setTimeout(function() {real_set_value(value);}, 0); } From 4ce75b1f7a60406523137680c1edbb5399a574f4 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 10 Nov 2011 11:21:53 +0100 Subject: [PATCH 26/49] [FIX] adpat web modules to changes in webclient [FIX] enable some web module only when there is a webclient (prepare embed) bzr revid: chs@openerp.com-20111110102153-pgktyws0gdgyq4f5 --- addons/pad/__openerp__.py | 3 ++ addons/pad/static/src/js/pad.js | 3 -- addons/share/__openerp__.py | 3 ++ addons/share/static/src/js/share.js | 9 ++-- addons/web_livechat/__openerp__.py | 3 ++ .../static/src/js/web_livechat.js | 47 +++++++++---------- addons/web_uservoice/__openerp__.py | 3 ++ .../static/src/js/web_uservoice.js | 20 ++++---- 8 files changed, 46 insertions(+), 45 deletions(-) diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 9bbeb558375..1abf8f0ebfa 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -22,5 +22,8 @@ Lets the company customize which Pad installation should be used to link to new 'web': True, 'certificate' : '001183545978470526509', 'js': ['static/src/js/pad.js'], + 'qweb' : [ + "static/src/xml/*.xml", + ], 'images': ['static/src/img/pad_link_companies.jpeg'], } diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js index d6f2c1de26b..acc91f2273e 100644 --- a/addons/pad/static/src/js/pad.js +++ b/addons/pad/static/src/js/pad.js @@ -1,8 +1,5 @@ openerp.pad = function(instance) { -var QWeb = instance.web.qweb; -QWeb.add_template('/pad/static/src/xml/pad.xml'); - instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({ on_attachments_loaded: function(attachments) { this._super(attachments); diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 954f915c885..b9077109c3c 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -56,6 +56,9 @@ synchronization with other companies, etc. 'certificate' : '001301246528927038493', 'js': ['static/src/js/share.js'], 'css': ['static/src/css/share.css'], + 'qweb' : [ + "static/src/xml/*.xml", + ], 'images': ['images/share_wizard.jpeg','images/sharing_wizard_step1.jpeg', 'images/sharing_wizard_step2.jpeg'], } diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js index 6d02a39cf1f..b2abc1832a4 100644 --- a/addons/share/static/src/js/share.js +++ b/addons/share/static/src/js/share.js @@ -1,7 +1,5 @@ openerp.share = function(instance) { -var QWeb = instance.web.qweb; -QWeb.add_template('/share/static/src/xml/share.xml'); function launch_wizard(self, view) { var action = view.widget_parent.action; @@ -30,10 +28,9 @@ function if_has_share(yes, no) { if (!_has_share) { _has_share = $.Deferred(function() { var self = this; - var session = instance.webclient.session; - session.on_session_invalid.add_last(function() { _has_share = null; }); - var func = new instance.web.Model(session, "share.wizard").get_func("has_share"); - func(session.uid).pipe(function(res) { + instance.connection.on_session_invalid.add_last(function() { _has_share = null; }); + var func = new instance.web.Model(null, "share.wizard").get_func("has_share"); + func(instance.connection.uid).pipe(function(res) { if(res) { self.resolve(); } else { diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py index 0731b003dbc..750c4ca7ec5 100644 --- a/addons/web_livechat/__openerp__.py +++ b/addons/web_livechat/__openerp__.py @@ -39,6 +39,9 @@ Add "Support" button in header from where you can access OpenERP Support. 'css' : [ 'static/src/css/lc.css', ], + 'qweb' : [ + "static/src/xml/*.xml", + ], 'installable': True, 'active': False, 'certificate': '0013762192410413', diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js index 6fed859449c..13c4bbe28d4 100644 --- a/addons/web_livechat/static/src/js/web_livechat.js +++ b/addons/web_livechat/static/src/js/web_livechat.js @@ -22,29 +22,6 @@ var __lc_buttons = []; openerp.web_livechat = function (openerp) { -var QWeb = openerp.web.qweb; -QWeb.add_template('/web_livechat/static/src/xml/web_livechat.xml'); - - -// tracking code from LiveChat -var license = '1035052', - params = '', - lang = 'en', - skill = '0'; -__lc_load = function (p) { if (typeof __lc_loaded != 'function') - if (p) { var d = document, l = d.createElement('script'), s = - d.getElementsByTagName('script')[0], a = unescape('%26'), - h = ('https:' == d.location.protocol ? 'https://' : 'http://'); l.type = 'text/javascript'; l.async = true; - l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load'; - if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) { - l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill; - l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params)); s.parentNode.insertBefore(l, s); - } else setTimeout(__lc_load, 1000); if(typeof __lc_serv != 'string'){ s.parentNode.insertBefore(l, s);} - } else __lc_load(Math.ceil(Math.random()*5)); } -__lc_load(); - - - openerp.web_livechat.Livechat = openerp.web.Widget.extend({ template: 'Header-LiveChat', @@ -94,7 +71,27 @@ openerp.web_livechat.Livechat = openerp.web.Widget.extend({ } }); -openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient); -openerp.webclient.livechat.prependTo('div.header_corner'); +if (openerp.webclient) { + // tracking code from LiveChat + var license = '1035052', + params = '', + lang = 'en', + skill = '0'; + __lc_load = function (p) { if (typeof __lc_loaded != 'function') + if (p) { var d = document, l = d.createElement('script'), s = + d.getElementsByTagName('script')[0], a = unescape('%26'), + h = ('https:' == d.location.protocol ? 'https://' : 'http://'); l.type = 'text/javascript'; l.async = true; + l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load'; + if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) { + l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill; + l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params)); s.parentNode.insertBefore(l, s); + } else setTimeout(__lc_load, 1000); if(typeof __lc_serv != 'string'){ s.parentNode.insertBefore(l, s);} + } else __lc_load(Math.ceil(Math.random()*5)); } + __lc_load(); + + // and add widget to webclient + openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient); + openerp.webclient.livechat.prependTo('div.header_corner'); +} }; diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py index 65f953ed3d1..64b443be3e2 100644 --- a/addons/web_uservoice/__openerp__.py +++ b/addons/web_uservoice/__openerp__.py @@ -39,5 +39,8 @@ Invite OpenERP user feedback, powered by uservoice. 'js': ['static/src/js/web_uservoice.js'], 'css': ['static/src/css/uservoice.css'], + 'qweb' : [ + "static/src/xml/*.xml", + ], 'images': ['static/src/img/submit_an_idea.jpeg', 'static/src/img/web_uservoice_feedback.jpeg'], } diff --git a/addons/web_uservoice/static/src/js/web_uservoice.js b/addons/web_uservoice/static/src/js/web_uservoice.js index a574652686f..4110f149300 100644 --- a/addons/web_uservoice/static/src/js/web_uservoice.js +++ b/addons/web_uservoice/static/src/js/web_uservoice.js @@ -1,15 +1,6 @@ openerp.web_uservoice = function(instance) { -var QWeb = instance.web.qweb; -QWeb.add_template('/web_uservoice/static/src/xml/web_uservoice.xml'); - -$(function() { - var src = ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js"; - $.getScript(src); -}); - - instance.web_uservoice.UserVoice = instance.web.Widget.extend({ template: 'Header-UserVoice', default_forum: '77459', @@ -73,8 +64,15 @@ instance.web_uservoice.UserVoice = instance.web.Widget.extend({ }); -instance.webclient.uservoice = new instance.web_uservoice.UserVoice(instance.webclient); -instance.webclient.uservoice.prependTo('div.header_corner'); +if (instance.webclient) { + $(function() { + var src = ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js"; + $.getScript(src); + }); + + instance.webclient.uservoice = new instance.web_uservoice.UserVoice(instance.webclient); + instance.webclient.uservoice.prependTo('div.header_corner'); +} }; From 90972f5e27e82bc10d6c5459d6f90606f2674a84 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 11:36:50 +0100 Subject: [PATCH 27/49] [IMP] add confirmation message when deleting a record in form view bzr revid: xmo@openerp.com-20111110103650-pqss9bfejudyqkp2 --- addons/web/static/src/js/view_form.js | 14 ++++++++++---- addons/web/static/src/js/view_list.js | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cd02267d0bc..2739c74437e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -387,10 +387,16 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# var def = $.Deferred(); $.when(this.has_been_loaded).then(function() { if (self.can_be_discarded() && self.datarecord.id) { - self.dataset.unlink([self.datarecord.id]).then(function() { - self.on_pager_action('next'); - def.resolve(); - }); + if (confirm(_t("Do you really want to delete this record?"))) { + self.dataset.unlink([self.datarecord.id]).then(function() { + self.on_pager_action('next'); + def.resolve(); + }); + } else { + setTimeout(function () { + def.reject(); + }, 0) + } } }); return def.promise(); diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index e891a6c7db7..d1b9fd8cc0d 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -476,7 +476,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# * @param {Array} ids the ids of the records to delete */ do_delete: function (ids) { - if (!(ids.length && confirm(_t("Are you sure to remove those records ?")))) { + if (!(ids.length && confirm(_t("Do you really want to remove these records?")))) { return; } var self = this; From 8015497a02e5afe435eed9b13e1ad2dcaa116c13 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 11:49:33 +0100 Subject: [PATCH 28/49] [IMP] fix some identation bzr revid: xmo@openerp.com-20111110104933-cd4nfujpgxwqf817 --- openerp/addons/base/rng/view.rng | 116 +++++++++++++++---------------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index 7c13afd8bfc..a80dbb78bf9 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -1,42 +1,42 @@ - - - - - - - - - before - - after - - inside - - replace - - - - - - attributes - - - - - - - - - - - + + + + + + + + + before + + after + + inside + + replace + + + + + + attributes + + + + + + + + + + + @@ -44,29 +44,27 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + From c0c31c74bce5e48fb558b9c3aad5b67d802a5224 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 10 Nov 2011 12:02:06 +0100 Subject: [PATCH 29/49] [imp] made editable list in o2m auto-save bzr revid: nicolas.vanhoren@openerp.com-20111110110206-2ba4qnj71wa5l3p3 --- addons/web/static/src/js/view_form.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 2739c74437e..51e1577c6ff 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2041,7 +2041,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({ once.resolve(); }); controller.on_pager_action.add_first(function() { - self.save_form_view(); + self.save_any_view(); }); controller.$element.find(".oe_form_button_save").hide(); } else if (view_type == "graph") { @@ -2050,7 +2050,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({ def.resolve(); }); this.viewmanager.on_mode_switch.add_first(function(n_mode, b, c, d, e) { - $.when(self.save_form_view()).then(function() { + $.when(self.save_any_view()).then(function() { if(n_mode === "list") setTimeout(function() {self.reload_current_view();}, 0); }); @@ -2160,7 +2160,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({ this.dataset.to_delete, function(x) { return commands['delete'](x.id);})); }, - save_form_view: function() { + save_any_view: function() { if (this.viewmanager && this.viewmanager.views && this.viewmanager.active_view && this.viewmanager.views[this.viewmanager.active_view] && this.viewmanager.views[this.viewmanager.active_view].controller) { @@ -2172,6 +2172,13 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({ console.warn("Asynchronous get_value() is not supported in form view."); }*/ return res; + } else if (this.viewmanager.active_view === "list") { + var res = $.when(view.ensure_saved()); + // it seems line there are some cases when this happens + /*if (!res.isResolved() && !res.isRejected()) { + console.warn("Asynchronous get_value() is not supported in list view."); + }*/ + return res; } } return false; @@ -2196,7 +2203,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({ } }, is_dirty: function() { - this.save_form_view(); + this.save_any_view(); return this._super(); }, update_dom: function() { From 014fc455922d5c22d0e5646aef674ffd40b62de7 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 10 Nov 2011 16:39:14 +0530 Subject: [PATCH 30/49] [IMP] vieweditor:- default view select in manage view dialog box. bzr revid: ysa@tinyerp.com-20111110110914-o5scsgjqoaedd4wr --- addons/web/static/src/js/view_editor.js | 3 ++- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index fbc3048c04f..602d43a1db0 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -32,7 +32,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ action_buttons: false, search_view: false, pager: false, - radio: true + radio: true, + select_view_id: self.parent.fields_view.view_id }, }; this.view_edit_dialog = new openerp.web.Dialog(this, { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f5448168f5e..9d631b6ae01 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -625,7 +625,7 @@     - + From c71753e42a0149a100622bb77d06ba191c0768c9 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 10 Nov 2011 16:40:21 +0530 Subject: [PATCH 31/49] [FIX] vieweditor :- fix problem of assign default view in variable. bzr revid: ysa@tinyerp.com-20111110111021-7srfslh8bsqwnd56 --- addons/web/static/src/js/view_editor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 602d43a1db0..f901c2985dd 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -54,6 +54,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }, }).start().open(); + this.main_view_id = this.parent.fields_view.view_id; var action_manager = new openerp.web.ActionManager(this); action_manager.appendTo(this.view_edit_dialog); $.when(action_manager.do_action(action)).then(function() { From e361ee97d1fbd032ba32ee949e89cf51059b20f9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 12:26:11 +0100 Subject: [PATCH 32/49] [REF] deduplicate old-style dashboard elements bzr revid: xmo@openerp.com-20111110112611-u4mxmgp6lrezytdy --- openerp/addons/base/rng/view.rng | 57 +++++++++++++------------------- 1 file changed, 23 insertions(+), 34 deletions(-) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index a80dbb78bf9..d77c9cac6a9 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -44,6 +44,26 @@ + + + + + hpaned + vpaned + + + + + + + + + + + + + + @@ -52,12 +72,11 @@ - - + @@ -217,12 +236,11 @@ - - + @@ -276,34 +294,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -339,8 +329,7 @@ - - + From 44af6726ce4c7b2ca170b85417c4bec937534a07 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 10 Nov 2011 17:45:50 +0530 Subject: [PATCH 33/49] [IMP] improve xml template for checkbox and radio button. bzr revid: ysa@tinyerp.com-20111110121550-wg7k2oqgwh3v47km --- addons/web/static/src/xml/base.xml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9d631b6ae01..fe2c9266493 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -623,18 +623,9 @@ - - - - - - - - - - - - + + + Date: Thu, 10 Nov 2011 13:32:58 +0100 Subject: [PATCH 34/49] [fix] problem in readonly m2o lp bug: https://launchpad.net/bugs/888502 fixed bzr revid: nicolas.vanhoren@openerp.com-20111110123258-rae9jtwxk7ny38d3 --- addons/web/static/src/js/view_form.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 51e1577c6ff..b306dd3fdeb 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3062,6 +3062,15 @@ openerp.web.form.FieldMany2OneReadonly = openerp.web.form.FieldURIReadonly.exten } else { setTimeout(function() {real_set_value(value);}, 0); } + }, + get_value: function() { + if (!this.value) { + return false; + } else if (this.value instanceof Array) { + return this.value[0]; + } else { + return this.value; + } } }); From 783cc897d7e9beae53b31592c28c6036f77fe044 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 13:41:02 +0100 Subject: [PATCH 35/49] [ADD] new-style dashboards to schema bzr revid: xmo@openerp.com-20111110124102-2zhxrk8a68bvo75h --- openerp/addons/base/rng/view.rng | 70 +++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index d77c9cac6a9..408d032d75c 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -1,6 +1,7 @@ + xmlns:a="http://relaxng.org/ns/annotation/1.0" + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> @@ -44,8 +45,75 @@ + + + + + + + + + + + + + + + + + + + + + New-style (6.1) dashboard definition + + + + + Single-column dashboard style + + + 1 + + + + + + Three different 2-column dashboard styles: + 50|50, 33|66 and 66|33. + + + + 1-1 + 1-2 + 2-1 + + + + + + + + Three-column dashboard style: 33|33|33 + + + 1-1-1 + + + + + + + + hpaned From 0edad4d844730a04a76025cee79a4d276870f863 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 10 Nov 2011 13:50:46 +0100 Subject: [PATCH 36/49] [imp] critical improvement to avoid hurting sensibility of well-educated users that know stuff about typography conventions in english writing bzr revid: nicolas.vanhoren@openerp.com-20111110125046-3iii8wysyzwh3qcs --- addons/web/static/src/js/views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index a6aaf02d5e6..92ad85232c4 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -471,7 +471,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner $search_prefix = $title.find('span'); if (controller.searchable !== false) { if (!$search_prefix.length) { - $title.prepend('' + _t("Search:") + ''); + $title.prepend('' + _t("Search: ") + ''); } } else { $search_prefix.remove(); From f7d8a68af5d96c0539348b7a3be2ab3254bd79e5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 14:02:41 +0100 Subject: [PATCH 37/49] [IMP] board: migrate home and administration dashboards to new dashboard style bzr revid: xmo@openerp.com-20111110130241-5on26qoypm5736d0 --- addons/board/board_data_admin.xml | 12 ++++++------ addons/board/board_data_home.xml | 22 ++++++---------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml index 1f45a6f5a72..0a65d816d8f 100644 --- a/addons/board/board_data_admin.xml +++ b/addons/board/board_data_admin.xml @@ -136,15 +136,15 @@ form - - + + - - + + - - + + diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml index 0c360589a92..accb112673b 100644 --- a/addons/board/board_data_home.xml +++ b/addons/board/board_data_home.xml @@ -44,25 +44,15 @@ form
    - - + + - - + + - - - + +
    From f119de785c73619d5792df08b116c05a90ac4a3a Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Thu, 10 Nov 2011 18:39:50 +0530 Subject: [PATCH 38/49] [FIX]Fixed code for export xls null values should not shown in spreadsheet. lp bug: https://launchpad.net/bugs/885117 fixed bzr revid: kch@tinyerp.com-20111110130950-ap52c2x6fgklkuz2 --- addons/web/controllers/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 6f72d836ea4..72868647a48 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1417,6 +1417,7 @@ class ExcelExport(Export): for cell_index, cell_value in enumerate(row): if isinstance(cell_value, basestring): cell_value = re.sub("\r", " ", cell_value) + if cell_value is False: cell_value = None worksheet.write(row_index + 1, cell_index, cell_value, style) fp = StringIO() From f05f9130164222e4b99e7ef5c84ed37cf40c2609 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 14:29:40 +0100 Subject: [PATCH 39/49] [IMP] some naming in openerp.web.parse_value, throw actual errors bzr revid: xmo@openerp.com-20111110132940-0jt103hhlhh5jzej --- addons/web/static/src/js/formats.js | 60 ++++++++++++++--------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index ca540844b7f..bf25f55fef6 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -93,7 +93,7 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) { } while(tmp !== value); tmp = Number(value); if (isNaN(tmp)) - throw value + " is not a correct integer"; + throw new Error(value + " is not a correct integer"); return tmp; case 'float': var tmp = Number(value); @@ -107,42 +107,42 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) { } while(tmp !== tmp2); tmp = Number(tmp); if (isNaN(tmp)) - throw value + " is not a correct float"; + throw new Error(value + " is not a correct float"); return tmp; case 'float_time': - var tmp = value.split(":"); - if (tmp.length != 2) - throw value + " is not a correct float_time"; - var tmp1 = openerp.web.parse_value(tmp[0], {type: "integer"}); - var tmp2 = openerp.web.parse_value(tmp[1], {type: "integer"}); - return tmp1 + (tmp2 / 60); + var float_time_pair = value.split(":"); + if (float_time_pair.length != 2) + throw new Error(value + " is not a correct float_time"); + var hours = openerp.web.parse_value(float_time_pair[0], {type: "integer"}); + var minutes = openerp.web.parse_value(float_time_pair[1], {type: "integer"}); + return hours + (minutes / 60); case 'progressbar': return openerp.web.parse_value(value, {type: "float"}); case 'datetime': - var tmp = Date.parseExact(value, _.sprintf("%s %s", Date.CultureInfo.formatPatterns.shortDate, - Date.CultureInfo.formatPatterns.longTime)); - if (tmp !== null) - return openerp.web.datetime_to_str(tmp); - tmp = Date.parse(value); - if (tmp !== null) - return openerp.web.datetime_to_str(tmp); - throw value + " is not a valid datetime"; + var datetime = Date.parseExact(value, _.sprintf("%s %s", Date.CultureInfo.formatPatterns.shortDate, + Date.CultureInfo.formatPatterns.longTime)); + if (datetime !== null) + return openerp.web.datetime_to_str(datetime); + datetime = Date.parse(value); + if (datetime !== null) + return openerp.web.datetime_to_str(datetime); + throw new Error(value + " is not a valid datetime"); case 'date': - var tmp = Date.parseExact(value, Date.CultureInfo.formatPatterns.shortDate); - if (tmp !== null) - return openerp.web.date_to_str(tmp); - tmp = Date.parse(value); - if (tmp !== null) - return openerp.web.date_to_str(tmp); - throw value + " is not a valid date"; + var date = Date.parseExact(value, Date.CultureInfo.formatPatterns.shortDate); + if (date !== null) + return openerp.web.date_to_str(date); + date = Date.parse(value); + if (date !== null) + return openerp.web.date_to_str(date); + throw new Error(value + " is not a valid date"); case 'time': - var tmp = Date.parseExact(value, Date.CultureInfo.formatPatterns.longTime); - if (tmp !== null) - return openerp.web.time_to_str(tmp); - tmp = Date.parse(value); - if (tmp !== null) - return openerp.web.time_to_str(tmp); - throw value + " is not a valid time"; + var time = Date.parseExact(value, Date.CultureInfo.formatPatterns.longTime); + if (time !== null) + return openerp.web.time_to_str(time); + time = Date.parse(value); + if (time !== null) + return openerp.web.time_to_str(time); + throw new Error(value + " is not a valid time"); } return value; }; From abf6f08df0ca88b741adde1f3a48309243b24ffa Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 14:31:00 +0100 Subject: [PATCH 40/49] [ADD] fallback float_time parsing on float parsing if the value does not match float_time's format bzr revid: xmo@openerp.com-20111110133100-sp4ttbfy90cz9kjq --- addons/web/static/src/js/formats.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index bf25f55fef6..ae40981e1a7 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -112,7 +112,7 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) { case 'float_time': var float_time_pair = value.split(":"); if (float_time_pair.length != 2) - throw new Error(value + " is not a correct float_time"); + return openerp.web.parse_value(value, {type: "float"}); var hours = openerp.web.parse_value(float_time_pair[0], {type: "integer"}); var minutes = openerp.web.parse_value(float_time_pair[1], {type: "integer"}); return hours + (minutes / 60); From d1d47a3ff28641eb3bdf049c9e61177a9127ad67 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 10 Nov 2011 14:41:23 +0100 Subject: [PATCH 41/49] [FIX] Hitting ^C on Windows is broken, this patch should address the situation. This patch is adapted for trunk from the one provided by Olivier Ligot from Group S for 6.0. bzr revid: vmt@openerp.com-20111110134123-9sxi1s86pp242wbe --- openerp-server | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/openerp-server b/openerp-server index f17627906f1..71a52d5f06b 100755 --- a/openerp-server +++ b/openerp-server @@ -179,9 +179,12 @@ def dumpstacks(sig, frame): def setup_signal_handlers(): """ Register the signal handler defined above. """ SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split()) - map(lambda sig: signal.signal(sig, signal_handler), SIGNALS) if os.name == 'posix': + map(lambda sig: signal.signal(sig, signal_handler), SIGNALS) signal.signal(signal.SIGQUIT, dumpstacks) + elif os.name == 'nt': + import win32api + win32api.SetConsoleCtrlHandler(lambda sig: signal_handler(sig, None), 1) def quit_on_signals(): """ Wait for one or two signals then shutdown the server. @@ -191,9 +194,12 @@ def quit_on_signals(): """ # Wait for a first signal to be handled. (time.sleep will be interrupted - # by the signal handler.) - while quit_signals_received == 0: - time.sleep(60) + # by the signal handler.) The try/except is for the win32 case. + try: + while quit_signals_received == 0: + time.sleep(60) + except KeyboardInterrupt, e: + pass if config['pidfile']: os.unlink(config['pidfile']) From a21a208e4c7a46ec7e7128ea6015cad251da5894 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 14:50:52 +0100 Subject: [PATCH 42/49] [FIX] graph tooltips remaining on screen after clicking them bzr revid: xmo@openerp.com-20111110135052-u6r2uw5o5pqdgzpm --- addons/web_graph/static/src/js/graph.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 04e9d77f5d0..e183fc5cc43 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -373,9 +373,8 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ }, open_list_view : function (id){ var self = this; - if($(".dhx_tooltip").is(":visible")) { - $(".dhx_tooltip").remove('div'); - } + // unconditionally nuke tooltips before switching view + $(".dhx_tooltip").remove('div'); id = id[this.abscissa]; if (typeof id == 'object'){ id = id[0]; From dbb82b089b3e4d64b995850fdbf515030994a574 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 10 Nov 2011 14:51:06 +0100 Subject: [PATCH 43/49] [fix] exception when querying a tree view for an osv which does not contain any column (common in the wizards) lp bug: https://launchpad.net/bugs/877989 fixed bzr revid: nicolas.vanhoren@openerp.com-20111110135106-crieyt6cnscqocs5 --- openerp/osv/orm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 0d867fd946a..a89074d322d 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1808,7 +1808,7 @@ class BaseModel(object): """ _rec_name = self._rec_name if _rec_name not in self._columns: - _rec_name = self._columns.keys()[0] + _rec_name = self._columns.keys()[0] if len(self._columns.keys()) > 0 else "id" view = etree.Element('tree', string=self._description) etree.SubElement(view, 'field', name=_rec_name) From 96edd0d489154088f09b992f03228d1d2c21980a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 10 Nov 2011 15:07:54 +0100 Subject: [PATCH 44/49] [imp] made m2m support embedded list view lp bug: https://launchpad.net/bugs/888471 fixed bzr revid: nicolas.vanhoren@openerp.com-20111110140754-1nvbhwjpey7sr215 --- addons/web/static/src/js/view_form.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b306dd3fdeb..53d7eeb60fb 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2331,6 +2331,10 @@ openerp.web.form.FieldMany2Many = openerp.web.form.Field.extend({ 'deletable': self.is_readonly() ? false : true, 'selectable': self.multi_selection }); + var embedded = (this.field.views || {}).tree; + if (embedded) { + this.list_view.set_embedded_view(embedded); + } this.list_view.m2m_field = this; var loaded = $.Deferred(); this.list_view.on_loaded.add_last(function() { From 57b7239ad2e67cc67c2c5c6c15eb7c55a33f3b53 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 10 Nov 2011 15:13:43 +0100 Subject: [PATCH 45/49] [fix] advanced filters were broken bzr revid: nicolas.vanhoren@openerp.com-20111110141343-iavtdbq0i56ma0nl --- addons/web/static/src/js/search.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 18e035a40b8..0ceab43f1fd 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -963,10 +963,7 @@ openerp.web.search.ExtendedSearch = openerp.web.OldWidget.extend({ this.check_last_element(); }, start: function () { - this._super(); - if (!this.$element) { - return; // not a logical state but sometimes it happens - } + this.$element = $("#" + this.element_id); this.$element.closest("table.oe-searchview-render-line").css("display", "none"); var self = this; this.rpc("/web/searchview/fields_get", @@ -1028,7 +1025,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({ prop.start(); }, start: function () { - this._super(); + this.$element = $("#" + this.element_id); var _this = this; this.add_prop(); this.$element.find('.searchview_extended_add_proposition').click(function () { @@ -1080,7 +1077,7 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** this.value = null; }, start: function () { - this._super(); + this.$element = $("#" + this.element_id); this.select_field(this.fields.length > 0 ? this.fields[0] : null); var _this = this; this.$element.find(".searchview_extended_prop_field").change(function() { @@ -1188,7 +1185,7 @@ openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.OldWidget.ex return this.datewidget.get_value(); }, start: function() { - this._super(); + this.$element = $("#" + this.element_id); this.datewidget = new openerp.web.DateTimeWidget(this); this.datewidget.prependTo(this.$element); } @@ -1208,7 +1205,7 @@ openerp.web.search.ExtendedSearchProposition.Date = openerp.web.OldWidget.extend return this.datewidget.get_value(); }, start: function() { - this._super(); + this.$element = $("#" + this.element_id); this.datewidget = new openerp.web.DateWidget(this); this.datewidget.prependTo(this.$element); } From 9d81a30ca7dc17906bdcfc4a63ad576316ce023d Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 10 Nov 2011 15:35:40 +0100 Subject: [PATCH 46/49] [FIX] Added menu name to a menu item. lp bug: https://launchpad.net/bugs/888068 fixed bzr revid: vmt@openerp.com-20111110143540-xf035b5eg379rzdt --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 295009e85bf..4c4d4b668b1 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -604,7 +604,7 @@ - + From 78dec879cfa55787813bbd7bb222bddbf7d36aee Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 16:23:13 +0100 Subject: [PATCH 47/49] [IMP] throw actual errors in formatting functions, in order for browser devtools to be useful throwing strings prevents browser devtools/consoles from using traceback information (because there isn't any on strings) bzr revid: xmo@openerp.com-20111110152313-phgtr24gyu2ltjn7 --- addons/web/static/src/js/dates.js | 12 ++++++------ addons/web/static/src/js/formats.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/dates.js b/addons/web/static/src/js/dates.js index 036cf8cd90b..7861dd21b79 100644 --- a/addons/web/static/src/js/dates.js +++ b/addons/web/static/src/js/dates.js @@ -18,11 +18,11 @@ openerp.web.str_to_datetime = function(str) { var regex = /^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)(?:\.\d+)?$/; var res = regex.exec(str); if ( !res ) { - throw "'" + str + "' is not a valid datetime"; + throw new Error("'" + str + "' is not a valid datetime"); } var obj = Date.parse(res[1] + " GMT"); if (! obj) { - throw "'" + str + "' is not a valid datetime"; + throw new Error("'" + str + "' is not a valid datetime"); } return obj; }; @@ -41,11 +41,11 @@ openerp.web.str_to_date = function(str) { var regex = /^\d\d\d\d-\d\d-\d\d$/; var res = regex.exec(str); if ( !res ) { - throw "'" + str + "' is not a valid date"; + throw new Error("'" + str + "' is not a valid date"); } var obj = Date.parse(str); if (! obj) { - throw "'" + str + "' is not a valid date"; + throw new Error("'" + str + "' is not a valid date"); } return obj; }; @@ -64,11 +64,11 @@ openerp.web.str_to_time = function(str) { var regex = /^(\d\d:\d\d:\d\d)(?:\.\d+)?$/; var res = regex.exec(str); if ( !res ) { - throw "'" + str + "' is not a valid time"; + throw new Error("'" + str + "' is not a valid time"); } var obj = Date.parse(res[1]); if (! obj) { - throw "'" + str + "' is not a valid time"; + throw new Error("'" + str + "' is not a valid time"); } return obj; }; diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index ae40981e1a7..d5fcdd35b62 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -157,7 +157,7 @@ openerp.web.auto_str_to_date = function(value, type) { try { return openerp.web.str_to_time(value); } catch(e) {} - throw "'" + value + "' is not a valid date, datetime nor time" + throw new Error("'" + value + "' is not a valid date, datetime nor time"); }; openerp.web.auto_date_to_str = function(value, type) { @@ -169,7 +169,7 @@ openerp.web.auto_date_to_str = function(value, type) { case 'time': return openerp.web.time_to_str(value); default: - throw type + " is not convertible to date, datetime nor time" + throw new Error(type + " is not convertible to date, datetime nor time"); } }; From 48499f2e0a97f8c84cf3d45755309995a5ff5445 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 16:28:50 +0100 Subject: [PATCH 48/49] [FIX] list view: display group titles straight from read_group if we fail to format them read_group plays fast and loose with formats, and apparently has no problem returning arbitrary strings for date columns, arbitrary strings which may very well be completely unparseable. lp bug: https://launchpad.net/bugs/885289 fixed bzr revid: xmo@openerp.com-20111110152850-o31j3r4u5gdugznw --- addons/web/static/src/js/view_list.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index d1b9fd8cc0d..207d12a64e1 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1145,9 +1145,12 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L row_data[group.grouped_on] = group; var group_column = _(self.columns).detect(function (column) { return column.id === group.grouped_on; }); - $group_column.html(openerp.web.format_cell( - row_data, group_column, _t("Undefined") - )); + try { + $group_column.html(openerp.web.format_cell( + row_data, group_column, _t("Undefined"))); + } catch (e) { + $group_column.html(row_data[group_column.id].value); + } if (group.openable) { // Make openable if not terminal group & group_by_no_leaf $group_column From 453f747b1dda7ddcd9a2f2f3a627af3a12a33247 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 11 Nov 2011 10:42:58 +0530 Subject: [PATCH 49/49] [IMP] vieweditor :- improve variable name in widget. bzr revid: ysa@tinyerp.com-20111111051258-aap5omofy15d79qw --- addons/web/static/src/js/view_editor.js | 23 +++++++++++------------ addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index f901c2985dd..5ad94e4b5c2 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -560,7 +560,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var value = _.detect(arch_val[0]['att_list'],function(res) { return _.include(res, id); }); - if (id == 'groups') type_widget.value = self.groups; + if (id == 'groups') type_widget.selection = self.groups; self.edit_node_dialog.$element.find('table[id=rec_table]').append(''+id+':'+type_widget.render()+''); type_widget.start(); type_widget.set_value(value) @@ -607,7 +607,6 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({ this.$element = view.$element; this.dirty = false; this.name = id; - this.value = undefined; }, on_ui_change: function() { this.dirty = true; @@ -662,8 +661,8 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({ value = value === null ? false : value; value = value instanceof Array ? value[1] : value; var index = 0; - for (var i = 0, ii = this.value.length; i < ii; i++) { - if ((this.value[i] instanceof Array && this.value[i][1] === value) || this.value[i] === value) index = i; + for (var i = 0, ii = this.selection.length; i < ii; i++) { + if ((this.selection[i] instanceof Array && this.selection[i][1] === value) || this.selection[i] === value) index = i; } this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index; }, @@ -679,43 +678,43 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten var values = _.keys(this.registry.map); values.push(''); values.sort(); - this.value = values; + this.selection = values; }, }); openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({ init: function(view, id) { this._super(view, id); - this.value = icons; + this.selection = icons; }, }); openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({ init: function(view, id) { this._super(view, id); - this.value = [['', ''], ['new', 'New Window']]; + this.selection = [['', ''], ['new', 'New Window']]; }, }); openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({ init: function(view, id) { this._super(view, id); - this.value = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']]; + this.selection = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']]; }, }); openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({ init: function(view, id) { this._super(view, id); - this.value = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']]; + this.selection = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']]; }, }); openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({ init: function(view, id) { this._super(view, id); - this.value = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']]; + this.selection = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']]; }, }); openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({ init: function(view, id) { this._super(view, id); - this.value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']]; + this.selection = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']]; }, }); openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({ @@ -731,7 +730,7 @@ openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.exten var self = this; self.$element.find("#groups option").attr("selected",false); if (!value) return false; - _.each(this.value, function(item) { + _.each(this.selection, function(item) { if (_.include(value[1].split(','), item[0])) { self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1) } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fe2c9266493..d8eb6a3f8f4 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1317,7 +1317,7 @@