From b03e5f9034430dde015ad3511f6e4acff4b61936 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 22 Apr 2011 10:54:46 +0200 Subject: [PATCH 001/218] [IMP] Add a cron for the analytic accounts, this cron will send an email to the responsible of the pending accounts bzr revid: stephane@openerp.com-20110422085446-r744ot300i6qwksv --- addons/account_analytic_analysis/__init__.py | 1 + .../account_analytic_analysis/__openerp__.py | 1 + .../account_analytic_analysis.py | 20 ++++- .../account_analytic_analysis_cron.xml | 15 ++++ .../account_analytic_analysis_menu.xml | 58 ++++++++++++++ .../cron_account_analytic_account.py | 79 +++++++++++++++++++ 6 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 addons/account_analytic_analysis/account_analytic_analysis_cron.xml create mode 100644 addons/account_analytic_analysis/cron_account_analytic_account.py diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py index a7bdb11ad67..429aa011f31 100644 --- a/addons/account_analytic_analysis/__init__.py +++ b/addons/account_analytic_analysis/__init__.py @@ -20,6 +20,7 @@ ############################################################################## import account_analytic_analysis +import cron_account_analytic_account # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 588055b3741..f5dea6e77e0 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -41,6 +41,7 @@ user-wise as well as month wise. "security/ir.model.access.csv", "account_analytic_analysis_view.xml", "account_analytic_analysis_menu.xml", + "account_analytic_analysis_cron.xml", ], 'demo_xml' : [], 'installable': True, diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 11f92614b73..03dea210396 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -374,7 +374,25 @@ class account_analytic_account(osv.osv): res[id] = round(res.get(id, 0.0),2) return res - _columns ={ + def _is_overdue_quantity(self, cr, uid, ids, fieldnames, args, context=None): + result = dict.fromkeys(ids, 0) + + for record in self.browse(cr, uid, ids, context=context): + result[record.id] = int(record.quantity >= record.quantity_max) + + return result + + def _get_analytic_account(self, cr, uid, ids, context=None): + result = set() + for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context): + result.add(line.account_id.id) + return list(result) + + _columns = { + 'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity', + store={ + 'account.analytic.line' : (_get_analytic_account, None, 20), + }), 'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount', help="Total customer invoiced amount for this account.", digits_compute=dp.get_precision('Account')), diff --git a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml new file mode 100644 index 00000000000..7134d59414b --- /dev/null +++ b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml @@ -0,0 +1,15 @@ + + + + + Analytic Account Report for Sales + 1 + weeks + -1 + + + + + + + diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index badd7e1816a..a564db17dfc 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -21,5 +21,63 @@ [('date','<=',time.strftime('%Y-%m-%d')),('state','=','open')] + + + account.analytic.account.search + account.analytic.account + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Overdue Accounts + account.analytic.account + form + tree,form,graph + {'search_default_has_partner' : 1, 'search_default_current' : 1} + + + + + diff --git a/addons/account_analytic_analysis/cron_account_analytic_account.py b/addons/account_analytic_analysis/cron_account_analytic_account.py new file mode 100644 index 00000000000..2bc8e0f98b1 --- /dev/null +++ b/addons/account_analytic_analysis/cron_account_analytic_account.py @@ -0,0 +1,79 @@ +#!/usr/bin/env python +from osv import osv +from mako.template import Template +import time +try: + import cStringIO as StringIO +except ImportError: + import StringIO + +import tools + +MAKO_TEMPLATE = u"""Hello ${user.name}, + +Here is a list of contracts that have to be renewed for two +possible reasons: + - the end of contract date is passed + - the customer consumed more support hours than expected + +Can you contact the customer in order to sell a new or renew its contract. +the contract has been set with a pending state, can you update the status +of the analytic account following this rule: + - Set Done: if the customer does not want to renew + - Set Open: if the customer purchased an extra contract + +Here is the list of contracts to renew: +% for partner, accounts in partners.iteritems(): + * ${partner.name} + % for account in accounts: + - Name: ${account.name} + % if account.quantity_max != 0.0: + - Quantity: ${account.quantity}/${account.quantity_max} hours + % endif + - Dates: ${account.date_start} to ${account.date and account.date or '???'} + - Contacts: + % for address in account.partner_id.address: + . ${address.name}, ${address.phone}, ${address.email} + % endfor + + % endfor +% endfor + +You can use the report in the menu: Sales > Invoicing > Overdue Accounts + +Regards, + +-- +OpenERP +""" + +class analytic_account(osv.osv): + _inherit = 'account.analytic.account' + + def cron_account_analytic_account(self, cr, uid, context=None): + domain = [ + ('name', 'not ilike', 'maintenance'), + ('partner_id', '!=', False), + ('user_id', '!=', False), + ('user_id.user_email', '!=', False), + ('state', 'in', ('draft', 'open')), + '|', ('date', '<', time.strftime('%Y-%m-%d')), ('date', '=', False), + ] + + account_ids = self.search(cr, uid, domain, context=context, order='name asc') + accounts = self.browse(cr, uid, account_ids, context=context) + + users = dict() + for account in accounts: + users.setdefault(account.user_id, dict()).setdefault(account.partner_id, []).append(account) + + account.write({'state' : 'pending'}, context=context) + + for user, data in users.iteritems(): + subject = '[OPENERP] Reporting: Analytic Accounts' + body = Template(MAKO_TEMPLATE).render_unicode(user=user, partners=data) + tools.email_send('noreply@openerp.com', [user.user_email, ], subject, body) + + return True + +analytic_account() From 8fee569a7b4ea90ee4946975fdb6f3ad3d130c8f Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 22 Apr 2011 13:37:06 +0200 Subject: [PATCH 002/218] [REF] Clean up bzr revid: stephane@openerp.com-20110422113706-kyeoyfb79uvc5899 --- addons/base_action_rule/base_action_rule.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 2a4e2c0e4e1..869c8ea1f03 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -325,7 +325,7 @@ the rule to mark CC(mail to any other person defined in actions)."), @param context: A standard dictionary for contextual values """ if context is None: context = {} - ok = True + ok = True if action.filter_id: if action.model_id.model == action.filter_id.model_id: context.update(eval(action.filter_id.context)) @@ -445,19 +445,13 @@ the rule to mark CC(mail to any other person defined in actions)."), context = {} context.update({'action': True}) - if not scrit: - scrit = [] for action in self.browse(cr, uid, ids, context=context): - model_obj = self.pool.get(action.model_id.model) for obj in objects: - ok = self.do_check(cr, uid, action, obj, context=context) - if not ok: - continue + if self.do_check(cr, uid, action, obj, context=context): + model_obj = self.pool.get(action.model_id.model) + self.do_action(cr, uid, action, model_obj, obj, context=context) - if ok: - self.do_action(cr, uid, action, model_obj, obj, context) - break context.update({'action': False}) return True @@ -480,7 +474,7 @@ the rule to mark CC(mail to any other person defined in actions)."), return True _constraints = [ - (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']), + (_check_mail, 'Error: The mail is not well formatted', ['act_mail_body']), ] base_action_rule() From 63573d48d887a2906a54d9a08828984030acf8d0 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 22 Apr 2011 13:41:11 +0200 Subject: [PATCH 003/218] [FIX] Use the last description where the name is not a state of a CRM case bzr revid: stephane@openerp.com-20110422114111-pb1boou0lf3q9rlh --- addons/crm/crm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index f25e4c1a0bf..227b19db73e 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -466,6 +466,11 @@ class crm_case(object): src = case_email dest = case.user_id body = case.description or "" + for message in case.message_ids: + if message.name not in AVAILABLE_STATES.values(): + body = message.description + break + if case.message_ids: body = case.message_ids[0].description or "" if not destination: @@ -486,7 +491,7 @@ class crm_case(object): attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send) # Send an email - subject = "Reminder: [%s] %s" % (str(case.id), case.name,) + subject = "[%s] %s" % (str(case.id), case.name,) tools.email_send( src, [dest], From 65f1b3bcfb68db284e5fb530ba6a8e32f23a4386 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 22 Apr 2011 13:41:43 +0200 Subject: [PATCH 004/218] [FIX] Apply the change and call the do_action callback bzr revid: stephane@openerp.com-20110422114143-vum7ebti5q3lutip --- addons/crm/crm_action_rule.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 477f9132fab..62948a1d650 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -107,9 +107,7 @@ this if you want the rule to send an email to the partner."), @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @param context: A standard dictionary for contextual values """ - res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context) write = {} - if hasattr(action, 'act_section_id') and action.act_section_id: obj.section_id = action.act_section_id write['section_id'] = action.act_section_id.id @@ -127,6 +125,7 @@ this if you want the rule to send an email to the partner."), model_obj._history(cr, uid, [obj], _(action.act_state)) model_obj.write(cr, uid, [obj.id], write, context) + super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context) emails = [] if hasattr(obj, 'email_from') and action.act_mail_to_partner: From 1704c9f8822f77066ca78136f485bec995484716 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 22 Apr 2011 13:43:07 +0200 Subject: [PATCH 005/218] [REF] Use the set_reply_to function if this one exists in the object bzr revid: stephane@openerp.com-20110422114307-dyymgrgz0j4e1ace --- addons/crm/wizard/crm_send_email.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index 21902d9ece4..0282ddd346b 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -212,9 +212,13 @@ class crm_send_new_email(osv.osv_memory): res.update({'email_to': ''}) if 'email_from' in fields: res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or ''}) + if 'reply_to' in fields: - if hasattr(case, 'section_id'): - res.update({'reply_to': case.section_id and case.section_id.reply_to or False}) + if hasattr(case, 'set_reply_to'): + case.set_reply_to(res) + elif hasattr(case, 'section_id'): + res.update({'reply_to' : case.section_id and case.section_id.reply_to or False}) + if 'subject' in fields: res.update({'subject': tools.ustr(context.get('subject', case.name) or '')}) if context.get('mass_mail'): @@ -276,9 +280,10 @@ class crm_send_new_email(osv.osv_memory): if 'email_cc' in fields: email_cc = (case.email_cc and tools.ustr(case.email_cc) + ', ' or '') + (hist.email_cc or '') res.update({'email_cc': email_cc}) - if 'reply_to' in fields: - if hasattr(case, 'section_id'): - res.update({'reply_to': case.section_id.reply_to or ''}) + if hasattr(case, 'set_reply_to'): + case.set_reply_to(res) + elif hasattr(case, 'section_id'): + res.update({'reply_to': case.section_id.reply_to or ''}) if 'state' in fields: res['state'] = u'pending' return res From 6063f74810a9e2e510ec87f83709542c6a0c3f34 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 22 Apr 2011 13:43:35 +0200 Subject: [PATCH 006/218] [FIX] Catch the Exception and not the all bzr revid: stephane@openerp.com-20110422114335-jxm4jrbkw1hw24t3 --- .../mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py index 204cb2d5d03..e30741c882e 100644 --- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py +++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py @@ -86,7 +86,7 @@ if __name__ == '__main__': custom_values = {} try: custom_values = dict(eval(options.custom_values)) - except: + except Exception: pass parser.parse(msg_txt, custom_values) From dcf034bd52a861454a5dd7f10b0af5409468ba13 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 22 Apr 2011 13:44:23 +0200 Subject: [PATCH 007/218] [FIX] Use the Responsible (user_id) of the case as the default value in the sheet line. [FIX] Remove the on_change event on the analytic account in the worklogs bzr revid: stephane@openerp.com-20110422114423-fhqluv4tp1uho6x7 --- addons/project_issue_sheet/project_issue_sheet_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml index 058fd67a946..4de1caeddd3 100644 --- a/addons/project_issue_sheet/project_issue_sheet_view.xml +++ b/addons/project_issue_sheet/project_issue_sheet_view.xml @@ -18,11 +18,11 @@ - - + + - + From c56df0436089193581ccdf961f51442b96b38152 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 22 Apr 2011 13:46:05 +0200 Subject: [PATCH 008/218] [FIX] Set the user_id (Responsible) field when the user clicks up on the "Open" button. [FIX] There was a bug in the computation function for the working_hours, delay_open, ... fields. [FIX] The user_id (Responsible) is replaced by a many2one instead of a related field. [IMP] Escalation: The user_id (Responsible) is the project manager of the project escalation, if there is no project manager, let's empty. bzr revid: stephane@openerp.com-20110422114605-nlle7h9mpqq9yj00 --- addons/project_issue/project_issue.py | 43 ++++++++++++------- addons/project_issue/project_issue_view.xml | 21 +++++---- .../report/project_issue_report_view.xml | 8 ++-- 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index a8a32847243..e6ebf64e453 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -56,7 +56,7 @@ class project_issue(crm.crm_case, osv.osv): """ res = super(project_issue, self).case_open(cr, uid, ids, *args) - self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'assigned_to' : uid}) + self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id' : uid}) for (id, name) in self.name_get(cr, uid, ids): message = _("Issue '%s' has been opened.") % name self.log(cr, uid, id, message) @@ -90,32 +90,32 @@ class project_issue(crm.crm_case, osv.osv): res = {} for issue in self.browse(cr, uid, ids, context=context): + res[issue.id] = {} for field in fields: - res[issue.id] = {} duration = 0 ans = False hours = 0 + date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S") if field in ['working_hours_open','day_open']: if issue.date_open: - date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S") date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S") ans = date_open - date_create date_until = issue.date_open #Calculating no. of working hours to open the issue hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id, - datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), - datetime.strptime(issue.date_open, '%Y-%m-%d %H:%M:%S')) + date_create, + date_open) elif field in ['working_hours_close','day_close']: if issue.date_closed: - date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S") date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S") date_until = issue.date_closed ans = date_close - date_create #Calculating no. of working hours to close the issue hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id, - datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), - datetime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S')) + date_create, + date_close) + if ans: resource_id = False if issue.user_id: @@ -125,7 +125,11 @@ class project_issue(crm.crm_case, osv.osv): duration = float(ans.days) if issue.project_id and issue.project_id.resource_calendar_id: duration = float(ans.days) * 24 - new_dates = cal_obj.interval_min_get(cr, uid, issue.project_id.resource_calendar_id.id, datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), duration, resource=resource_id) + + new_dates = cal_obj.interval_min_get(cr, uid, + issue.project_id.resource_calendar_id.id, + date_create, + duration, resource=resource_id) no_days = [] date_until = datetime.strptime(date_until, '%Y-%m-%d %H:%M:%S') for in_time, out_time in new_dates: @@ -134,10 +138,12 @@ class project_issue(crm.crm_case, osv.osv): if out_time > date_until: break duration = len(no_days) + if field in ['working_hours_open','working_hours_close']: res[issue.id][field] = hours else: res[issue.id][field] = abs(float(duration)) + return res def _get_issue_task(self, cr, uid, ids, context=None): @@ -175,7 +181,7 @@ class project_issue(crm.crm_case, osv.osv): 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='Sales team to which Case belongs to.\ Define Responsible user and Email account for mail gateway.'), - 'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'), + 'user_id' : fields.many2one('res.users', select=1, string='Responsible'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \ domain="[('partner_id','=',partner_id)]"), @@ -282,7 +288,7 @@ class project_issue(crm.crm_case, osv.osv): 'date': bug.date, 'project_id': bug.project_id.id, 'priority': bug.priority, - 'user_id': bug.assigned_to.id, + 'user_id': bug.user_id.id, 'planned_hours': 0.0, }) @@ -362,13 +368,10 @@ class project_issue(crm.crm_case, osv.osv): """ cases = self.browse(cr, uid, ids) for case in cases: - data = {} + data = {'state' : 'draft'} if case.project_id.project_escalation_id: data['project_id'] = case.project_id.project_escalation_id.id - if case.project_id.project_escalation_id.user_id: - data['user_id'] = case.project_id.project_escalation_id.user_id.id - if case.task_id: - self.pool.get('project.task').write(cr, uid, [case.task_id.id], {'project_id': data['project_id'], 'user_id': False}) + data['user_id'] = case.project_id.project_escalation_id.user_id and case.project_id.project_escalation_id.user_id.id or False else: raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!')) self.write(cr, uid, [case.id], data) @@ -487,6 +490,14 @@ class project_issue(crm.crm_case, osv.osv): return super(project_issue, self).copy(cr, uid, id, default=default, context=context) + #def set_reply_to(self, cr, uid, oid, values, context=None): + # default_value = False + + # if oid: + # this = self.browse(cr, uid, oid, context=context)[0] + # if this.section_id: + # values['reply_to'] = this.section_id.email or default_value + project_issue() class project(osv.osv): diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 2224527e9d2..34d429b4352 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -55,8 +55,7 @@ - - + @@ -75,7 +74,7 @@ - + +
From db36bc97b4d6e12478830d47c820b183e697687b Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 7 Nov 2011 15:13:23 +0100 Subject: [PATCH 108/218] [fix] categories were broken bzr revid: nicolas.vanhoren@openerp.com-20111107141323-zmariwqu0qns3bcm --- addons/point_of_sale/static/src/js/pos.js | 9 +++++++++ addons/point_of_sale/static/src/xml/pos.xml | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 2964ad75991..5835f1e35e1 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -751,6 +751,10 @@ openerp.point_of_sale = function(db) { function CategoryView() { CategoryView.__super__.constructor.apply(this, arguments); } + + CategoryView.prototype.events = { + 'click .oe-pos-categories-list a': 'changeCategory' + }; CategoryView.prototype.template = qweb_template('pos-category-template'); CategoryView.prototype.render = function(ancestors, children) { @@ -776,6 +780,10 @@ openerp.point_of_sale = function(db) { })() })); }; + CategoryView.prototype.changeCategory = function(a) { + var id = $(a.target).data("category-id"); + this.trigger("changeCategory", id); + }; return CategoryView; })(); ProductView = (function() { @@ -1153,6 +1161,7 @@ openerp.point_of_sale = function(db) { } c = pos.categories[id]; $('#products-screen').html(this.categoryView.render(c.ancestors, c.children)); + this.categoryView.delegateEvents(); products = pos.store.get('product.product').filter( function(p) { var _ref; return _ref = p.pos_categ_id[0], __indexOf.call(c.subtree, _ref) >= 0; diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index d4962a62084..b9148395cbe 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -143,15 +143,15 @@
From ca05a8dbc667d7dfc2e5745c2c60f0cece132ff7 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 9 Nov 2011 16:56:45 +0100 Subject: [PATCH 180/218] [ADD] orm.fields_get: include `relation_field` for one2many fields bzr revid: odo@openerp.com-20111109155645-f7u5z14xhju271d5 --- openerp/osv/fields.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 1f5feb85c98..72df86eeff9 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -1385,6 +1385,9 @@ def field_to_dict(model, cr, user, field, context=None): res['domain'] = field._domain res['context'] = field._context + if isinstance(field, one2many): + res['relation_field'] = field._fields_id + return res From 15375b98356477b8ab84d89e7ba8c18d79c37eff Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 9 Nov 2011 17:13:10 +0100 Subject: [PATCH 181/218] [IMP] Added a yaml test for partial picking. It emphasizes a bug to fix bzr revid: fp@tinyerp.com-20111109161310-pdkn6jetk7q5ft5b --- addons/stock/test/stock_demo_backorder.yml | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/addons/stock/test/stock_demo_backorder.yml b/addons/stock/test/stock_demo_backorder.yml index 6981f115492..b3d40e63e0b 100644 --- a/addons/stock/test/stock_demo_backorder.yml +++ b/addons/stock/test/stock_demo_backorder.yml @@ -3,13 +3,13 @@ - I confirm and force the availability of all products on the picking OUT001 - - !python {model: stock.picking}: - self.draft_force_assign(cr, uid, ref('stock.stock_picking_1'), {}) - self.force_assign(cr, uid, ref('stock.stock_picking_1'), {}) + !python {model: stock.picking}: | + self.draft_force_assign(cr, uid, [ref('stock.stock_picking_1')], {}) + self.force_assign(cr, uid, [ref('stock.stock_picking_1')], {}) - After having confirmed the picking and its two lines, I add a new move line in draft state with 7 FAN2 - - !record {model: stock.move, id: stock_move_2}: + !record {model: stock.move, id: stock_move_3}: product_id: product.product_product_fan2 product_uom: product.product_uom_unit product_uos_qty: 7.0 @@ -20,10 +20,10 @@ picking_id: stock_picking_1 - | I click on 'Process Now' to process the delivery order and I change quantities to: - 5 CPU1, 0 CPU3, 3 FAN2 and a new product of 4 PC1 + 7 CPU1, 0 CPU3, 3 FAN2 and a new product of 4 PC1 - - !python {model: stock.picking}: - result = self.action_process(cr, uid, ref('stock.stock_picking_1'), {})['res_id'] + !python {model: stock.picking}: | + result = self.action_process(cr, uid, [ref('stock.stock_picking_1')], {})['res_id'] pick = self.pool.get('stock.partial.picking').browse(cr, uid, result, {}) lobj = self.pool.get('stock.partial.picking.line') for line in pick.move_ids: @@ -31,12 +31,16 @@ lobj.write(cr, uid, [line.id], { 'quantity': 0.0 }, {}) + elif line.product_id.id == ref('product.product_product_cpu1'): + lobj.write(cr, uid, [line.id], { + 'quantity': 7.0 + }, {}) elif line.product_id.id == ref('product.product_product_fan2'): lobj.write(cr, uid, [line.id], { 'quantity': 3.0 }, {}) lobj.create(cr, uid, { - 'product_id': + 'product_id': ref('product.product_product_pc1'), 'quantity': 2.0, 'product_uom': ref('product.product_uom_unit'), 'location_id': ref('stock.stock_location_stock'), @@ -45,6 +49,17 @@ }, {}) self.pool.get('stock.partial.picking').do_partial(cr, uid, [result], {}) - - I test that the back order contains + I test that the back order contains 5 CPU3, 4 FAN2 and nothing else - - + !python {model: stock.picking}: | + pick = self.browse(cr, uid, ref('stock.stock_picking_1'), {}) + for line in pick.move_lines: + if line.product_id.id == ref('product.product_product_cpu3'): + assert line.product_qty == 5.0, "Wrong quantity for CPU3 back order" + elif line.product_id.id == ref('product.product_product_fan2'): + assert line.product_qty == 4.0, "Wrong quantity for FAN2 back order" + elif line.product_id.id == ref('product.product_product_pc1'): + assert line.product_qty == 0.0, "Wrong quantity for PC1 back order" + else: + assert line.product_qty == 0.0, "Wrong quantity for %s back order" % (line.product_id.code,) + From 50391541ecd02048ebdb46ebbd2b1556b0389b01 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 9 Nov 2011 17:21:48 +0100 Subject: [PATCH 182/218] [FIX] bug in stock partial picking when adding a line in the wizard, fixed. bzr revid: fp@tinyerp.com-20111109162148-4l4cgn5u8ctw0zf3 --- addons/stock/test/stock_demo_backorder.yml | 4 ++-- addons/stock/wizard/stock_partial_picking.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/test/stock_demo_backorder.yml b/addons/stock/test/stock_demo_backorder.yml index b3d40e63e0b..986a59c7349 100644 --- a/addons/stock/test/stock_demo_backorder.yml +++ b/addons/stock/test/stock_demo_backorder.yml @@ -55,9 +55,9 @@ pick = self.browse(cr, uid, ref('stock.stock_picking_1'), {}) for line in pick.move_lines: if line.product_id.id == ref('product.product_product_cpu3'): - assert line.product_qty == 5.0, "Wrong quantity for CPU3 back order" + assert line.product_qty == 5.0, "Wrong quantity %.2f for CPU3 back order" % (line.product_qty,) elif line.product_id.id == ref('product.product_product_fan2'): - assert line.product_qty == 4.0, "Wrong quantity for FAN2 back order" + assert line.product_qty == 4.0, "Wrong quantity %.2f for FAN2 back order" % (line.product_qty,) elif line.product_id.id == ref('product.product_product_pc1'): assert line.product_qty == 0.0, "Wrong quantity for PC1 back order" else: diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py index cdc3d4deda6..f7f321e08e8 100644 --- a/addons/stock/wizard/stock_partial_picking.py +++ b/addons/stock/wizard/stock_partial_picking.py @@ -121,7 +121,7 @@ class stock_partial_picking(osv.osv_memory): 'location_dest_id' : move.location_dest_id.id, 'picking_id': partial.picking_id.id },context=context) - stock_move.action_done(cr, uid, [move_id], context) + #stock_move.action_done(cr, uid, [move_id], context) partial_data['move%s' % (move_id)] = { 'product_id': move.product_id.id, 'product_qty': move.quantity, From 316e4d3d1c8d5f49ac34a4f3e2c736de85098a76 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 9 Nov 2011 17:23:50 +0100 Subject: [PATCH 183/218] [FIX] partial picking, with push rules bzr revid: fp@tinyerp.com-20111109162350-ocepkblt2z7fobdq --- addons/stock/wizard/stock_partial_picking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py index f7f321e08e8..f6ecb6511eb 100644 --- a/addons/stock/wizard/stock_partial_picking.py +++ b/addons/stock/wizard/stock_partial_picking.py @@ -121,7 +121,7 @@ class stock_partial_picking(osv.osv_memory): 'location_dest_id' : move.location_dest_id.id, 'picking_id': partial.picking_id.id },context=context) - #stock_move.action_done(cr, uid, [move_id], context) + stock_move.action_confirm(cr, uid, [move_id], context) partial_data['move%s' % (move_id)] = { 'product_id': move.product_id.id, 'product_qty': move.quantity, From 611705d7f179fb1b3a6db9eff92e1f74ae3e9299 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 9 Nov 2011 17:32:32 +0100 Subject: [PATCH 184/218] [FIX] do not display reverse fields of o2ms in import compat bzr revid: xmo@openerp.com-20111109163232-w9oda8eqo3gyin4q --- addons/web/controllers/main.py | 8 ++++++-- addons/web/static/src/js/data_export.js | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 12c39d71a06..6f72d836ea4 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1193,7 +1193,8 @@ class Export(View): @openerpweb.jsonrequest def get_fields(self, req, model, prefix='', parent_name= '', - import_compat=True, parent_field_type=None): + import_compat=True, parent_field_type=None, + exclude=None): if import_compat and parent_field_type == "many2one": fields = {} @@ -1210,6 +1211,8 @@ class Export(View): records = [] for field_name, field in fields_sequence: + if import_compat and (exclude and field_name in exclude): + continue if import_compat and field.get('readonly'): # If none of the field's states unsets readonly, skip the field if all(dict(attrs).get('readonly', True) @@ -1221,7 +1224,8 @@ class Export(View): record = {'id': id, 'string': name, 'value': id, 'children': False, 'field_type': field.get('type'), - 'required': field.get('required')} + 'required': field.get('required'), + 'relation_field': field.get('relation_field')} records.append(record) if len(name.split('/')) < 3 and 'relation' in field: diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 51ac2cbd568..ea142606b5b 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -165,7 +165,11 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ } var model = record['params']['model'], prefix = record['params']['prefix'], - name = record['params']['name']; + name = record['params']['name'], + exclude_fields = []; + if (record['relation_field']) { + exclude_fields.push(record['relation_field']); + } if (!record.loaded) { var import_comp = self.$element.find("#import_compat").val(); @@ -174,7 +178,8 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ prefix: prefix, parent_name: name, import_compat: Boolean(import_comp), - parent_field_type : record['field_type'] + parent_field_type : record['field_type'], + exclude: exclude_fields }, function(results) { record.loaded = true; self.on_show_data(results, record.id); 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 185/218] 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 6eb112a68667c2c02205deab7e450c7210c7ecd6 Mon Sep 17 00:00:00 2001 From: "Hemendra Paregi (Open ERP)" Date: Thu, 10 Nov 2011 11:21:06 +0530 Subject: [PATCH 186/218] [IMP]mrp:improvement analysis report bzr revid: hpa@tinyerp.com-20111110055106-n99hlt8enf48kukm --- addons/mrp_operations/report/mrp_workorder_analysis_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index a9cf0cbb718..45b6ffd9be9 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -48,8 +48,10 @@ + graph,tree - {'search_default_Workcenter': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]} + {'search_default_Workcenter': 1,'search_default_year':1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]} 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 187/218] [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 9abd2f721d6a3778e95d1682983871427d8751cc Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Thu, 10 Nov 2011 12:49:51 +0530 Subject: [PATCH 188/218] [IMP]auction: improve buyer id for both case tuple and list bzr revid: mma@tinyerp.com-20111110071951-o7wnkopqfmzyyo40 --- addons/auction/wizard/auction_pay_buy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py index db7d3bf0e29..f73552aa69f 100644 --- a/addons/auction/wizard/auction_pay_buy.py +++ b/addons/auction/wizard/auction_pay_buy.py @@ -82,7 +82,7 @@ class auction_pay_buy(osv.osv_memory): lots = lot_obj.browse(cr, uid, context.get('active_ids', []), context=context) for lot in lots: if datas['buyer_id']: - if isinstance(datas['buyer_id'], tuple): + if isinstance(datas['buyer_id'], (tuple, list)): datas['buyer_id'] = datas['buyer_id'][0] lot_obj.write(cr, uid, [lot.id], {'ach_uid': datas['buyer_id']}) if not lot.auction_id: From a1dfda310b032d0d025417ac4df4722d69f41ca5 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Thu, 10 Nov 2011 12:51:48 +0530 Subject: [PATCH 189/218] [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 190/218] [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 191/218] [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 192/218] [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 193/218] [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 194/218] [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 195/218] [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 044ff3d2feab21d5650ca0c218f2763b5eb38c34 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 10 Nov 2011 12:21:39 +0100 Subject: [PATCH 196/218] [IMP] purchase: cleanup/improve refactored code, including: - correct wrong indentation for move/picking confirmation - improved/corrected docstring - change returned values to lists, as returning single ID has no sense - simplify code when possible bzr revid: odo@openerp.com-20111110112139-9qflyeuysrp138mt --- addons/purchase/purchase.py | 50 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index fe77e164fca..ecb2684d232 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -425,17 +425,13 @@ class purchase_order(osv.osv): return True def _prepare_order_picking(self, cr, uid, order, *args): - pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in') - istate = 'none' - if order.invoice_method=='picking': - istate = '2binvoiced' return { - 'name': pick_name, - 'origin': order.name+((order.origin and (':'+order.origin)) or ''), + 'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'), + 'origin': order.name + ((order.origin and (':' + order.origin)) or ''), 'date': order.date_order, 'type': 'in', 'address_id': order.dest_address_id.id or order.partner_address_id.id, - 'invoice_state': istate, + 'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none', 'purchase_id': order.id, 'company_id': order.company_id.id, 'move_lines' : [], @@ -443,7 +439,7 @@ class purchase_order(osv.osv): def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, *args): return { - 'name': order.name + ': ' +(order_line.name or ''), + 'name': order.name + ': ' + (order_line.name or ''), 'product_id': order_line.product_id.id, 'product_qty': order_line.product_qty, 'product_uos_qty': order_line.product_qty, @@ -463,8 +459,8 @@ class purchase_order(osv.osv): } def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, *args): - """ - Creates pickings and appropriate stock moves for given order lines. + """Creates pickings and appropriate stock moves for given order lines, then + confirms the moves, makes them available, and confirms the picking. If ``picking_id`` is provided, the stock moves will be added to it, otherwise a standard outgoing picking will be created to wrap the stock moves, as returned @@ -475,33 +471,35 @@ class purchase_order(osv.osv): different subsets of ``order_lines`` and/or preset ``picking_id`` values. :param browse_record order: purchase order to which the order lines belong - :param list(browse_record) order_lines: sale order line records to procure + :param list(browse_record) order_lines: purchase order line records for which picking + and moves should be created. :param int picking_id: optional ID of a stock picking to which the created stock moves - will be added. A new picking will be created if ommitted. - :return: True + will be added. A new picking will be created if omitted. + :return: list of IDs of pickings used/created for the given order lines (usually just one) """ if not picking_id: - picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, args)) + picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, *args)) todo_moves = [] + stock_move = self.pool.get('stock.move') + wf_service = netsvc.LocalService("workflow") for order_line in order_lines: if not order_line.product_id: continue - if order_line.product_id.product_tmpl_id.type in ('product', 'consu'): - move = self.pool.get('stock.move').create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, args)) + if order_line.product_id.type in ('product', 'consu'): + move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, *args)) if order_line.move_dest_id: - self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id': order.location_id.id}) + order_line.move_dest_id.write({'location_id': order.location_id.id}) todo_moves.append(move) - self.pool.get('stock.move').action_confirm(cr, uid, todo_moves) - self.pool.get('stock.move').force_assign(cr, uid, todo_moves) - wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr) - - return picking_id - + stock_move.action_confirm(cr, uid, todo_moves) + stock_move.force_assign(cr, uid, todo_moves) + wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr) + return [picking_id] + def action_picking_create(self,cr, uid, ids, *args): + picking_ids = [] for order in self.browse(cr, uid, ids): - picking_id = self._create_pickings(cr, uid, order, [order_line for order_line in order.order_line], None, args) - return picking_id #FIXME this is brittle to assume there is only 1 picking_id, but has been kept for API compatibility + picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, *args)) + return picking_ids def copy(self, cr, uid, id, default=None, context=None): if not default: From e361ee97d1fbd032ba32ee949e89cf51059b20f9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 12:26:11 +0100 Subject: [PATCH 197/218] [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 1b70c3d08a7632aafcb42cc9c7a33371a437115d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 10 Nov 2011 13:32:58 +0100 Subject: [PATCH 198/218] [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 199/218] [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 200/218] [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 201/218] [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 202/218] [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 203/218] [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 204/218] [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 205/218] [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 206/218] [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 207/218] [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 208/218] [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 209/218] [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 210/218] [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 211/218] [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 212/218] [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 42262e849721ef605c566cbe968aea0093e590de Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 10 Nov 2011 23:55:25 +0100 Subject: [PATCH 213/218] [FIX] sale: leftover typos in recent action_ship_create, *args need unpacking bzr revid: odo@openerp.com-20111110225525-qtseh6gsl6byn0nb --- addons/sale/sale.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index e54433c0b32..8963942dbff 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -767,13 +767,13 @@ class sale_order(osv.osv): if line.product_id: if line.product_id.product_tmpl_id.type in ('product', 'consu'): if not picking_id: - picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, args)) - move_id = self.pool.get('stock.move').create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, args)) + picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, *args)) + move_id = self.pool.get('stock.move').create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, *args)) else: # a service has no stock move move_id = False - proc_id = self.pool.get('procurement.order').create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, args)) + proc_id = self.pool.get('procurement.order').create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, *args)) proc_ids.append(proc_id) line.write({'procurement_id': proc_id}) @@ -812,7 +812,7 @@ class sale_order(osv.osv): def action_ship_create(self, cr, uid, ids, *args): for order in self.browse(cr, uid, ids, context={}): - self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, args) + self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, *args) return True def action_ship_end(self, cr, uid, ids, context=None): From d84a6c57579c96ef1fc9c9ab3b6c711152ee22ea Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 11 Nov 2011 01:31:27 +0100 Subject: [PATCH 214/218] [FIX] purchase: correct remaining error in last merge action_picking_create() must only return one picking ID, to be used to bind that picking's subflow in the PO's workflow. bzr revid: odo@openerp.com-20111111003127-gweu0vkcdgwi4tqd --- addons/purchase/purchase.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 7a074c9f679..83b20833c5f 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -500,7 +500,12 @@ class purchase_order(osv.osv): picking_ids = [] for order in self.browse(cr, uid, ids): picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, *args)) - return picking_ids + + # Must return one unique picking ID: the one to connect in the subflow of the purchase order. + # In case of multiple (split) pickings, we should return the ID of the critical one, i.e. the + # one that should trigger the advancement of the purchase workflow. + # By default we will consider the first one as most important, but this behavior can be overridden. + return picking_ids[0] if picking_ids else False def copy(self, cr, uid, id, default=None, context=None): if not default: From 2e2aa576d82b040051434076dc022e6b430fdcab Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 11 Nov 2011 04:53:59 +0000 Subject: [PATCH 215/218] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20111111045359-wofm3sh3jd0wnqnw --- addons/account_asset/i18n/sr@latin.po | 536 ++++++++ addons/account_budget/i18n/sr@latin.po | 113 +- addons/base_calendar/i18n/ar.po | 1665 ++++++++++++++++++++++++ addons/base_tools/i18n/sv.po | 30 + 4 files changed, 2292 insertions(+), 52 deletions(-) create mode 100644 addons/account_asset/i18n/sr@latin.po create mode 100644 addons/base_calendar/i18n/ar.po create mode 100644 addons/base_tools/i18n/sv.po diff --git a/addons/account_asset/i18n/sr@latin.po b/addons/account_asset/i18n/sr@latin.po new file mode 100644 index 00000000000..1b4d07213d3 --- /dev/null +++ b/addons/account_asset/i18n/sr@latin.po @@ -0,0 +1,536 @@ +# Serbian Latin 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: 2009-11-24 12:54+0000\n" +"PO-Revision-Date: 2011-11-10 16:33+0000\n" +"Last-Translator: Milan Milosevic \n" +"Language-Team: Serbian Latin \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-11 04:53+0000\n" +"X-Generator: Launchpad (build 14277)\n" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Open Assets" +msgstr "Slobodna sredstva" + +#. module: account_asset +#: field:account.asset.property,method_end:0 +#: field:account.asset.property.history,method_end:0 +msgid "Ending date" +msgstr "Datum završetka" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation board" +msgstr "Odbor za amortizaciju" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,name:0 +#: field:account.asset.board,asset_id:0 +#: field:account.asset.property,asset_id:0 +#: field:account.invoice.line,asset_id:0 +#: field:account.move.line,asset_id:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.model,name:account_asset.model_account_asset_asset +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +msgid "Asset" +msgstr "Sredstvo" + +#. module: account_asset +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Pogrešno ime modela u definiciji akcije." + +#. module: account_asset +#: selection:account.asset.property,method:0 +msgid "Linear" +msgstr "Linearno" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change duration" +msgstr "Izmeni trajanje" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Child assets" +msgstr "Dečja sredstva" + +#. module: account_asset +#: field:account.asset.board,value_asset:0 +msgid "Asset Value" +msgstr "Vrednost sredstva" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,name:0 +msgid "Reason" +msgstr "Razlog" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,entry_ids:0 +#: wizard_field:account.asset.compute,asset_compute,move_ids:0 +msgid "Entries" +msgstr "Stavke" + +#. module: account_asset +#: wizard_view:account.asset.compute,asset_compute:0 +msgid "Generated entries" +msgstr "Generisane stavke" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,method_delay:0 +#: field:account.asset.property,method_delay:0 +#: field:account.asset.property.history,method_delay:0 +msgid "Number of interval" +msgstr "Broj intervalâ" + +#. module: account_asset +#: wizard_button:account.asset.compute,asset_compute,asset_open:0 +msgid "Open entries" +msgstr "Otvorene stavke" + +#. module: account_asset +#: view:account.asset.asset:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list +#: model:ir.ui.menu,name:account_asset.menu_finance_Assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets +msgid "Assets" +msgstr "Sredstva" + +#. module: account_asset +#: selection:account.asset.property,method:0 +msgid "Progressive" +msgstr "Progresivno" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft +msgid "Draft Assets" +msgstr "Sredstva kao zabeleške" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +#: wizard_field:account.asset.modify,init,note:0 +#: view:account.asset.property.history:0 +msgid "Notes" +msgstr "Napomene" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change history" +msgstr "Izmeni istoriju" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation entries" +msgstr "Stavke amortizacije" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Methods" +msgstr "Metode" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +msgid "Asset properties to modify" +msgstr "Osobine sredstava za izmenu" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +msgid "Partner" +msgstr "Partner" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,method_period:0 +#: field:account.asset.property,method_period:0 +#: field:account.asset.property.history,method_period:0 +msgid "Period per interval" +msgstr "Period po intervalu" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation duration" +msgstr "Trajanje amortizacije" + +#. module: account_asset +#: field:account.asset.property,account_analytic_id:0 +msgid "Analytic account" +msgstr "Analitički konto" + +#. module: account_asset +#: field:account.asset.property,state:0 +msgid "State" +msgstr "Stanje" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation methods" +msgstr "Metodi amortizacije" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Other information" +msgstr "Ostale Informacije" + +#. module: account_asset +#: field:account.asset.board,value_asset_cumul:0 +msgid "Cumul. value" +msgstr "Kumul. vrednost" + +#. module: account_asset +#: view:account.asset.property:0 +msgid "Assets methods" +msgstr "Metodi sredstava" + +#. module: account_asset +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Nepravilan XML format za pregled ''Architecture''!" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_property +msgid "Asset property" +msgstr "Osobina sredstva" + +#. module: account_asset +#: wizard_view:account.asset.compute,asset_compute:0 +#: wizard_view:account.asset.compute,init:0 +#: wizard_button:account.asset.compute,init,asset_compute:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute +#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute +msgid "Compute assets" +msgstr "Izračunaj sredstva" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +#: wizard_button:account.asset.modify,init,asset_modify:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify +msgid "Modify asset" +msgstr "Izmeni sredstvo" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm asset" +msgstr "Potvrdi sredstvo" + +#. module: account_asset +#: view:account.asset.property.history:0 +#: model:ir.model,name:account_asset.model_account_asset_property_history +msgid "Asset history" +msgstr "Istorija sredstava" + +#. module: account_asset +#: field:account.asset.property,date:0 +msgid "Date created" +msgstr "Datum pravljenja" + +#. module: account_asset +#: model:ir.module.module,description:account_asset.module_meta_information +msgid "" +"Financial and accounting asset management.\n" +" Allows to define\n" +" * Asset category. \n" +" * Assets.\n" +" *Asset usage period and property.\n" +" " +msgstr "" +"Uređivanje finansijskih i obračunskih sredstava.\n" +" Omogućava definisanje\n" +" *Kategorije sredstva. \n" +" *Sredstva.\n" +" *Osobinu i trajanje upotrebe sredstva.\n" +" " + +#. module: account_asset +#: field:account.asset.board,value_gross:0 +#: field:account.asset.property,value_total:0 +msgid "Gross value" +msgstr "Bruto vrednost" + +#. module: account_asset +#: selection:account.asset.property,method_time:0 +msgid "Ending period" +msgstr "Datum završetka" + +#. module: account_asset +#: field:account.asset.board,name:0 +msgid "Asset name" +msgstr "Naziv sredstva" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Accounts information" +msgstr "Informacije o računu" + +#. module: account_asset +#: field:account.asset.asset,note:0 +#: field:account.asset.category,note:0 +#: field:account.asset.property.history,note:0 +msgid "Note" +msgstr "Napomena" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: selection:account.asset.property,state:0 +msgid "Draft" +msgstr "Nacrt" + +#. module: account_asset +#: field:account.asset.property,type:0 +msgid "Depr. method type" +msgstr "Tip metode amort." + +#. module: account_asset +#: field:account.asset.property,account_asset_id:0 +msgid "Asset account" +msgstr "Račun sredstva" + +#. module: account_asset +#: field:account.asset.property.history,asset_property_id:0 +msgid "Method" +msgstr "Metod" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +msgid "Normal" +msgstr "Normalno" + +#. module: account_asset +#: field:account.asset.property,method_progress_factor:0 +msgid "Progressif factor" +msgstr "Progresivni faktor" + +#. module: account_asset +#: field:account.asset.asset,localisation:0 +msgid "Localisation" +msgstr "Lokalizacija" + +#. module: account_asset +#: field:account.asset.property,method:0 +msgid "Computation method" +msgstr "Metod obračuna" + +#. module: account_asset +#: field:account.asset.property,method_time:0 +msgid "Time method" +msgstr "Metod vremena" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "Aktivno" + +#. module: account_asset +#: field:account.asset.property.history,user_id:0 +msgid "User" +msgstr "Korisnik" + +#. module: account_asset +#: field:account.asset.asset,property_ids:0 +msgid "Asset method name" +msgstr "Naziv metoda sredstva" + +#. module: account_asset +#: field:account.asset.asset,date:0 +#: field:account.asset.property.history,date:0 +msgid "Date" +msgstr "Datum" + +#. module: account_asset +#: field:account.asset.board,value_net:0 +msgid "Net value" +msgstr "Neto vrednost" + +#. module: account_asset +#: wizard_view:account.asset.close,init:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_close +msgid "Close asset" +msgstr "Zatvoreno sredstvo" + +#. module: account_asset +#: field:account.asset.property,history_ids:0 +msgid "History" +msgstr "Istorijat" + +#. module: account_asset +#: field:account.asset.property,account_actif_id:0 +msgid "Depreciation account" +msgstr "Račun za amortizaciju" + +#. module: account_asset +#: field:account.asset.asset,period_id:0 +#: wizard_field:account.asset.compute,init,period_id:0 +msgid "Period" +msgstr "Period" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form +msgid "Asset Category" +msgstr "Kategorija sredstva" + +#. module: account_asset +#: wizard_button:account.asset.close,init,end:0 +#: wizard_button:account.asset.compute,init,end:0 +#: wizard_button:account.asset.modify,init,end:0 +msgid "Cancel" +msgstr "Otkaži" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: wizard_button:account.asset.compute,asset_compute,end:0 +#: selection:account.asset.property,state:0 +msgid "Close" +msgstr "Zatvori" + +#. module: account_asset +#: selection:account.asset.property,state:0 +msgid "Open" +msgstr "Otvori" + +#. module: account_asset +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Ime stavke mora da počne sa x_ i ne sme da sadrži specijalne karaktere !" + +#. module: account_asset +#: model:ir.module.module,shortdesc:account_asset.module_meta_information +msgid "Asset management" +msgstr "Uređivanje sredstava" + +#. module: account_asset +#: view:account.asset.board:0 +#: field:account.asset.property,board_ids:0 +#: model:ir.model,name:account_asset.model_account_asset_board +msgid "Asset board" +msgstr "Odbor za sredstva" + +#. module: account_asset +#: field:account.asset.asset,state:0 +msgid "Global state" +msgstr "Globalno stanje" + +#. module: account_asset +#: selection:account.asset.property,method_time:0 +msgid "Delay" +msgstr "Kašnjenje" + +#. module: account_asset +#: wizard_view:account.asset.close,init:0 +msgid "General information" +msgstr "Opšti podaci" + +#. module: account_asset +#: field:account.asset.property,journal_analytic_id:0 +msgid "Analytic journal" +msgstr "Analitički dnevnik" + +#. module: account_asset +#: field:account.asset.property,name:0 +msgid "Method name" +msgstr "Naziv metode" + +#. module: account_asset +#: field:account.asset.property,journal_id:0 +msgid "Journal" +msgstr "Dnevnik" + +#. module: account_asset +#: field:account.asset.property.history,name:0 +msgid "History name" +msgstr "Naziv istorijata" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Close method" +msgstr "Zatvorena metoda" + +#. module: account_asset +#: field:account.asset.property,entry_asset_ids:0 +msgid "Asset Entries" +msgstr "Stavke sredstava" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 +#: view:account.asset.category:0 +#: field:account.asset.category,name:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "Kategorija sredstva" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation" +msgstr "Amortizacija" + +#. module: account_asset +#: field:account.asset.asset,code:0 +#: field:account.asset.category,code:0 +msgid "Asset code" +msgstr "Kod sredstva" + +#. module: account_asset +#: field:account.asset.asset,value_total:0 +msgid "Total value" +msgstr "Ukupna vrednost" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +msgid "View" +msgstr "Pregled" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General info" +msgstr "Opšti podaci" + +#. module: account_asset +#: field:account.asset.asset,sequence:0 +msgid "Sequence" +msgstr "Sekvenca" + +#. module: account_asset +#: field:account.asset.property,value_residual:0 +msgid "Residual value" +msgstr "Rezidualna vrednost" + +#. module: account_asset +#: wizard_button:account.asset.close,init,asset_close:0 +msgid "End of asset" +msgstr "Kraj sredstva" + +#. module: account_asset +#: selection:account.asset.property,type:0 +msgid "Direct" +msgstr "Direktno" + +#. module: account_asset +#: selection:account.asset.property,type:0 +msgid "Indirect" +msgstr "Indirektno" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent asset" +msgstr "Glavno sredstvo" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "Hijerarhija sredstava" diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po index 875d9341d99..55a5cf35391 100644 --- a/addons/account_budget/i18n/sr@latin.po +++ b/addons/account_budget/i18n/sr@latin.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-12-23 16:00+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2011-11-10 16:52+0000\n" +"Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \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:37+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-11 04:53+0000\n" +"X-Generator: Launchpad (build 14277)\n" #. module: account_budget #: field:crossovered.budget,creating_user_id:0 msgid "Responsible User" -msgstr "Odgovorni Korisnik" +msgstr "Odgovorni korisnik" #. module: account_budget #: selection:crossovered.budget,state:0 @@ -57,7 +57,7 @@ msgstr "Potvrdi korisnika" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report msgid "Print Summary" -msgstr "Stampa Suamrnog" +msgstr "Ištampaj rezime" #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 @@ -76,7 +76,7 @@ msgstr "Završetak perioda" #: view:crossovered.budget:0 #: selection:crossovered.budget,state:0 msgid "Draft" -msgstr "Priprema" +msgstr "Nacrt" #. module: account_budget #: report:account.budget:0 @@ -88,7 +88,7 @@ msgstr "u" #: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report msgid "Print Budgets" -msgstr "Stampa Budzeta" +msgstr "Ištampaj Budžete" #. module: account_budget #: report:account.budget:0 @@ -98,7 +98,7 @@ msgstr "Valuta:" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_crossvered_report msgid "Account Budget crossvered report" -msgstr "Izvestaj Unakrsnog budzeta Naloga" +msgstr "Izveštaj unakrsnog naloga budžeta" #. module: account_budget #: selection:crossovered.budget,state:0 @@ -118,7 +118,7 @@ msgstr "do" #. module: account_budget #: field:crossovered.budget,state:0 msgid "Status" -msgstr "Status" +msgstr "Stanje" #. module: account_budget #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view @@ -132,11 +132,19 @@ msgid "" "revenue per analytic account and monitor its evolution based on the actuals " "realised during that period." msgstr "" +"Budžet je predviđanje očekivanih dohodaka i rashoda Vašeg preduzeća za " +"jedan period u budućnosti. Sa budžetom, preduzeće može da ima uvid u to " +"koliko novca uzima za jedan dati period, i da odredi najbolji mogući način " +"za njegovu podelu na razne kategorije. Uz praćenje gde novac ide, biće manje " +"izgleda za njegovo suvišno trošenje, kao i za postizanje Vaših finansijskih " +"ciljeva. Predvidite budžet detaljisanjem očekivanog dohotka po analitičkom " +"kontu i pratite mu razvoj baziran na aktuelnostima za vreme trajanja tog " +"perioda." #. module: account_budget #: view:account.budget.crossvered.summary.report:0 msgid "This wizard is used to print summary of budgets" -msgstr "Ovaj carobnjak je koriscen za prikaz sumarnog budzeta" +msgstr "Ovaj wizard se upotrebljava za štampanje rezimee budžeta" #. module: account_budget #: report:account.budget:0 @@ -153,7 +161,7 @@ msgstr "Opis" #. module: account_budget #: report:crossovered.budget.report:0 msgid "Currency" -msgstr "" +msgstr "Valuta" #. module: account_budget #: report:crossovered.budget.report:0 @@ -170,12 +178,12 @@ msgstr "Preduzeće" #. module: account_budget #: view:crossovered.budget:0 msgid "To Approve" -msgstr "Za Odobravanje" +msgstr "Za odobravanje" #. module: account_budget #: view:crossovered.budget:0 msgid "Reset to Draft" -msgstr "Vrati na Pripremu" +msgstr "Vrati na pripremu" #. module: account_budget #: view:account.budget.post:0 @@ -214,35 +222,35 @@ msgstr "Stvarni iznos" #: field:crossovered.budget,date_to:0 #: field:crossovered.budget.lines,date_to:0 msgid "End Date" -msgstr "Završni Datum" +msgstr "Datum završetka" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_analytic #: model:ir.model,name:account_budget.model_account_budget_report msgid "Account Budget report for analytic account" -msgstr "Izvestaj Budzeta Naloga za Analiticki Konto" +msgstr "Izveštaj budžeta za nalog analitičkog konta" #. module: account_budget #: view:account.analytic.account:0 msgid "Theoritical Amount" -msgstr "Teoretski Iznos" +msgstr "Teoretski iznos" #. module: account_budget #: field:account.budget.post,name:0 #: field:crossovered.budget,name:0 msgid "Name" -msgstr "Ime" +msgstr "Naziv" #. module: account_budget #: model:ir.model,name:account_budget.model_crossovered_budget_lines msgid "Budget Line" -msgstr "Lnija Budzeta" +msgstr "Linija budžeta" #. module: account_budget #: view:account.analytic.account:0 #: view:account.budget.post:0 msgid "Lines" -msgstr "redova" +msgstr "Redovi" #. module: account_budget #: report:account.budget:0 @@ -252,13 +260,13 @@ msgstr "redova" #: model:ir.actions.report.xml,name:account_budget.account_budget #: model:ir.model,name:account_budget.model_crossovered_budget msgid "Budget" -msgstr "Budzet" +msgstr "Budžet" #. module: account_budget #: code:addons/account_budget/account_budget.py:119 #, python-format msgid "Error!" -msgstr "Greška" +msgstr "Greška!" #. module: account_budget #: field:account.budget.post,code:0 @@ -270,7 +278,7 @@ msgstr "Kod" #: view:account.budget.analytic:0 #: view:account.budget.crossvered.report:0 msgid "This wizard is used to print budget" -msgstr "Ovaj carobnjak je koristen za prikaz budzeta" +msgstr "Ovaj wizard se upotrebljava za štampanje budžeta" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view @@ -282,19 +290,19 @@ msgstr "Ovaj carobnjak je koristen za prikaz budzeta" #: model:ir.ui.menu,name:account_budget.next_id_31 #: model:ir.ui.menu,name:account_budget.next_id_pos msgid "Budgets" -msgstr "Budzeti" +msgstr "Budžeti" #. module: account_budget #: constraint:account.analytic.account:0 msgid "" "Error! The currency has to be the same as the currency of the selected " "company" -msgstr "" +msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća" #. module: account_budget #: selection:crossovered.budget,state:0 msgid "Cancelled" -msgstr "Отказано" +msgstr "Otkazano" #. module: account_budget #: view:crossovered.budget:0 @@ -305,14 +313,14 @@ msgstr "Odobri" #: field:crossovered.budget,date_from:0 #: field:crossovered.budget.lines,date_from:0 msgid "Start Date" -msgstr "Početni datum" +msgstr "Datum početka" #. module: account_budget #: view:account.budget.post:0 #: field:crossovered.budget.lines,general_budget_id:0 #: model:ir.model,name:account_budget.model_account_budget_post msgid "Budgetary Position" -msgstr "Budzetska pozicija" +msgstr "Budžetska pozicija" #. module: account_budget #: field:account.budget.analytic,date_from:0 @@ -320,12 +328,12 @@ msgstr "Budzetska pozicija" #: field:account.budget.crossvered.summary.report,date_from:0 #: field:account.budget.report,date_from:0 msgid "Start of period" -msgstr "Početak razdoblja" +msgstr "Početak perioda" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report msgid "Account Budget crossvered summary report" -msgstr "Izvestaj unakrsnog budzeta naloga" +msgstr "Izvestaj rezimea budžeta za unakrsni konto" #. module: account_budget #: report:account.budget:0 @@ -339,7 +347,7 @@ msgstr "Teoretska zarada" #: view:account.budget.crossvered.summary.report:0 #: view:account.budget.report:0 msgid "Select Dates Period" -msgstr "Selektuj Datume razdoblja" +msgstr "Izaberi periode datuma" #. module: account_budget #: view:account.budget.analytic:0 @@ -377,38 +385,39 @@ msgid "" "Budgets per Budgets.\n" "\n" msgstr "" -"Ovaj modul omogucava knjigovodjama da obradjuju analize i unakrsne budzete.\n" +"Ovaj modul omogucava knjigovodjama da obradjuju analitičke i unakrsne " +"budžete.\n" "\n" -"Kada je jedno definisan Master Budzet i budzeti ( U knjigovodstvo/Budzeti),\n" -"Menadzer Projekta moze da postavi planirani iznos za svaki analiticki " +"Jednom kad se definišu Master Budžet i budžeti ( U knjigovodstvo/Budžeti),\n" +"Menadžer projekta može da postavi planirani iznos za svaki analitički " "konto.\n" "\n" -"Knjigovodja ima mogucnost da vidi ukupni planirani iznos za svaki\n" -"Budzet i Master Budzet da bi osigurao da ukupno planirani iznos nije manji " -"/veci od \n" -"planiranog Budzeta/Master Budzeta. Svaka lista\n" -"zapisa moze da se prebaci i u grafikon za laksi pregled iste.\n" +"Knjigovodja ima mogućnost da vidi ukupni planirani iznos za svaki\n" +"Budžet i Master Budžet da bi osigurao da ukupni planirani iznos nije manji " +"/veći od \n" +"planiranog Budžeta/Master Budžeta. Svaka lista\n" +"zapisa može da se prebaci i u grafikon.\n" "\n" -"Dostupna su TRI Izvestaja:\n" -" 1. Prvi je dostupan iz liste Budzeta. I on daje rasipanje za te budzete, " -"analitickog konta u odnosu na Master Budzet.\n" -" 2.Drugi je sumarni predhodnog izvestaja, on samo daje rasispanje za " -"selektovani Budzet analitickog konta.\n" -" 3.Poslednji je dostupan iz Analitickog Grafikona naloga ( konta). On " -"daje rasipanje za slektovani analiticki konto, MAster Budzeta po \n" -"Budzetu.\n" +"Dostupna su TRI izveštaja:\n" +" 1. Prvi je dostupan iz liste Budžeta. Za te budžete daje rasipanje " +"analitickog konta u odnosu na Master Budžet.\n" +" 2.Drugi je rezime predhodnog izveštaja, daje rasipanje samo za izabrani " +"Budžet analitičkog konta.\n" +" 3.Poslednji je dostupan iz analitičkog grafikona naloga ( konta). On " +"daje rasipanje za izabrani analitički konto, Master Budžeta po \n" +"Budžetu.\n" "\n" #. module: account_budget #: field:crossovered.budget.lines,analytic_account_id:0 #: model:ir.model,name:account_budget.model_account_analytic_account msgid "Analytic Account" -msgstr "Analitički nalog" +msgstr "Analitički konto" #. module: account_budget #: report:account.budget:0 msgid "Budget :" -msgstr "Budzet" +msgstr "Budžet" #. module: account_budget #: report:account.budget:0 @@ -434,7 +443,7 @@ msgstr "Nalozi" #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view msgid "Budget Lines" -msgstr "Budzetski Redovi" +msgstr "Budžetske linije" #. module: account_budget #: view:account.budget.analytic:0 @@ -448,12 +457,12 @@ msgstr "Otkaži" #. module: account_budget #: model:ir.module.module,shortdesc:account_budget.module_meta_information msgid "Budget Management" -msgstr "Budzetski Menadzment" +msgstr "Uređivanje budžeta" #. module: account_budget #: constraint:account.analytic.account:0 msgid "Error! You can not create recursive analytic accounts." -msgstr "" +msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge." #. module: account_budget #: report:account.budget:0 diff --git a/addons/base_calendar/i18n/ar.po b/addons/base_calendar/i18n/ar.po new file mode 100644 index 00000000000..bf7e3d0748a --- /dev/null +++ b/addons/base_calendar/i18n/ar.po @@ -0,0 +1,1665 @@ +# Arabic 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-10 06:06+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Arabic \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-11 04:53+0000\n" +"X-Generator: Launchpad (build 14277)\n" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_related:0 +#: selection:res.alarm,trigger_related:0 +msgid "The event starts" +msgstr "بداية الحدث" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +msgid "Hourly" +msgstr "كل ساعة" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Required to Join" +msgstr "مطلوب للانضمام" + +#. module: base_calendar +#: help:calendar.event,exdate:0 +#: help:calendar.todo,exdate:0 +msgid "" +"This property defines the list of date/time exceptions for a recurring " +"calendar component." +msgstr "" + +#. module: base_calendar +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" +"الشركة المختارة غير مدرجة ضمن قائمة الشركات المسموح بها لهذا المستخدم" + +#. module: base_calendar +#: field:calendar.event.edit.all,name:0 +msgid "Title" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Monthly" +msgstr "شهرياً" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invited User" +msgstr "مستخدم مدعو" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation" +msgstr "دعوة" + +#. module: base_calendar +#: help:calendar.event,recurrency:0 +#: help:calendar.todo,recurrency:0 +msgid "Recurrent Meeting" +msgstr "اجتماع دوري" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view +#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm +msgid "Alarms" +msgstr "المنبهات" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Sunday" +msgstr "الأحد" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,role:0 +msgid "Role" +msgstr "الدور" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Invitation details" +msgstr "تفاصيل الدعوة" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Fourth" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,show_as:0 +#: field:calendar.todo,show_as:0 +msgid "Show as" +msgstr "عرض كـ" + +#. module: base_calendar +#: field:base.calendar.set.exrule,day:0 +#: selection:base.calendar.set.exrule,select1:0 +#: field:calendar.event,day:0 +#: selection:calendar.event,select1:0 +#: field:calendar.todo,day:0 +#: selection:calendar.todo,select1:0 +msgid "Date of month" +msgstr "اليوم من الشهر" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Public" +msgstr "عام" + +#. module: base_calendar +#: view:calendar.event:0 +msgid " " +msgstr " " + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "March" +msgstr "مارس/آذار" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:414 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90 +#, python-format +msgid "Warning !" +msgstr "تحذير !" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Friday" +msgstr "الجمعة" + +#. module: base_calendar +#: field:calendar.event,allday:0 +#: field:calendar.todo,allday:0 +msgid "All Day" +msgstr "كامل اليوم" + +#. module: base_calendar +#: field:base.calendar.set.exrule,select1:0 +#: field:calendar.event,select1:0 +#: field:calendar.todo,select1:0 +msgid "Option" +msgstr "خيار" + +#. module: base_calendar +#: selection:calendar.attendee,availability:0 +#: selection:calendar.event,show_as:0 +#: selection:calendar.todo,show_as:0 +#: selection:res.users,availability:0 +msgid "Free" +msgstr "حرّ" + +#. module: base_calendar +#: help:calendar.attendee,rsvp:0 +msgid "Indicats whether the favor of a reply is requested" +msgstr "يشير إلى استحسان الرد" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_attachment +msgid "ir.attachment" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,delegated_to:0 +msgid "The users that the original request was delegated to" +msgstr "المستخدمون الذين فُوِّض إليهم الطلب الأصلي" + +#. module: base_calendar +#: field:calendar.attendee,ref:0 +msgid "Event Ref" +msgstr "مرجع الحدث" + +#. module: base_calendar +#: field:base.calendar.set.exrule,we:0 +#: field:calendar.event,we:0 +#: field:calendar.todo,we:0 +msgid "Wed" +msgstr "الأربعاء" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Show time as" +msgstr "اعرض الوقت كـ" + +#. module: base_calendar +#: field:base.calendar.set.exrule,tu:0 +#: field:calendar.event,tu:0 +#: field:calendar.todo,tu:0 +msgid "Tue" +msgstr "الثلاثاء" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Yearly" +msgstr "سنوياً" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_related:0 +#: selection:res.alarm,trigger_related:0 +msgid "The event ends" +msgstr "نهاية الحدث" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Last" +msgstr "الأخير" + +#. module: base_calendar +#: help:calendar.attendee,state:0 +msgid "Status of the attendee's participation" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Room" +msgstr "غرفة" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Days" +msgstr "الأيام" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Invitation Detail" +msgstr "تفاصيل الدعوة" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:1355 +#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96 +#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136 +#, python-format +msgid "Error!" +msgstr "خطأ!" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Chair Person" +msgstr "الرئيس" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Procedure" +msgstr "الإجراءات" + +#. module: base_calendar +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Cancelled" +msgstr "ملغي" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Minutes" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Display" +msgstr "عرض" + +#. module: base_calendar +#: view:calendar.event.edit.all:0 +msgid "Edit all Occurrences" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation type" +msgstr "نوع الدعوة" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +msgid "Secondly" +msgstr "ثانياً" + +#. module: base_calendar +#: field:calendar.alarm,event_date:0 +#: field:calendar.attendee,event_date:0 +#: view:calendar.event:0 +msgid "Event Date" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Group By..." +msgstr "تجميع حسب ..." + +#. module: base_calendar +#: help:base_calendar.invite.attendee,email:0 +msgid "Provide external email address who will receive this invitation." +msgstr "أضف عنوان بريد إلكتروني خارجي لتلقي هذه الدعوة." + +#. module: base_calendar +#: model:ir.module.module,description:base_calendar.module_meta_information +msgid "" +"Full featured calendar system that supports:\n" +" - Calendar of events\n" +" - Alerts (create requests)\n" +" - Recurring events\n" +" - Invitations to people" +msgstr "" +"نظام تقويم متميز يوفر ويدعم:\n" +" - جدولاً زمنياً للأحداث\n" +" - منبهات (إنشاء طلبات)\n" +" - الأحداث الدورية\n" +" - توجيه الدعوات" + +#. module: base_calendar +#: help:calendar.attendee,cutype:0 +msgid "Specify the type of Invitation" +msgstr "حدد نوع الدعوة" + +#. module: base_calendar +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Years" +msgstr "سنوات" + +#. module: base_calendar +#: field:calendar.alarm,event_end_date:0 +#: field:calendar.attendee,event_end_date:0 +msgid "Event End Date" +msgstr "الحدث والتاريخ" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Optional Participation" +msgstr "مشاركة اختيارية" + +#. module: base_calendar +#: field:calendar.event,date_deadline:0 +#: field:calendar.todo,date_deadline:0 +msgid "Deadline" +msgstr "الموعد النهائي" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:385 +#: code:addons/base_calendar/base_calendar.py:1088 +#: code:addons/base_calendar/base_calendar.py:1090 +#, python-format +msgid "Warning!" +msgstr "تحذير!" + +#. module: base_calendar +#: help:calendar.event,active:0 +#: help:calendar.todo,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the " +"event alarm information without removing it." +msgstr "" +"في حالة اختيار الحقل \"نشط\"، يمكنك إخفاء معلومات المنبه للحدث دون حذفه." + +#. module: base_calendar +#: model:ir.module.module,shortdesc:base_calendar.module_meta_information +msgid "Basic Calendar Functionality" +msgstr "تقويم بسيط" + +#. module: base_calendar +#: field:calendar.event,organizer:0 +#: field:calendar.event,organizer_id:0 +#: field:calendar.todo,organizer:0 +#: field:calendar.todo,organizer_id:0 +msgid "Organizer" +msgstr "المنظِّم" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +#: field:calendar.event,user_id:0 +#: field:calendar.todo,user_id:0 +msgid "Responsible" +msgstr "مسئول" + +#. module: base_calendar +#: view:calendar.event:0 +#: model:res.request.link,name:base_calendar.request_link_meeting +msgid "Event" +msgstr "الحدث" + +#. module: base_calendar +#: help:calendar.event,edit_all:0 +#: help:calendar.todo,edit_all:0 +msgid "Edit all Occurrences of recurrent Meeting." +msgstr "تعديل جميع مرات الاجتماع الدوري" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_occurs:0 +#: selection:res.alarm,trigger_occurs:0 +msgid "Before" +msgstr "قبل" + +#. module: base_calendar +#: view:calendar.event:0 +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Confirmed" +msgstr "مؤكد" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all +msgid "Edit all events" +msgstr "تعديل جميع الأحداث" + +#. module: base_calendar +#: field:calendar.alarm,attendee_ids:0 +#: field:calendar.event,attendee_ids:0 +#: field:calendar.todo,attendee_ids:0 +msgid "Attendees" +msgstr "الحضور" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Confirm" +msgstr "تأكيد" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_todo +msgid "Calendar Task" +msgstr "مهمة تقويم" + +#. module: base_calendar +#: field:base.calendar.set.exrule,su:0 +#: field:calendar.event,su:0 +#: field:calendar.todo,su:0 +msgid "Sun" +msgstr "الأحد" + +#. module: base_calendar +#: field:calendar.attendee,cutype:0 +msgid "Invite Type" +msgstr "نوع الدعوة" + +#. module: base_calendar +#: help:calendar.attendee,partner_id:0 +msgid "Partner related to contact" +msgstr "" + +#. module: base_calendar +#: view:res.alarm:0 +msgid "Reminder details" +msgstr "تفاصيل التذكير" + +#. module: base_calendar +#: field:calendar.attendee,parent_ids:0 +msgid "Delegrated From" +msgstr "مفوّض من" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,select1:0 +#: selection:calendar.event,select1:0 +#: selection:calendar.todo,select1:0 +msgid "Day of month" +msgstr "اليوم من الشهر" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event,location:0 +#: field:calendar.event.edit.all,location:0 +#: field:calendar.todo,location:0 +msgid "Location" +msgstr "المكان" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,send_mail:0 +msgid "Send mail?" +msgstr "إرسال رسالة؟" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,email:0 +#: selection:calendar.alarm,action:0 +#: field:calendar.attendee,email:0 +msgid "Email" +msgstr "البريد الإلكتروني" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Event Detail" +msgstr "تفاصيل الحدث" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Run" +msgstr "تنفيذ" + +#. module: base_calendar +#: field:calendar.event,exdate:0 +#: field:calendar.todo,exdate:0 +msgid "Exception Date/Times" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Confidential" +msgstr "سرّي" + +#. module: base_calendar +#: field:base.calendar.set.exrule,end_date:0 +#: field:calendar.event,end_date:0 +#: field:calendar.todo,end_date:0 +msgid "Repeat Until" +msgstr "كرر حتى" + +#. module: base_calendar +#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view +msgid "" +"Create specific calendar alarms that may be assigned to calendar events or " +"meetings." +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Visibility" +msgstr "الظهور" + +#. module: base_calendar +#: field:calendar.attendee,rsvp:0 +msgid "Required Reply?" +msgstr "الرد مطلوب؟" + +#. module: base_calendar +#: field:calendar.event,base_calendar_url:0 +#: field:calendar.todo,base_calendar_url:0 +msgid "Caldav URL" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "Select range to Exclude" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,recurrent_uid:0 +#: field:calendar.todo,recurrent_uid:0 +msgid "Recurrent ID" +msgstr "معرّف التكرار" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "July" +msgstr "يوليو/تموز" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Accepted" +msgstr "تم القبول" + +#. module: base_calendar +#: field:base.calendar.set.exrule,th:0 +#: field:calendar.event,th:0 +#: field:calendar.todo,th:0 +msgid "Thu" +msgstr "الخميس" + +#. module: base_calendar +#: field:calendar.attendee,child_ids:0 +msgid "Delegrated To" +msgstr "مفوّض إلى" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Required Reply" +msgstr "الرد مطلوب" + +#. module: base_calendar +#: selection:calendar.event,end_type:0 +#: selection:calendar.todo,end_type:0 +msgid "Forever" +msgstr "إلى الأبد" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Participation required" +msgstr "المشاركة مطلوبة" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "_Cancel" +msgstr "ال_غاء" + +#. module: base_calendar +#: field:calendar.event,create_date:0 +#: field:calendar.todo,create_date:0 +msgid "Created" +msgstr "تمّ الإنشاء" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Private" +msgstr "خاص" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Daily" +msgstr "يومياً" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:385 +#, python-format +msgid "Can not Duplicate" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,class:0 +#: field:calendar.todo,class:0 +msgid "Mark as" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,partner_address_id:0 +msgid "Contact" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,rrule_type:0 +#: help:calendar.todo,rrule_type:0 +msgid "Let the event automatically repeat at that interval" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Delegate" +msgstr "" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,partner_id:0 +#: view:calendar.attendee:0 +#: field:calendar.attendee,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: selection:base_calendar.invite.attendee,type:0 +msgid "Partner Contacts" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "_Ok" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "First" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Privacy" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,vtimezone:0 +#: field:calendar.todo,vtimezone:0 +msgid "Timezone" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Subject" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "September" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "December" +msgstr "" + +#. module: base_calendar +#: help:base_calendar.invite.attendee,send_mail:0 +msgid "Check this if you want to send an Email to Invited Person" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Availability" +msgstr "" + +#. module: base_calendar +#: view:calendar.event.edit.all:0 +msgid "_Save" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Individual" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,count:0 +#: help:calendar.todo,count:0 +msgid "Repeat x times" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,user_id:0 +msgid "Owner" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Delegation Info" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,date:0 +msgid "Start Date" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,cn:0 +msgid "Common name" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Declined" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "My Role" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "My Events" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Decline" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Weeks" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Group" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,edit_all:0 +#: field:calendar.todo,edit_all:0 +msgid "Edit All" +msgstr "" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,contact_ids:0 +msgid "Contacts" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_res_alarm +msgid "Basic Alarm Information" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,fr:0 +#: field:calendar.event,fr:0 +#: field:calendar.todo,fr:0 +msgid "Fri" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Hours" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:1090 +#, python-format +msgid "Count can not be Negative" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,member:0 +msgid "Member" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,location:0 +#: help:calendar.todo,location:0 +msgid "Location of Event" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,rrule:0 +#: field:calendar.todo,rrule:0 +msgid "Recurrent Rule" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Draft" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,attach:0 +msgid "Attachment" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation From" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "End of recurrency" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,alarm_id:0 +msgid "Reminder" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule +msgid "Set Exrule" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: model:ir.actions.act_window,name:base_calendar.action_view_event +#: model:ir.ui.menu,name:base_calendar.menu_events +msgid "Events" +msgstr "" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard +#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee +msgid "Invite Attendees" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,email:0 +msgid "Email of Invited Person" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,repeat:0 +#: field:calendar.event,count:0 +#: field:calendar.todo,count:0 +#: field:res.alarm,repeat:0 +msgid "Repeat" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,dir:0 +msgid "" +"Reference to the URIthat points to the directory information corresponding " +"to the attendee." +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "August" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Monday" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Third" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "June" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,alarm_id:0 +msgid "Basic Alarm" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +#: view:calendar.event:0 +msgid "The" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,delegated_from:0 +msgid "Delegated From" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,user_id:0 +msgid "User" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event,date:0 +msgid "Date" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "November" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,member:0 +msgid "Indicate the groups that the attendee belongs to" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +msgid "Data" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,mo:0 +#: field:calendar.event,mo:0 +#: field:calendar.todo,mo:0 +msgid "Mon" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,count:0 +msgid "Count" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "No Repeat" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "October" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Uncertain" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,language:0 +msgid "Language" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,trigger_occurs:0 +#: field:res.alarm,trigger_occurs:0 +msgid "Triggers" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "January" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,trigger_related:0 +#: field:res.alarm,trigger_related:0 +msgid "Related to" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,interval:0 +#: field:calendar.alarm,trigger_interval:0 +#: field:res.alarm,trigger_interval:0 +msgid "Interval" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Wednesday" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:1088 +#, python-format +msgid "Interval can not be Negative" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,name:0 +#: view:calendar.event:0 +msgid "Summary" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,active:0 +#: field:calendar.event,active:0 +#: field:calendar.todo,active:0 +#: field:res.alarm,active:0 +msgid "Active" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Choose day in the month where repeat the meeting" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,action:0 +msgid "Action" +msgstr "" + +#. module: base_calendar +#: help:base_calendar.invite.attendee,type:0 +msgid "Select whom you want to Invite" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,duration:0 +#: help:res.alarm,duration:0 +msgid "" +"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the " +"other" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_event_edit_all +msgid "Calendar Edit all event" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,role:0 +msgid "Participation role for the calendar user" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,delegated_to:0 +msgid "Delegated To" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,action:0 +msgid "Defines the action to be invoked when an alarm is triggered" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,end_type:0 +#: selection:calendar.todo,end_type:0 +msgid "End date" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Search Events" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Recurrency Option" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Weekly" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,active:0 +#: help:res.alarm,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the event " +"alarm information without removing it." +msgstr "" + +#. module: base_calendar +#: field:calendar.event,recurrent_id:0 +#: field:calendar.todo,recurrent_id:0 +msgid "Recurrent ID date" +msgstr "" + +#. module: base_calendar +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,state:0 +#: view:calendar.attendee:0 +#: field:calendar.attendee,state:0 +#: view:calendar.event:0 +#: field:calendar.event,state:0 +#: field:calendar.todo,state:0 +msgid "State" +msgstr "" + +#. module: base_calendar +#: view:res.alarm:0 +msgid "Reminder Details" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "To Review" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,freq:0 +#: field:calendar.event,freq:0 +#: field:calendar.todo,freq:0 +msgid "Frequency" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Done" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,interval:0 +#: help:calendar.todo,interval:0 +msgid "Repeat every (Days/Week/Month/Year)" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: field:base_calendar.invite.attendee,user_ids:0 +msgid "Users" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "of" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: view:calendar.event:0 +#: view:calendar.event.edit.all:0 +msgid "Cancel" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_res_users +msgid "res.users" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Tuesday" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,description:0 +msgid "" +"Provides a more complete description of the " +"calendar component, than that provided by the " +"\"SUMMARY\" property" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Responsible User" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,availability:0 +#: selection:calendar.event,show_as:0 +#: selection:calendar.todo,show_as:0 +#: selection:res.users,availability:0 +msgid "Busy" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_event +msgid "Calendar Event" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,state:0 +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Tentative" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,interval:0 +#: field:calendar.todo,interval:0 +msgid "Repeat every" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,end_type:0 +#: selection:calendar.todo,end_type:0 +msgid "Fix amout of times" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,recurrency:0 +#: field:calendar.todo,recurrency:0 +msgid "Recurrent" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,rrule_type:0 +#: field:calendar.todo,rrule_type:0 +msgid "Recurrency" +msgstr "" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form +#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations +msgid "Event Invitations" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Thursday" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,exrule:0 +#: field:calendar.todo,exrule:0 +msgid "Exception Rule" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,language:0 +msgid "" +"To specify the language for text values in aproperty or property parameter." +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Details" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,exrule:0 +#: help:calendar.todo,exrule:0 +msgid "" +"Defines a rule or repeating pattern of time to exclude from the recurring " +"rule." +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,month_list:0 +#: field:calendar.event,month_list:0 +#: field:calendar.todo,month_list:0 +msgid "Month" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: view:calendar.event:0 +msgid "Invite People" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,rrule:0 +#: help:calendar.todo,rrule:0 +msgid "" +"Defines a rule or repeating pattern for recurring events\n" +"e.g.: Every other month on the last Sunday of the month for 10 occurrences: " +" FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,dir:0 +msgid "URI Reference" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,description:0 +#: view:calendar.event:0 +#: field:calendar.event,description:0 +#: field:calendar.event,name:0 +#: field:calendar.todo,description:0 +#: field:calendar.todo,name:0 +msgid "Description" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "May" +msgstr "" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,type:0 +#: view:calendar.attendee:0 +msgid "Type" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Search Invitations" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_occurs:0 +#: selection:res.alarm,trigger_occurs:0 +msgid "After" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Stop" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_values +msgid "ir.values" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_model +msgid "Objects" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Delegated" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,sa:0 +#: field:calendar.event,sa:0 +#: field:calendar.todo,sa:0 +msgid "Sat" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Choose day where repeat the meeting" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +msgid "Minutely" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,sent_by:0 +msgid "Specify the user that is acting on behalf of the calendar user" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,date_deadline:0 +msgid "End Date" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "February" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Months" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Resource" +msgstr "" + +#. module: base_calendar +#: field:res.alarm,name:0 +msgid "Name" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_alarm +msgid "Event alarm information" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,name:0 +msgid "" +"Contains the text to be used as the message subject for " +"email or contains the text to be used for display" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,alarm_id:0 +#: field:calendar.event,base_calendar_alarm_id:0 +#: field:calendar.todo,alarm_id:0 +#: field:calendar.todo,base_calendar_alarm_id:0 +msgid "Alarm" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90 +#, python-format +msgid "Please Apply Recurrency before applying Exception Rule." +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,sent_by_uid:0 +msgid "Sent By User" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "April" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Recurrency period" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,week_list:0 +#: field:calendar.event,week_list:0 +#: field:calendar.todo,week_list:0 +msgid "Weekday" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,byday:0 +#: field:calendar.event,byday:0 +#: field:calendar.todo,byday:0 +msgid "By day" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,model_id:0 +msgid "Model" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Audio" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,id:0 +#: field:calendar.todo,id:0 +msgid "ID" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "For information Purpose" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +msgid "Invite" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_attendee +msgid "Attendee information" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,res_id:0 +msgid "Resource ID" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,state:0 +msgid "Needs Action" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,sent_by:0 +msgid "Sent By" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,sequence:0 +#: field:calendar.todo,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,alarm_id:0 +#: help:calendar.todo,alarm_id:0 +msgid "Set an alarm at this time, before the event occurs" +msgstr "" + +#. module: base_calendar +#: selection:base_calendar.invite.attendee,type:0 +msgid "Internal User" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Accept" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Saturday" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation To" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Second" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,availability:0 +#: field:res.users,availability:0 +msgid "Free/Busy" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,end_type:0 +#: field:calendar.todo,end_type:0 +msgid "Way to end reccurency" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,duration:0 +#: field:calendar.alarm,trigger_duration:0 +#: field:calendar.event,duration:0 +#: field:calendar.todo,date:0 +#: field:calendar.todo,duration:0 +#: field:res.alarm,duration:0 +#: field:res.alarm,trigger_duration:0 +msgid "Duration" +msgstr "" + +#. module: base_calendar +#: selection:base_calendar.invite.attendee,type:0 +msgid "External Email" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,trigger_date:0 +msgid "Trigger Date" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,attach:0 +msgid "" +"* Points to a sound resource, which is rendered when the " +"alarm is triggered for audio,\n" +" * File which is intended to be sent as message " +"attachments for email,\n" +" * Points to a procedure resource, which is invoked when " +" the alarm is triggered for procedure." +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Fifth" +msgstr "" diff --git a/addons/base_tools/i18n/sv.po b/addons/base_tools/i18n/sv.po new file mode 100644 index 00000000000..135f6134c11 --- /dev/null +++ b/addons/base_tools/i18n/sv.po @@ -0,0 +1,30 @@ +# Swedish 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-10 15:12+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Swedish \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-11 04:53+0000\n" +"X-Generator: Launchpad (build 14277)\n" + +#. module: base_tools +#: model:ir.module.module,shortdesc:base_tools.module_meta_information +msgid "Common base for tools modules" +msgstr "" + +#. module: base_tools +#: model:ir.module.module,description:base_tools.module_meta_information +msgid "" +"\n" +" " +msgstr "" From 4bfa2880b1673f1d09e88b823ab9a87618dd03d5 Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Fri, 11 Nov 2011 11:10:21 +0530 Subject: [PATCH 216/218] [IMP]:improve code and remove the loop for invoice bzr revid: ksa@tinyerp.com-20111111054021-b2sv5f6jegyjs403 --- addons/sale/stock.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/sale/stock.py b/addons/sale/stock.py index 4b683dcb97b..788d5099fc5 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -142,9 +142,8 @@ class stock_picking(osv.osv): invoice_created = invoices[result[picking.id]] invoice_obj.write(cursor, user, [invoice_created.id], {'user_id': picking.sale_id and picking.sale_id.user_id and picking.sale_id.user_id.id or False}, context=context) - for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context): - if not inv.fiscal_position: - invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context) + if not invoice_created.fiscal_position: + invoice_obj.write(cursor, user, [invoice_created.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context) if picking.sale_id.client_order_ref: inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context) From baa7727d459fe434b8bb379e7f850053fc40a262 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 11 Nov 2011 09:28:08 +0100 Subject: [PATCH 217/218] [FIX] remove sale_margin unused and bugged code bzr revid: fp@tinyerp.com-20111111082808-eox3s26qeaz6nm7p --- addons/sale_margin/sale_margin.py | 38 ------------------------- addons/sale_margin/sale_margin_view.xml | 17 +---------- 2 files changed, 1 insertion(+), 54 deletions(-) diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index cfa3543f09c..82a7150b6d1 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -81,42 +81,4 @@ class sale_order(osv.osv): sale_order() -class stock_picking(osv.osv): - _inherit = 'stock.picking' - - _columns = { - 'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type', '=', 'out_invoice')]), - } - - def action_invoice_create(self, cr, uid, ids, journal_id=False, - group=False, type='out_invoice', context=None): - # need to carify with new requirement - invoice_ids = [] - picking_obj = self.pool.get('stock.picking') - res = super(stock_picking, self).action_invoice_create(cr, uid, ids, journal_id=journal_id, group=group, type=type, context=context) - invoice_ids = res.values() - picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]}) - return res - -stock_picking() - -class account_invoice_line(osv.osv): - _inherit = "account.invoice.line" - _columns = { - 'cost_price': fields.float('Cost Price', digits=(16, 2)), - } - def write(self, cr, uid, ids, vals, context=None): - if vals.get('product_id', False): - res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price']) - vals['cost_price'] = res[0]['standard_price'] - return super(account_invoice_line, self).write(cr, uid, ids, vals, context) - - def create(self, cr, uid, vals, context=None): - if vals.get('product_id',False): - res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price']) - vals['cost_price'] = res[0]['standard_price'] - return super(account_invoice_line, self).create(cr, uid, vals, context) - -account_invoice_line() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml index c424bf33785..ad0b8440f19 100644 --- a/addons/sale_margin/sale_margin_view.xml +++ b/addons/sale_margin/sale_margin_view.xml @@ -61,21 +61,6 @@ - - - - picking.margin.view.form - form - stock.picking - - - - - - - - - - + From 055441c518921c9887c2f171566e8adbd36cd576 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 11 Nov 2011 09:44:51 +0100 Subject: [PATCH 218/218] [IMP] labels of refund invoice bzr revid: fp@tinyerp.com-20111111084451-m36rgp45m0ye7e8f --- addons/account/wizard/account_invoice_refund.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index 8de1dc79bfb..436ea20a3c2 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory): 'period': fields.many2one('account.period', 'Force period'), 'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'), 'description': fields.char('Description', size=128, required=True), - 'filter_refund': fields.selection([('refund', 'Refund'), ('cancel', 'Cancel'),('modify', 'Modify')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'), + 'filter_refund': fields.selection([('refund', 'Create a draft Refund'), ('cancel', 'Cancel: refund invoice and reconcile'),('modify', 'Modify: refund invoice, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'), } def _get_journal(self, cr, uid, context=None):