From aad1541244d04312c218b2e9bbeb4054204849e1 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 28 Nov 2011 18:31:57 +0530 Subject: [PATCH 001/310] [FIX] account : Cost Ledger Incorrect For View Accounts lp bug: https://launchpad.net/bugs/880844 fixed bzr revid: mdi@tinyerp.com-20111128130157-jo9e7g08gmro7zpp --- addons/account/project/report/cost_ledger.py | 46 +++++++++++++++----- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py index 225a85d2ee1..f571c5328bf 100644 --- a/addons/account/project/report/cost_ledger.py +++ b/addons/account/project/report/cost_ledger.py @@ -38,11 +38,32 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): 'sum_balance': self._sum_balance, }) + def _get_children(self, account_id): + result = [] + + def _get_rec(account_id): + analytic_obj = self.pool.get('account.analytic.account') + analytic_search_ids = analytic_obj.search(self.cr, self.uid, [('id', '=', account_id)]) + analytic_datas = analytic_obj.browse(self.cr, self.uid, analytic_search_ids) + + result.append(account_id) + for account in analytic_datas: + for child in account.child_ids: + result.append(child.id) + for child_id in child.child_ids: + _get_rec(child_id.id) + return result + + child_ids = _get_rec(account_id) + + return child_ids + def _lines_g(self, account_id, date1, date2): + chid_ids = self._get_children(account_id) self.cr.execute("SELECT sum(aal.amount) AS balance, aa.code AS code, aa.name AS name, aa.id AS id \ FROM account_account AS aa, account_analytic_line AS aal \ - WHERE (aal.account_id=%s) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \ - GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (account_id, date1, date2)) + WHERE (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \ + GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (tuple(chid_ids), date1, date2)) res = self.cr.dictfetchall() for r in res: @@ -58,10 +79,11 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): return res def _lines_a(self, general_account_id, account_id, date1, date2): + chid_ids = self._get_children(account_id) self.cr.execute("SELECT aal.name AS name, aal.code AS code, aal.amount AS balance, aal.date AS date, aaj.code AS cj FROM account_analytic_line AS aal, account_analytic_journal AS aaj \ - WHERE (aal.general_account_id=%s) AND (aal.account_id=%s) AND (aal.date>=%s) AND (aal.date<=%s) \ + WHERE (aal.general_account_id=%s) AND (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) \ AND (aal.journal_id=aaj.id) \ - ORDER BY aal.date, aaj.code, aal.code", (general_account_id, account_id, date1, date2)) + ORDER BY aal.date, aaj.code, aal.code", (general_account_id, tuple(chid_ids), date1, date2)) res = self.cr.dictfetchall() for r in res: @@ -77,11 +99,13 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): return res def _account_sum_debit(self, account_id, date1, date2): - self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s AND amount>0", (account_id, date1, date2)) + chid_ids = self._get_children(account_id) + self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(chid_ids), date1, date2)) return self.cr.fetchone()[0] or 0.0 def _account_sum_credit(self, account_id, date1, date2): - self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s AND amount<0", (account_id, date1, date2)) + chid_ids = self._get_children(account_id) + self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(chid_ids), date1, date2)) return self.cr.fetchone()[0] or 0.0 def _account_sum_balance(self, account_id, date1, date2): @@ -91,16 +115,18 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): def _sum_debit(self, accounts, date1, date2): ids = map(lambda x: x.id, accounts) - if not ids: + chid_ids = self._get_children(ids[0]) + if not children: return 0.0 - self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(ids), date1, date2,)) + self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(chid_ids), date1, date2,)) return self.cr.fetchone()[0] or 0.0 def _sum_credit(self, accounts, date1, date2): ids = map(lambda x: x.id, accounts) - if not ids: + chid_ids = self._get_children(ids[0]) + if not children: return 0.0 - self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(ids),date1, date2,)) + self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(chid_ids),date1, date2,)) return self.cr.fetchone()[0] or 0.0 def _sum_balance(self, accounts, date1, date2): From 1f3a05874455dfb9416abdde35786b59637d63a2 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 30 Nov 2011 11:45:27 +0530 Subject: [PATCH 002/310] [IMP] account : Improved the code bzr revid: mdi@tinyerp.com-20111130061527-6aklmw9ejnu23dh1 --- addons/account/project/report/cost_ledger.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py index f571c5328bf..88d5e6041f6 100644 --- a/addons/account/project/report/cost_ledger.py +++ b/addons/account/project/report/cost_ledger.py @@ -50,8 +50,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): for account in analytic_datas: for child in account.child_ids: result.append(child.id) - for child_id in child.child_ids: - _get_rec(child_id.id) + _get_rec(child.id) return result child_ids = _get_rec(account_id) @@ -116,7 +115,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): def _sum_debit(self, accounts, date1, date2): ids = map(lambda x: x.id, accounts) chid_ids = self._get_children(ids[0]) - if not children: + if not chid_ids: return 0.0 self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(chid_ids), date1, date2,)) return self.cr.fetchone()[0] or 0.0 @@ -124,7 +123,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): def _sum_credit(self, accounts, date1, date2): ids = map(lambda x: x.id, accounts) chid_ids = self._get_children(ids[0]) - if not children: + if not chid_ids: return 0.0 self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(chid_ids),date1, date2,)) return self.cr.fetchone()[0] or 0.0 From a01b90fa470afb4bbc3b3eb9b228fe55072ae293 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 30 Nov 2011 17:48:38 +0530 Subject: [PATCH 003/310] [IMP] account : Improved the code bzr revid: mdi@tinyerp.com-20111130121838-o6nlc4j64y3b3nca --- addons/account/project/report/cost_ledger.py | 30 ++++++++------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py index 88d5e6041f6..9955d1ccffe 100644 --- a/addons/account/project/report/cost_ledger.py +++ b/addons/account/project/report/cost_ledger.py @@ -39,23 +39,17 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): }) def _get_children(self, account_id): + analytic_obj = self.pool.get('account.analytic.account') + if not isinstance(account_id, list): + account_id = [account_id] + search_ids = analytic_obj.search(self.cr, self.uid, [('parent_id', 'child_of', account_id)]) result = [] - - def _get_rec(account_id): - analytic_obj = self.pool.get('account.analytic.account') - analytic_search_ids = analytic_obj.search(self.cr, self.uid, [('id', '=', account_id)]) - analytic_datas = analytic_obj.browse(self.cr, self.uid, analytic_search_ids) - - result.append(account_id) - for account in analytic_datas: - for child in account.child_ids: - result.append(child.id) - _get_rec(child.id) - return result - - child_ids = _get_rec(account_id) - - return child_ids + for rec in analytic_obj.browse(self.cr, self.uid, search_ids): + for child in rec.child_ids: + result.append(child.id) + if result: + result = self._get_children(result) + return search_ids + result def _lines_g(self, account_id, date1, date2): chid_ids = self._get_children(account_id) @@ -114,7 +108,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): def _sum_debit(self, accounts, date1, date2): ids = map(lambda x: x.id, accounts) - chid_ids = self._get_children(ids[0]) + chid_ids = self._get_children(ids) if not chid_ids: return 0.0 self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(chid_ids), date1, date2,)) @@ -122,7 +116,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): def _sum_credit(self, accounts, date1, date2): ids = map(lambda x: x.id, accounts) - chid_ids = self._get_children(ids[0]) + chid_ids = self._get_children(ids) if not chid_ids: return 0.0 self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(chid_ids),date1, date2,)) From 888b061c27203e398190f137b08687bb0b5c0e48 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Fri, 2 Dec 2011 16:06:41 +0530 Subject: [PATCH 004/310] [IMP] account : Improved the code bzr revid: mdi@tinyerp.com-20111202103641-2lr29zvdhrbri8xs --- addons/account/project/report/cost_ledger.py | 28 +++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py index 9955d1ccffe..2753b541f6b 100644 --- a/addons/account/project/report/cost_ledger.py +++ b/addons/account/project/report/cost_ledger.py @@ -26,6 +26,7 @@ from report import report_sxw class account_analytic_cost_ledger(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context) + self.analytic_acc_ids = [], self.localcontext.update( { 'time': time, 'lines_g': self._lines_g, @@ -49,14 +50,14 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): result.append(child.id) if result: result = self._get_children(result) - return search_ids + result + self.analytic_acc_ids = search_ids + result + return self.analytic_acc_ids def _lines_g(self, account_id, date1, date2): - chid_ids = self._get_children(account_id) self.cr.execute("SELECT sum(aal.amount) AS balance, aa.code AS code, aa.name AS name, aa.id AS id \ FROM account_account AS aa, account_analytic_line AS aal \ WHERE (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \ - GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (tuple(chid_ids), date1, date2)) + GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (tuple(self.analytic_acc_ids), date1, date2)) res = self.cr.dictfetchall() for r in res: @@ -72,11 +73,10 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): return res def _lines_a(self, general_account_id, account_id, date1, date2): - chid_ids = self._get_children(account_id) self.cr.execute("SELECT aal.name AS name, aal.code AS code, aal.amount AS balance, aal.date AS date, aaj.code AS cj FROM account_analytic_line AS aal, account_analytic_journal AS aaj \ WHERE (aal.general_account_id=%s) AND (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) \ AND (aal.journal_id=aaj.id) \ - ORDER BY aal.date, aaj.code, aal.code", (general_account_id, tuple(chid_ids), date1, date2)) + ORDER BY aal.date, aaj.code, aal.code", (general_account_id, tuple(self.analytic_acc_ids), date1, date2)) res = self.cr.dictfetchall() for r in res: @@ -92,13 +92,11 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): return res def _account_sum_debit(self, account_id, date1, date2): - chid_ids = self._get_children(account_id) - self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(chid_ids), date1, date2)) + self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(self.analytic_acc_ids), date1, date2)) return self.cr.fetchone()[0] or 0.0 def _account_sum_credit(self, account_id, date1, date2): - chid_ids = self._get_children(account_id) - self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(chid_ids), date1, date2)) + self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(self.analytic_acc_ids), date1, date2)) return self.cr.fetchone()[0] or 0.0 def _account_sum_balance(self, account_id, date1, date2): @@ -108,18 +106,16 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): def _sum_debit(self, accounts, date1, date2): ids = map(lambda x: x.id, accounts) - chid_ids = self._get_children(ids) - if not chid_ids: + self.analytic_acc_ids = self._get_children(ids) + if not self.analytic_acc_ids: return 0.0 - self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(chid_ids), date1, date2,)) + self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(self.analytic_acc_ids), date1, date2,)) return self.cr.fetchone()[0] or 0.0 def _sum_credit(self, accounts, date1, date2): - ids = map(lambda x: x.id, accounts) - chid_ids = self._get_children(ids) - if not chid_ids: + if not self.analytic_acc_ids: return 0.0 - self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(chid_ids),date1, date2,)) + self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(self.analytic_acc_ids),date1, date2,)) return self.cr.fetchone()[0] or 0.0 def _sum_balance(self, accounts, date1, date2): From 873aaacc5085b109ee0172c41aa18986cfec2088 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 2 Jan 2012 14:38:33 +0530 Subject: [PATCH 005/310] [FIX] account, account_bank_statement_extensions, point_of_sale : account_bank_statement_extension conflicts with point_of_sale lp bug: https://launchpad.net/bugs/909124 fixed bzr revid: mdi@tinyerp.com-20120102090833-ytztgr3vsq2jkm4v --- addons/account/account_bank_statement.py | 1 + .../account_bank_statement.py | 3 +-- addons/point_of_sale/point_of_sale.py | 1 - addons/point_of_sale/point_of_sale_demo.xml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index bd31b01a41d..dcb99c0ceb8 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -468,6 +468,7 @@ class account_bank_statement_line(osv.osv): required=True), 'statement_id': fields.many2one('account.bank.statement', 'Statement', select=True, required=True, ondelete='cascade'), + 'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), 'move_ids': fields.many2many('account.move', 'account_bank_statement_line_move_rel', 'statement_line_id','move_id', diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py index 3fef72f4aff..ba78c3f5e97 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement.py +++ b/addons/account_bank_statement_extensions/account_bank_statement.py @@ -111,7 +111,6 @@ class account_bank_statement_line(osv.osv): help="Code to identify transactions belonging to the same globalisation level within a batch payment"), 'globalisation_amount': fields.related('globalisation_id', 'amount', type='float', relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True), - 'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True), 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')], 'State', required=True, readonly=True), 'counterparty_name': fields.char('Counterparty Name', size=35), @@ -133,4 +132,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 2848889ec70..a52686c648d 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -596,7 +596,6 @@ account_bank_statement() class account_bank_statement_line(osv.osv): _inherit = 'account.bank.statement.line' _columns= { - 'journal_id': fields.related('statement_id','journal_id','name', store=True, string='Journal', type='char', size=64), 'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'), } account_bank_statement_line() diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index 418066ec148..0030f6cf8ae 100644 --- a/addons/point_of_sale/point_of_sale_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -108,7 +108,7 @@ - Cash Journal - (test) + From d512d9a84666004ce9d556719896070f79a43bfe Mon Sep 17 00:00:00 2001 From: MVA Date: Fri, 6 Jan 2012 09:13:22 +0100 Subject: [PATCH 006/310] [ADD] replace tab email bzr revid: mva@openerp.com-20120106081322-uxy021zotav2asv1 --- addons/event/event.py | 9 ++++----- addons/event/event_view.xml | 15 ++------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 99ccddc660d..f1c569b10cf 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -206,7 +206,6 @@ class event_event(osv.osv): 'parent_id': fields.many2one('event.event', 'Parent Event', readonly=False, states={'done': [('readonly', True)]}), 'section_id': fields.many2one('crm.case.section', 'Sale Team', readonly=False, states={'done': [('readonly', True)]}), 'child_ids': fields.one2many('event.event', 'parent_id', 'Child Events', readonly=False, states={'done': [('readonly', True)]}), - 'reply_to': fields.char('Reply-To', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address put in the 'Reply-To' of all emails sent by OpenERP"), 'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}), 'register_max': fields.integer('Maximum Registrations', help="Provide Maximum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}), 'register_min': fields.integer('Minimum Registrations', help="Provide Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}), @@ -224,10 +223,10 @@ class event_event(osv.osv): ('cancel', 'Cancelled')], 'State', readonly=True, required=True, help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'), - 'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use automatic emailing for new registration.'), - 'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use automatic confirmation emailing or reminder.'), - 'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'), - 'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confirmed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."), + + 'email_registration_id' : fields.many2one('email.template','Email registration'), + 'email_confirmation_id' : fields.many2one('email.template','Email registration'), + 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."), 'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."), diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 31fb353c113..0cdeb63d99b 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -137,24 +137,13 @@ - - - - - - - + - - - - - - + From b07edf779533ec8480036a93dbfde1a7844d6f42 Mon Sep 17 00:00:00 2001 From: MVA Date: Fri, 6 Jan 2012 14:59:55 +0100 Subject: [PATCH 007/310] [ADD] send mail bzr revid: mva@openerp.com-20120106135955-m39cr5g7eont0f2y --- addons/event/event.py | 11 ++++++----- addons/event/event_view.xml | 3 ++- addons/event/report/report_event_registration.py | 2 +- .../event/report/report_event_registration_view.xml | 8 +++++++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index f1c569b10cf..e2b45f9d5ce 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -89,7 +89,7 @@ class event_event(osv.osv): """ register_pool = self.pool.get('event.registration') for event in self.browse(cr, uid, ids, context=context): - if event.mail_auto_confirm: + # if event.mail_auto_confirm: #send reminder that will confirm the event for all the people that were already confirmed reg_ids = register_pool.search(cr, uid, [ ('event_id', '=', event.id), @@ -542,10 +542,11 @@ class event_registration(osv.osv): def mail_user(self, cr, uid, ids, confirm=False, context=None): """ Send email to user - """ - mail_message = self.pool.get('mail.message') +""" + + mail_message = self.pool.get('email.template') for registration in self.browse(cr, uid, ids, context=context): - src = registration.event_id.reply_to or False + # src = registration.reply_to or False email_to = [] email_cc = [] if registration.email_from: @@ -568,7 +569,7 @@ class event_registration(osv.osv): body = registration.event_id.mail_confirm if subject or body: mail_message.schedule_with_attach(cr, uid, src, email_to, subject, body, model='event.registration', email_cc=email_cc, res_id=registration.id) - + return True def mail_user_confirm(self, cr, uid, ids, context=None): diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 0cdeb63d99b..927eaad0dad 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -457,8 +457,9 @@ - + + diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 3ef6ecb6e3d..29a999137ba 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -129,4 +129,4 @@ class report_event_registration(osv.osv): report_event_registration() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index ef69c674e43..8cb3c3f5fcd 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -97,7 +97,7 @@ - + @@ -117,6 +117,12 @@ + + + + + + From c913d46c495aa5c07645ec9497e0518ad7962a79 Mon Sep 17 00:00:00 2001 From: MVA Date: Mon, 9 Jan 2012 15:17:04 +0100 Subject: [PATCH 008/310] [ADD] change the dashboard eventregistration bzr revid: mva@openerp.com-20120109141704-p891qphhhrpa02g7 --- .../event/report/report_event_registration.py | 93 ++++++++----------- .../report/report_event_registration_view.xml | 30 +++--- 2 files changed, 58 insertions(+), 65 deletions(-) diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 29a999137ba..3f5ec427af3 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -29,26 +29,30 @@ class report_event_registration(osv.osv): _auto = False _rec_name = 'date' _columns = { - 'date': fields.date('Event Start Date', readonly=True), + 'event_date': fields.date('Event Start Date', readonly=True), + 'price_subtotal':fields.integer('subtotal'), 'year': fields.char('Year', size=4, readonly=True), 'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'event_id': fields.many2one('event.event', 'Event', required=True), 'draft_state': fields.integer(' # No of Draft Registrations', size=20), + 'state': fields.integer(' # No of Draft Registrations', size=20), 'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20), 'register_max': fields.integer('Maximum Registrations'), 'nbevent': fields.integer('Number Of Events'), 'type': fields.many2one('event.type', 'Event Type'), - 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True), + 'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True), + 'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True), 'user_id': fields.many2one('res.users', 'Responsible', readonly=True), + 'user_id_registration': fields.many2one('res.users', 'Responsible', readonly=True), 'speaker_id': fields.many2one('res.partner', 'Speaker', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'total': fields.float('Total'), 'section_id': fields.related('event_id', 'section_id', type='many2one', relation='crm.case.section', string='Sale Team', store=True, readonly=True), } - _order = 'date desc' + _order = 'event_date desc' def init(self, cr): """ initialize the sql view for the event registration @@ -58,29 +62,12 @@ class report_event_registration(osv.osv): cr.execute(""" CREATE OR REPLACE view report_event_registration AS ( SELECT - id, event_id, - date, - user_id, - section_id, - company_id, - product_id, - speaker_id, - year, - month, - nbevent, - type, - SUM(draft_state) AS draft_state, - SUM(confirm_state) AS confirm_state, - SUM(total) AS total, - register_max, - state - FROM( - SELECT - MIN(e.id) AS id, - e.id AS event_id, - e.date_begin AS date, + + r.id, + e.date_begin AS event_date, e.user_id AS user_id, + r.user_id AS user_id_registration, e.section_id AS section_id, e.company_id AS company_id, e.product_id AS product_id, @@ -88,42 +75,44 @@ class report_event_registration(osv.osv): to_char(e.date_begin, 'YYYY') AS year, to_char(e.date_begin, 'MM') AS month, count(e.id) AS nbevent, - t.id AS type, - CASE WHEN c.state IN ('draft') THEN c.nb_register ELSE 0 END AS draft_state, - CASE WHEN c.state IN ('open','done') THEN c.nb_register ELSE 0 END AS confirm_state, - CASE WHEN c.state IN ('done') THEN c.price_subtotal ELSE 0 END AS total, + + + CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state, + CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state, + CASE WHEN r.state IN ('done') THEN r.price_subtotal ELSE 0 END AS total, + + + e.type AS type, + r.price_subtotal, e.register_max AS register_max, - e.state AS state + e.state AS event_state, + r.state AS registration_state FROM event_event e LEFT JOIN - event_registration c ON (e.id=c.event_id) - LEFT JOIN - event_type t ON (e.type=t.id) - WHERE c.active = 'true' + event_registration r ON (e.id=r.event_id) + + WHERE r.active = 'true' + GROUP BY - to_char(e.date_begin, 'YYYY'), - to_char(e.date_begin, 'MM'), - c.state, - c.nb_register, - t.id, e.id, e.date_begin, e.main_speaker_id, - e.register_max, e.type, e.state, c.event_id, e.user_id,e.company_id,e.product_id,e.section_id, - to_char(e.date_begin, 'YYYY-MM-DD'), c.id, c.price_subtotal )AS foo - GROUP BY - id, event_id, - date, - user_id, - section_id, - company_id, - product_id, - speaker_id, + user_id_registration, + e.id, + r.id, + registration_state, + r.nb_register, + e.type, e.id, e.date_begin, e.main_speaker_id, + e.register_max, e.type, e.state,event_id, e.user_id,e.company_id,e.product_id,e.section_id, r.price_subtotal, + e.user_id, + e.section_id, + e.company_id, + e.product_id, + e.main_speaker_id, year, month, - nbevent, - type, - register_max, - state + e.type, + e.register_max, + e.state ) """) diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 8cb3c3f5fcd..26e6b598517 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -8,18 +8,21 @@ report.event.registration tree - - + + - + + + + @@ -54,23 +57,23 @@ - + @@ -106,12 +109,12 @@ - + + domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/> - - + + + From debfe254dd418d2cb8c3f8a6aa9eb6a2b3ccee31 Mon Sep 17 00:00:00 2001 From: MVA Date: Mon, 9 Jan 2012 16:53:47 +0100 Subject: [PATCH 009/310] [ADD] change the dashboard eventregistration bzr revid: mva@openerp.com-20120109155347-jnw3hq6ilj0x7rmg --- addons/event/event.py | 6 ++++-- addons/event/report/report_event_registration.py | 3 ++- addons/event/report/report_event_registration_view.xml | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index e2b45f9d5ce..ffda827614e 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -178,7 +178,7 @@ class event_event(osv.osv): """ register_pool = self.pool.get('event.registration') res = super(event_event, self).write(cr, uid, ids, vals, context=context) - if vals.get('date_begin', False) or vals.get('mail_auto_confirm', False) or vals.get('mail_confirm', False): + if vals.get('date_begin', False) or vals.get('mail_confirm', False): for event in self.browse(cr, uid, ids, context=context): #change the deadlines of the registration linked to this event register_values = {} @@ -186,6 +186,8 @@ class event_event(osv.osv): register_values['date_deadline'] = vals['date_begin'] #change the description of the registration linked to this event + + """ if vals.get('mail_auto_confirm', False): if vals['mail_auto_confirm']: if 'mail_confirm' not in vals: @@ -194,7 +196,7 @@ class event_event(osv.osv): vals['mail_confirm'] = False if 'mail_confirm' in vals: register_values['description'] = vals['mail_confirm'] - +""" if register_values: reg_ids = register_pool.search(cr, uid, [('event_id', '=', event.id)], context=context) register_pool.write(cr, uid, reg_ids, register_values, context=context) diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 3f5ec427af3..cfdbfcf70c4 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -37,7 +37,7 @@ class report_event_registration(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'event_id': fields.many2one('event.event', 'Event', required=True), 'draft_state': fields.integer(' # No of Draft Registrations', size=20), - 'state': fields.integer(' # No of Draft Registrations', size=20), + 'average_subtotal': fields.integer('average_subtotal', size=20), 'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20), 'register_max': fields.integer('Maximum Registrations'), 'nbevent': fields.integer('Number Of Events'), @@ -84,6 +84,7 @@ class report_event_registration(osv.osv): e.type AS type, r.price_subtotal, + AVG(r.price_subtotal) AS average_subtotal, e.register_max AS register_max, e.state AS event_state, r.state AS registration_state diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 26e6b598517..5e48174c4a8 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -22,7 +22,8 @@ - + + @@ -123,7 +124,6 @@ - From e6eeabd86258dae902addc9a1423a5b87c8bc5a8 Mon Sep 17 00:00:00 2001 From: MVA Date: Tue, 10 Jan 2012 15:08:26 +0100 Subject: [PATCH 010/310] [ADD] review some bugs and some views bzr revid: mva@openerp.com-20120110140826-bi7t0afmyzb92hka --- addons/event/board_association_view.xml | 2 +- addons/event/event.py | 4 ++-- addons/event/event_view.xml | 20 ++++++++++++------- .../event/report/report_event_registration.py | 15 +++++++------- .../report/report_event_registration_view.xml | 8 ++++---- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index 02d45f03dc1..18afb4a0f97 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -21,7 +21,7 @@ Events Filling Status report.event.registration form - [('state','not in',('cancel','done'))] + [('event_state','not in',('cancel','done'))] graph,tree diff --git a/addons/event/event.py b/addons/event/event.py index ffda827614e..1aa2a94d802 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -203,7 +203,7 @@ class event_event(osv.osv): return res _columns = { - 'name': fields.char('Summary', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}), + 'name': fields.char('Origin', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}), 'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}), 'parent_id': fields.many2one('event.event', 'Parent Event', readonly=False, states={'done': [('readonly', True)]}), 'section_id': fields.many2one('crm.case.section', 'Sale Team', readonly=False, states={'done': [('readonly', True)]}), @@ -298,7 +298,7 @@ class event_registration(osv.osv): _columns = { 'id': fields.integer('ID'), - 'name': fields.char('Summary', size=124, readonly=True, states={'draft': [('readonly', False)]}), + 'name': fields.char('Origin', size=124, readonly=True, states={'draft': [('readonly', False)]}), 'email_cc': fields.text('CC', size=252, readonly=False, states={'done': [('readonly', True)]}, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"), 'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}), diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 927eaad0dad..9eea7cd611e 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -315,7 +315,8 @@
- + + @@ -323,13 +324,12 @@ - - + - + - + @@ -337,8 +337,8 @@ - - + + @@ -348,7 +348,10 @@ + + + @@ -396,6 +399,9 @@ name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/> + + +
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index cfdbfcf70c4..75fd7c43b45 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -41,7 +41,7 @@ class report_event_registration(osv.osv): 'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20), 'register_max': fields.integer('Maximum Registrations'), 'nbevent': fields.integer('Number Of Events'), - 'type': fields.many2one('event.type', 'Event Type'), + 'event_type': fields.many2one('event.type', 'Event Type'), 'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True), 'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True), 'user_id': fields.many2one('res.users', 'Responsible', readonly=True), @@ -63,7 +63,6 @@ class report_event_registration(osv.osv): CREATE OR REPLACE view report_event_registration AS ( SELECT event_id, - r.id, e.date_begin AS event_date, e.user_id AS user_id, @@ -82,7 +81,7 @@ class report_event_registration(osv.osv): CASE WHEN r.state IN ('done') THEN r.price_subtotal ELSE 0 END AS total, - e.type AS type, + e.type AS event_type, r.price_subtotal, AVG(r.price_subtotal) AS average_subtotal, e.register_max AS register_max, @@ -102,18 +101,18 @@ class report_event_registration(osv.osv): r.id, registration_state, r.nb_register, - e.type, e.id, e.date_begin, e.main_speaker_id, - e.register_max, e.type, e.state,event_id, e.user_id,e.company_id,e.product_id,e.section_id, r.price_subtotal, + event_type, e.id, e.date_begin, e.main_speaker_id, + e.register_max,event_id, e.user_id,e.company_id,e.product_id,e.section_id, r.price_subtotal, e.user_id, e.section_id, + event_state, e.company_id, e.product_id, e.main_speaker_id, year, month, - e.type, - e.register_max, - e.state + e.register_max + ) """) diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 5e48174c4a8..e3ff87f4f40 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -16,7 +16,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -124,7 +124,7 @@ - + From 789d528eb95f5d3c4cf834b1b7c83954b9ef3325 Mon Sep 17 00:00:00 2001 From: MVA Date: Wed, 11 Jan 2012 12:05:18 +0100 Subject: [PATCH 011/310] [ADD] trigger mail with email.template bzr revid: mva@openerp.com-20120111110518-o961ova39cc0ucku --- addons/event/event.py | 37 +++++++++++-------------------------- addons/event/event_view.xml | 26 ++++++++++++++------------ 2 files changed, 25 insertions(+), 38 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 1aa2a94d802..3d82d1a40b5 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -186,7 +186,7 @@ class event_event(osv.osv): register_values['date_deadline'] = vals['date_begin'] #change the description of the registration linked to this event - + """ if vals.get('mail_auto_confirm', False): if vals['mail_auto_confirm']: @@ -227,7 +227,9 @@ class event_event(osv.osv): help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'), 'email_registration_id' : fields.many2one('email.template','Email registration'), - 'email_confirmation_id' : fields.many2one('email.template','Email registration'), + 'email_confirmation_id' : fields.many2one('email.template','Email confirmation'), + 'reply_to': fields.char('Reply-To', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address put in the 'Reply-To' of all emails sent by OpenERP"), + 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."), 'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}), @@ -303,6 +305,7 @@ class event_registration(osv.osv): 'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"), 'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}), + 'partner_id_address': fields.many2one('res.partner.address', 'Partner', states={'done': [('readonly', True)]}), "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}), "contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id "unit_price": fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), @@ -545,33 +548,15 @@ class event_registration(osv.osv): """ Send email to user """ - - mail_message = self.pool.get('email.template') for registration in self.browse(cr, uid, ids, context=context): - # src = registration.reply_to or False - email_to = [] - email_cc = [] - if registration.email_from: - email_to = [registration.email_from] - if registration.email_cc: - email_cc += [registration.email_cc] - if not (email_to or email_cc): - continue - subject = "" - body = "" - if confirm: - subject = _('Auto Confirmation: [%s] %s') %(registration.id, registration.name) - body = registration.event_id.mail_confirm - elif registration.event_id.mail_auto_confirm or registration.event_id.mail_auto_registr: - if registration.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and registration.event_id.mail_auto_registr: - subject = _('Auto Registration: [%s] %s') %(registration.id, registration.name) - body = registration.event_id.mail_registr - if (registration.event_id.state in ['confirm', 'running']) and registration.event_id.mail_auto_confirm: - subject = _('Auto Confirmation: [%s] %s') %(registration.id, registration.name) - body = registration.event_id.mail_confirm + subject = registration.event_id.email_confirmation_id.subject + reply_to = registration.event_id.email_confirmation_id.reply_to + email_cc = registration.event_id.email_confirmation_id.email_cc + email_to =registration.event_id.email_confirmation_id.email_to + body = registration.event_id.email_confirmation_id.body_html if subject or body: mail_message.schedule_with_attach(cr, uid, src, email_to, subject, body, model='event.registration', email_cc=email_cc, res_id=registration.id) - + return True def mail_user_confirm(self, cr, uid, ids, context=None): diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 9eea7cd611e..3dc91d02ed0 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -109,7 +109,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -296,7 +296,7 @@ - + @@ -318,26 +318,23 @@ - + + + + + - - - - - - - @@ -347,6 +344,11 @@ @@ -130,6 +120,9 @@
+ diff --git a/addons/portal/i18n/de.po b/addons/portal/i18n/de.po index 45cf7554b50..93efcf49fee 100644 --- a/addons/portal/i18n/de.po +++ b/addons/portal/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-11-29 07:47+0000\n" +"PO-Revision-Date: 2012-01-13 18:46+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:35+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:13+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: portal #: code:addons/portal/wizard/share_wizard.py:51 @@ -56,6 +56,8 @@ msgid "" "Portal managers have access to the portal definitions, and can easily " "configure the users, access rights and menus of portal users." msgstr "" +"Portal Manager können die Portaldefinitionen , sowie Benutzer, Rechte und " +"Menüpunkte ändern." #. module: portal #: help:res.portal,override_menu:0 @@ -98,7 +100,7 @@ msgstr "Die URL, mit der sich Portalbenutzer anmelden können" #. module: portal #: model:res.groups,comment:portal.group_portal_officer msgid "Portal officers can create new portal users with the portal wizard." -msgstr "" +msgstr "Portal Verwalter können mit dem Assistenten neue Portal-Benutzer" #. module: portal #: help:res.portal.wizard,message:0 @@ -350,11 +352,25 @@ msgid "" "OpenERP - Open Source Business Applications\n" "http://www.openerp.com\n" msgstr "" +"Sehr geehrte(r) %(name)s,\n" +"\n" +"Für Sie erstellten wir ein OpenERP Konto %(url)s.\n" +"\n" +"Ihre Login Kontodaten sind:\n" +"Datenbank: %(db)s\n" +"Benutzer: %(login)s\n" +"Passwort: %(password)s\n" +"\n" +"%(message)s\n" +"\n" +"--\n" +"OpenERP - Open Source Business Applications\n" +"http://www.openerp.com\n" #. module: portal #: model:res.groups,name:portal.group_portal_manager msgid "Manager" -msgstr "" +msgstr "Manager" #. module: portal #: help:res.portal.wizard.user,name:0 @@ -398,4 +414,4 @@ msgstr "Freigabeassistent" #. module: portal #: model:res.groups,name:portal.group_portal_officer msgid "Officer" -msgstr "" +msgstr "Verwalter" diff --git a/addons/process/i18n/ar.po b/addons/process/i18n/ar.po index 0c4a3938b23..4d90fb6967a 100644 --- a/addons/process/i18n/ar.po +++ b/addons/process/i18n/ar.po @@ -7,21 +7,21 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2009-02-04 11:55+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2012-01-13 21:36+0000\n" +"Last-Translator: kifcaliph \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-12-23 06:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:11+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: process #: model:ir.model,name:process.model_process_node #: view:process.node:0 #: view:process.process:0 msgid "Process Node" -msgstr "" +msgstr "سلسة الإجراءات" #. module: process #: help:process.process,active:0 @@ -38,18 +38,18 @@ msgstr "" #. module: process #: field:process.transition,action_ids:0 msgid "Buttons" -msgstr "" +msgstr "أزرار" #. module: process #: view:process.node:0 #: view:process.process:0 msgid "Group By..." -msgstr "" +msgstr "تجميع حسب..." #. module: process #: selection:process.node,kind:0 msgid "State" -msgstr "" +msgstr "الحالة" #. module: process #: view:process.node:0 @@ -59,7 +59,7 @@ msgstr "" #. module: process #: field:process.node,help_url:0 msgid "Help URL" -msgstr "" +msgstr "عنوان URL للمساعدة" #. module: process #: model:ir.actions.act_window,name:process.action_process_node_form @@ -73,14 +73,14 @@ msgstr "" #: view:process.process:0 #: field:process.process,node_ids:0 msgid "Nodes" -msgstr "" +msgstr "العقد" #. module: process #: view:process.node:0 #: field:process.node,condition_ids:0 #: view:process.process:0 msgid "Conditions" -msgstr "" +msgstr "الشروط" #. module: process #: view:process.transition:0 @@ -100,7 +100,7 @@ msgstr "" #. module: process #: field:process.transition,note:0 msgid "Description" -msgstr "" +msgstr "وصÙ" #. module: process #: model:ir.model,name:process.model_process_transition_action @@ -114,7 +114,7 @@ msgstr "" #: view:process.process:0 #: field:process.process,model_id:0 msgid "Object" -msgstr "" +msgstr "كائن" #. module: process #: field:process.transition,source_node_id:0 @@ -141,18 +141,18 @@ msgstr "" #. module: process #: model:ir.model,name:process.model_process_condition msgid "Condition" -msgstr "" +msgstr "شرط" #. module: process #: selection:process.transition.action,state:0 msgid "Dummy" -msgstr "" +msgstr "وهمي" #. module: process #: model:ir.actions.act_window,name:process.action_process_form #: model:ir.ui.menu,name:process.menu_process_form msgid "Processes" -msgstr "" +msgstr "العمليّات" #. module: process #: field:process.condition,name:0 @@ -161,7 +161,7 @@ msgstr "" #: field:process.transition,name:0 #: field:process.transition.action,name:0 msgid "Name" -msgstr "" +msgstr "الاسم" #. module: process #: field:process.node,transition_in:0 @@ -175,12 +175,12 @@ msgstr "" #: field:process.process,note:0 #: view:process.transition:0 msgid "Notes" -msgstr "" +msgstr "ملاحظات" #. module: process #: field:process.transition.action,transition_id:0 msgid "Transition" -msgstr "" +msgstr "انتقال" #. module: process #: view:process.process:0 @@ -196,7 +196,7 @@ msgstr "" #. module: process #: field:process.process,active:0 msgid "Active" -msgstr "" +msgstr "نشط" #. module: process #: view:process.transition:0 @@ -211,7 +211,7 @@ msgstr "" #. module: process #: selection:process.transition.action,state:0 msgid "Action" -msgstr "" +msgstr "إجراء" #. module: process #: field:process.node,flow_start:0 @@ -221,7 +221,7 @@ msgstr "" #. module: process #: field:process.condition,model_states:0 msgid "Expression" -msgstr "" +msgstr "صيغة" #. module: process #: field:process.transition,group_ids:0 @@ -237,7 +237,7 @@ msgstr "" #. module: process #: field:process.transition.action,state:0 msgid "Type" -msgstr "" +msgstr "نوع" #. module: process #: field:process.node,transition_out:0 @@ -249,7 +249,7 @@ msgstr "" #: field:process.node,process_id:0 #: view:process.process:0 msgid "Process" -msgstr "" +msgstr "عمليّة" #. module: process #: view:process.node:0 @@ -270,13 +270,13 @@ msgstr "" #. module: process #: view:process.transition:0 msgid "Actions" -msgstr "" +msgstr "إجراءات" #. module: process #: view:process.node:0 #: view:process.process:0 msgid "Properties" -msgstr "" +msgstr "خصائص" #. module: process #: model:ir.actions.act_window,name:process.action_process_transition_form @@ -304,7 +304,7 @@ msgstr "" #: view:process.node:0 #: view:process.process:0 msgid "Transitions" -msgstr "" +msgstr "الانتقالات" #. module: process #: selection:process.transition.action,state:0 diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po index 8975c579b70..a8ae77236d6 100644 --- a/addons/procurement/i18n/de.po +++ b/addons/procurement/i18n/de.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-18 10:25+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-15 09:14+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:20+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-16 05:19+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: procurement #: view:make.procurement:0 @@ -63,7 +62,7 @@ msgstr "Kein Lieferant für dieses Produkt definiert!" #. module: procurement #: field:make.procurement,uom_id:0 msgid "Unit of Measure" -msgstr "Mengeneinheit" +msgstr "ME" #. module: procurement #: field:procurement.order,procure_method:0 @@ -85,6 +84,7 @@ msgstr "Berechne nur die Meldebestandregel" #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." msgstr "" +"Sie dürfen keine Sicht als Quelle oder Ziel einer Lagerbewegung angeben" #. module: procurement #: field:procurement.order,company_id:0 @@ -165,7 +165,7 @@ msgstr "" #. module: procurement #: view:procurement.order:0 msgid "Permanent Procurement Exceptions" -msgstr "" +msgstr "Permanente Beschaffungs Ausnahmen" #. module: procurement #: view:stock.warehouse.orderpoint:0 @@ -635,7 +635,7 @@ msgstr "Meldebestandregel" #. module: procurement #: help:stock.warehouse.orderpoint,qty_multiple:0 msgid "The procurement quantity will be rounded up to this multiple." -msgstr "" +msgstr "Die Beschaffungsmenge wird auf diesen Faktur gerundet" #. module: procurement #: model:ir.model,name:procurement.model_res_company @@ -675,7 +675,7 @@ msgstr "Beschaffe bis Auffüllbestand" #. module: procurement #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Die Referenz muss je Firma eindeutig sein" #. module: procurement #: field:procurement.order,date_close:0 @@ -908,12 +908,12 @@ msgstr "Beschaffungsdisposition" #. module: procurement #: view:procurement.order:0 msgid "Temporary Procurement Exceptions" -msgstr "" +msgstr "Temporäre Fehlerliste" #. module: procurement #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Der Name der Firma darf nur einmal vorkommen!" #. module: procurement #: field:mrp.property,name:0 @@ -1011,7 +1011,7 @@ msgstr "Details zur Beschaffung" #. module: procurement #: view:procurement.order:0 msgid "Procurement started late" -msgstr "" +msgstr "Die Beschaffung begann zu spät" #. module: procurement #: code:addons/procurement/schedulers.py:184 diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index d63e4cc130b..846aa5881f2 100644 --- a/addons/product/__openerp__.py +++ b/addons/product/__openerp__.py @@ -61,10 +61,10 @@ Print product labels with barcode. 'partner_view.xml', 'process/product_process.xml' ], - 'test':[ - 'test/product_test.yml', - 'test/product_price_list.yml', - 'test/product_report.yml', + 'test': [ + 'product_pricelist_demo.yml', + 'test/product_uom.yml', + 'test/product_pricelist.yml', ], 'installable': True, 'active': False, diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po index f42ebabc5de..a8a2deb2e50 100644 --- a/addons/product/i18n/de.po +++ b/addons/product/i18n/de.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-18 10:19+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 20:21+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \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-12-23 06:48+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:11+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: product #: view:product.pricelist.item:0 @@ -133,7 +132,7 @@ msgstr "" #. module: product #: field:product.supplierinfo,product_uom:0 msgid "Supplier UoM" -msgstr "Mengeneinheit bei Lieferanten" +msgstr "ME bei Lieferanten" #. module: product #: help:product.pricelist.item,price_round:0 @@ -154,7 +153,7 @@ msgstr "Lieferant" #. module: product #: model:product.template,name:product.product_consultant_product_template msgid "Service on Timesheet" -msgstr "" +msgstr "Zeit- und Aufgabenerfassung" #. module: product #: help:product.price.type,field:0 @@ -164,7 +163,7 @@ msgstr "Verbundenes Feld in Produkt Formular" #. module: product #: view:product.product:0 msgid "Unit of Measure" -msgstr "Mengeneinheit" +msgstr "ME" #. module: product #: field:product.template,procure_method:0 @@ -179,7 +178,7 @@ msgstr "Druckdatum" #. module: product #: field:product.product,qty_available:0 msgid "Quantity On Hand" -msgstr "" +msgstr "Bestandsmenge" #. module: product #: view:product.pricelist:0 @@ -285,7 +284,7 @@ msgstr "ME" #. module: product #: model:ir.actions.act_window,name:product.product_form_config_action msgid "Create or Import Products" -msgstr "" +msgstr "Erzeuge oder Importiere Produkte" #. module: product #: help:product.template,supply_method:0 @@ -293,6 +292,8 @@ msgid "" "Produce will generate production order or tasks, according to the product " "type. Buy will trigger purchase orders when requested." msgstr "" +"Eine Produktion wird je Produkttyp einen Produktionsauftrag oder eine " +"Aufgabe erzeugen. Kauf wird einen Beschaffungsauftrag erzeugen." #. module: product #: help:product.pricelist.version,date_start:0 @@ -381,7 +382,7 @@ msgstr "pricelist.partnerinfo" #. module: product #: field:product.template,uom_po_id:0 msgid "Purchase Unit of Measure" -msgstr "Einkauf Mengeneinheit" +msgstr "Einkauf ME" #. module: product #: selection:product.template,mes_type:0 @@ -392,7 +393,7 @@ msgstr "Fest" #: model:ir.actions.act_window,name:product.product_uom_categ_form_action #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action msgid "Units of Measure Categories" -msgstr "Mengeneinheiten Kategorien" +msgstr "ME Kategorien" #. module: product #: help:product.pricelist.item,product_id:0 @@ -423,7 +424,7 @@ msgstr "Basispreise" #. module: product #: field:product.product,color:0 msgid "Color Index" -msgstr "" +msgstr "Farb Index" #. module: product #: view:product.template:0 @@ -484,7 +485,7 @@ msgstr "Packdimensionen" #: code:addons/product/product.py:175 #, python-format msgid "Warning" -msgstr "" +msgstr "Warnung" #. module: product #: field:product.pricelist.item,base:0 @@ -522,6 +523,8 @@ msgid "" "Conversion from Product UoM %s to Default UoM %s is not possible as they " "both belong to different Category!." msgstr "" +"Konvertierung von Produkt Mengeninheit %s zu Standard Mengeneinheit %s ist " +"nicht möglich, das diese zu verschiedenen Kategorien gehören." #. module: product #: field:product.template,sale_delay:0 @@ -634,6 +637,8 @@ msgstr "Höhe der Verpackung" msgid "" "New UoM '%s' must belongs to same UoM category '%s' as of old UoM '%s'." msgstr "" +"Neue Mengeneinheit '%s' muss zur selben Kategorie '%s' gehören wie die alte " +"ME '%s'." #. module: product #: model:product.pricelist.type,name:product.pricelist_type_sale @@ -770,7 +775,7 @@ msgstr "Preisliste Version" #. module: product #: field:product.product,virtual_available:0 msgid "Quantity Available" -msgstr "" +msgstr "verfügbare Menge" #. module: product #: help:product.pricelist.item,sequence:0 @@ -804,6 +809,8 @@ msgid "" "Create a product form for everything you buy or sell. Specify a supplier if " "the product can be purchased." msgstr "" +"Erzeuge ein Produkt für alles was gekauft und verkauft wird. Definieren Sie " +"Lieferanten, wenn das Produkt gekauft wird." #. module: product #: view:product.uom:0 @@ -859,7 +866,7 @@ msgstr "Gesamtes Verpackungsgewicht" #. module: product #: view:product.product:0 msgid "Context..." -msgstr "" +msgstr "Kontext.." #. module: product #: help:product.template,procure_method:0 @@ -954,6 +961,8 @@ msgid "" "Will change the way procurements are processed. Consumable are product where " "you don't manage stock." msgstr "" +"Dies bestimmt, wie Beschaffungsvorgänge verarbeitet werden. Für " +"Verbrauchsgüter wird kein Lagerbestand geführt" #. module: product #: model:product.uom.categ,name:product.product_uom_categ_kgm @@ -1114,7 +1123,7 @@ msgstr "" #. module: product #: help:product.supplierinfo,product_uom:0 msgid "This comes from the product form." -msgstr "" +msgstr "Dies kommt vom Produkt Formular" #. module: product #: model:ir.actions.act_window,help:product.product_normal_action @@ -1247,6 +1256,7 @@ msgid "" "At least one pricelist has no active version !\n" "Please create or activate one." msgstr "" +"Zumindest eine Preisliste hat keine aktiver Version, bitte eine erzeugen" #. module: product #: field:product.pricelist.item,price_max_margin:0 @@ -1565,7 +1575,7 @@ msgstr "Allgemeine Preisliste" #. module: product #: field:product.product,product_image:0 msgid "Image" -msgstr "" +msgstr "Bild" #. module: product #: selection:product.ul,type:0 @@ -1643,7 +1653,7 @@ msgstr "Standard ME" #. module: product #: view:product.product:0 msgid "Both stockable and consumable products" -msgstr "" +msgstr "Lager- und Verbrauchsgüter" #. module: product #: selection:product.ul,type:0 @@ -1748,7 +1758,7 @@ msgstr "" #: code:addons/product/product.py:175 #, python-format msgid "Cannot change the category of existing UoM '%s'." -msgstr "" +msgstr "Kann die Kategorie der bestehenden Mengeneinheit %s nicht ändnern" #. module: product #: field:product.packaging,ean:0 @@ -1842,7 +1852,7 @@ msgstr "Preisberechnung" #. module: product #: model:res.groups,name:product.group_uos msgid "Product UoS View" -msgstr "" +msgstr "Produkt Verkaufseinheit Ansicht" #. module: product #: field:product.template,loc_case:0 @@ -1929,7 +1939,7 @@ msgstr "Länge" #: code:addons/product/product.py:345 #, python-format msgid "UoM categories Mismatch!" -msgstr "" +msgstr "Kategorien der Mengeneinheit stimmen nicht überein" #. module: product #: field:product.template,volume:0 @@ -1997,7 +2007,7 @@ msgstr "Preislisten Versionen" #. module: product #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen." #. module: product #: field:product.category,sequence:0 @@ -2021,7 +2031,7 @@ msgstr "Beschaffung & Lagerorte" #. module: product #: constraint:product.category:0 msgid "Error ! You cannot create recursive categories." -msgstr "" +msgstr "Fehler! Rekursive Kategorien sind nicht zulässig" #. module: product #: field:product.category,type:0 diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po index e582a93bc9a..f21d3dff53d 100644 --- a/addons/product/i18n/zh_CN.po +++ b/addons/product/i18n/zh_CN.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-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-02-03 07:52+0000\n" +"PO-Revision-Date: 2012-01-13 09:38+0000\n" "Last-Translator: Wei \"oldrev\" Li \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-12-23 06:49+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: product #: view:product.pricelist.item:0 @@ -166,7 +166,7 @@ msgstr "打å°æ—¥æœŸ" #. module: product #: field:product.product,qty_available:0 msgid "Quantity On Hand" -msgstr "" +msgstr "在手数é‡" #. module: product #: view:product.pricelist:0 @@ -269,7 +269,7 @@ msgstr "计é‡å•ä½" #. module: product #: model:ir.actions.act_window,name:product.product_form_config_action msgid "Create or Import Products" -msgstr "" +msgstr "创建或导入产å“" #. module: product #: help:product.template,supply_method:0 @@ -403,7 +403,7 @@ msgstr "基础价格" #. module: product #: field:product.product,color:0 msgid "Color Index" -msgstr "" +msgstr "颜色索引" #. module: product #: view:product.template:0 @@ -464,7 +464,7 @@ msgstr "åž«æ¿å°ºå¯¸" #: code:addons/product/product.py:175 #, python-format msgid "Warning" -msgstr "" +msgstr "警告" #. module: product #: field:product.pricelist.item,base:0 @@ -474,7 +474,7 @@ msgstr "基于" #. module: product #: model:product.uom,name:product.product_uom_ton msgid "t" -msgstr "" +msgstr "t" #. module: product #: help:pricelist.partnerinfo,price:0 @@ -739,7 +739,7 @@ msgstr "价格表版本" #. module: product #: field:product.product,virtual_available:0 msgid "Quantity Available" -msgstr "" +msgstr "å¯ä¾›æ•°é‡" #. module: product #: help:product.pricelist.item,sequence:0 @@ -821,7 +821,7 @@ msgstr "包装总é‡é‡" #. module: product #: view:product.product:0 msgid "Context..." -msgstr "" +msgstr "上下文..." #. module: product #: help:product.template,procure_method:0 @@ -1173,6 +1173,8 @@ msgid "" "At least one pricelist has no active version !\n" "Please create or activate one." msgstr "" +"至少有一个价格表没有活动的版本ï¼\n" +"请创建或激活一个。" #. module: product #: field:product.pricelist.item,price_max_margin:0 @@ -1477,7 +1479,7 @@ msgstr "公共价格表" #. module: product #: field:product.product,product_image:0 msgid "Image" -msgstr "" +msgstr "图片" #. module: product #: selection:product.ul,type:0 @@ -1817,7 +1819,7 @@ msgstr "长度" #: code:addons/product/product.py:345 #, python-format msgid "UoM categories Mismatch!" -msgstr "" +msgstr "计é‡å•ä½åˆ†ç±»ä¸åŒ¹é…ï¼" #. module: product #: field:product.template,volume:0 diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index db953c8a319..ea29292f445 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -271,7 +271,7 @@ class product_pricelist(osv.osv): if price is not False: price_limit = price price = price * (1.0+(res['price_discount'] or 0.0)) - price = rounding(price, res['price_round']) + price = rounding(price, res['price_round']) #TOFIX: rounding with tools.float_rouding price += (res['price_surcharge'] or 0.0) if res['price_min_margin']: price = max(price, price_limit+res['price_min_margin']) diff --git a/addons/product/product.py b/addons/product/product.py index 4df455e7409..e6b4b4c6348 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -214,7 +214,7 @@ class product_category(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True, translate=True, select=True), 'complete_name': fields.function(_name_get_fnc, type="char", string='Name'), - 'parent_id': fields.many2one('product.category','Parent Category', select=True), + 'parent_id': fields.many2one('product.category','Parent Category', select=True, ondelete='cascade'), 'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'), 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of product categories."), 'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'), @@ -412,10 +412,11 @@ class product_product(osv.osv): context = {} quantity = context.get('quantity') or 1.0 pricelist = context.get('pricelist', False) + partner = context.get('partner', False) if pricelist: for id in ids: try: - price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist], id, quantity, context=context)[pricelist] + price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist], id, quantity, partner=partner, context=context)[pricelist] except: price = 0.0 res[id] = price diff --git a/addons/product/test/product_price_list.yml b/addons/product/test/product_price_list.yml deleted file mode 100644 index 1ebb75d78dd..00000000000 --- a/addons/product/test/product_price_list.yml +++ /dev/null @@ -1,124 +0,0 @@ -- - In order to check the calculation of price of the products according to selected pricelist, - I create a pricelist rule for giving discount on some quantities of product. -- - !record {model: product.pricelist.item, id: item0}: - name: Default Public Pricelist for More Qty - min_quantity: 15 - price_discount: -0.10 -- - I check whether the product consumes the price, based on the given quantities, correctly or not. -- - !python {model: product.pricelist}: | - product_obj = self.pool.get("product.product") - result = self.price_get_multi(cr, uid, [ref("product.list0")], [(ref("product_product_pc1"),15,False)]) - new_price = result[ref("product_product_pc1")].values() - context.update({'pricelist': ref("product.list0"), 'quantity': 15}) - product_price = product_obj.browse(cr, uid, ref("product_product_pc1"), context=context).price - assert new_price[0] == product_price,"Discount is not given on price of the product." -- - I create a pricelist rule to give discount for a specific product. -- - !record {model: product.pricelist.item, id: pricelist_rules_for_pc2}: - name: Default Public Pricelist for PC2 - min_quantity: 1 - product_id: product.product_product_pc2 - sequence: 4 - base: !eval (ref('product.list_price')) - price_version_id: product.ver0 - price_discount: -0.20 -- - I check whether the selected product is having the price correctly or not. -- - !python {model: product.pricelist}: | - result = self.price_get_multi(cr, uid, [ref("product.list0")], [(ref("product_product_pc2"),1,False)]) - product_obj = self.pool.get("product.product") - new_price = result[ref("product_product_pc2")].values() - context.update({'pricelist': ref("product.list0"), 'quantity': 1}) - product_price = product_obj.browse(cr, uid, ref("product_product_pc2"), context=context).price - assert new_price[0] == product_price,"Discount is not given on price of the special product." -- - I create a pricelist rule to give discount for a specific category of products. -- - !record {model: product.pricelist.item, id: pricelist_rules_category_1}: - name: Default Public Pricelist for Category - min_quantity: 1 - categ_id: product.cat1 - sequence: 3 - base: !eval (ref('product.list_price')) - price_version_id: product.ver0 - price_discount: -0.25 -- - I check whether the price of products of selected product category is correctly set or not. -- - !python {model: product.pricelist}: | - result = self.price_get_multi(cr, uid, [ref("product.list0")], [(ref("product_product_fan2"),1,False)]) - product_obj = self.pool.get("product.product") - new_price = result[ref("product_product_fan2")].values() - context.update({'pricelist': ref("product.list0"), 'quantity': 1}) - product_price = product_obj.browse(cr, uid, ref("product_product_fan2"), context=context).price - assert new_price[0] == product_price,"Discount is not given on price of the special category of products." -- - I create a pricelist to give the discount at the end of year. -- - !record {model: product.pricelist, id: product_price_list_end_year}: - name: End of Year Price List - type: sale - version_id: - - name: End of Year Price List Version - items_id: - - name: End of Year Price List Version Rule - min_quantity: 1 - base: !eval (ref('product.list_price')) - price_discount: -0.30 -- - !record {model: product.pricelist.item, id: pricelist_rules_for_end_year1}: - name: End of Year Price List Version Rule - Public Pricelist - min_quantity: 1 - sequence: 2 - base: -1 - price_version_id: product.ver0 - base_pricelist_id: product_price_list_end_year -- - Now, I check that the end of the year pricelist rule is applied on products. -- - !python {model: product.pricelist}: | - result = self.price_get_multi(cr, uid, [ref("product.list0")], [(ref("product_product_pc1"),1,False)]) - new_price = result[ref("product_product_pc1")].values() - product_obj = self.pool.get("product.product") - context.update({'pricelist': ref("product.list0"), 'quantity': 1}) - product_price = product_obj.browse(cr, uid, ref("product_product_pc1"), context=context).price - assert new_price[0] == product_price,"Discount is not given on price of product at the end of the year." -- - I create a pricelist for special customers by which they can get discount on products. -- - !record {model: product.pricelist, id: special_customer_price_list1}: - name: Price List For Special Customer - type: sale - version_id: - - name: Special Customer Price List Version - items_id: - - name: Special Customer Price List Version Rule - min_quantity: 1 - base: !eval (ref('product.list_price')) - price_discount: -0.40 -- - !record {model: res.partner, id: base.res_partner_agrolait}: - property_product_pricelist: special_customer_price_list1 -- - I check that the customer is getting the discount according to the pricelist. -- - !python {model: product.pricelist}: | - result = self.price_get_multi(cr, uid, [ref("product.special_customer_price_list1")], [(ref("product_product_pc4"),1,ref("base.res_partner_agrolait"))]) - product_obj = self.pool.get("product.product") - new_price = result[ref("product_product_pc4")].values() - context.update({'pricelist': ref("product.special_customer_price_list1"), 'quantity': 1}) - product_price = product_obj.browse(cr, uid, ref("product_product_pc4"), context=context).price - assert new_price[0] == product_price,"Discount is not given to special customer." -- - I set the supplier pricelist for a product to get the discount at the time of purchase. -- - !record {model: product.supplierinfo, id: supplierinfo5}: - pricelist_ids: - - min_quantity: 10 - price: 200 diff --git a/addons/product/test/product_report.yml b/addons/product/test/product_report.yml deleted file mode 100644 index 397c2c9d0b6..00000000000 --- a/addons/product/test/product_report.yml +++ /dev/null @@ -1,16 +0,0 @@ -- - Print the Products Pricelists Report through the wizard -- - !python {model: product.product}: | - ctx={} - ctx.update({'model': 'product.product','active_ids': [ref('product.product_product_pc1'), ref('product.product_product_pc3')]}) - data_dict = {'qty1': 1, - 'qty2': 5, - 'qty3': 10, - 'qty4': 0, - 'qty5': 0, - 'price_list':ref('product.list0')} - from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_product_price_list',wiz_data=data_dict, context=ctx, our_module='product') - - diff --git a/addons/product/test/product_test.yml b/addons/product/test/product_test.yml deleted file mode 100644 index ae75a552c79..00000000000 --- a/addons/product/test/product_test.yml +++ /dev/null @@ -1,33 +0,0 @@ -- - In order to test product,I start by creating a 20KG UOM for 'Sugar' -- - !record {model: product.uom, id: product_20k_uom_sugar}: - name: 20KG - uom_type: bigger - category_id: product.product_uom_categ_kgm - factor_inv: 20 -- - I create a 10KG UOM for 'Sugar' -- - !record {model: product.uom, id: product_10k_uom_sugar}: - name: 10KG - uom_type: bigger - category_id: product.product_uom_categ_kgm - factor_inv: 10 -- - I create a new product 'Sugar' in 20KG UOM. -- - !record {model: product.product, id: product_sugar_id1}: - categ_id: 'product.product_category_rawmaterial0' - name: Sugar 20KG - procure_method: make_to_order - standard_price: 400.0 - uom_id: product.product_20k_uom_sugar - uom_po_id: product.product_20k_uom_sugar -- - I test onchanged on UOM, Create Duplicate Product and Delete original Product. -- - !python {model: product.product}: | - self.onchange_uom(cr ,uid, [ref("product_sugar_id1")], ref("product.product_20k_uom_sugar"), ref("product.product_10k_uom_sugar")) - self.copy(cr, uid, ref("product_sugar_id1")) - self.unlink(cr, uid, [ref("product_sugar_id1")]) diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py index 1577dddad73..2f4070db381 100644 --- a/addons/product_visible_discount/product_visible_discount.py +++ b/addons/product_visible_discount/product_visible_discount.py @@ -103,8 +103,8 @@ sale_order_line() class account_invoice_line(osv.osv): _inherit = "account.invoice.line" - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None): - res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context) + def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None): + res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context, company_id=company_id) def get_real_price(res_dict, product_id, qty, uom, pricelist): item_obj = self.pool.get('product.pricelist.item') diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index 1b25c9d15cc..bcf7aae2604 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -26,6 +26,7 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Project Management", + "sequence": 8, 'complexity': "easy", "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"], "depends": ["base_setup", "product", "analytic", "board", "mail", "resource"], diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po index f0d2ca69431..5583c79018d 100644 --- a/addons/project/i18n/de.po +++ b/addons/project/i18n/de.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:54+0000\n" -"PO-Revision-Date: 2011-04-03 09:13+0000\n" +"PO-Revision-Date: 2012-01-14 14:00+0000\n" "Last-Translator: Ferdinand @ Camptocamp \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-12-24 05:38+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-15 05:19+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project #: view:report.project.task.user:0 msgid "New tasks" -msgstr "" +msgstr "Neue Aufgaben" #. module: project #: help:project.task.delegate,new_task_description:0 @@ -53,12 +53,12 @@ msgstr "Die ausgew. Firma ist nicht zugelassen für diesen Benutzer" #. module: project #: view:report.project.task.user:0 msgid "Previous Month" -msgstr "" +msgstr "Vorheriger Monat" #. module: project #: view:report.project.task.user:0 msgid "My tasks" -msgstr "" +msgstr "Meine Aufgaben" #. module: project #: field:project.project,warn_customer:0 @@ -96,7 +96,7 @@ msgstr "PRÃœFE: " #: code:addons/project/project.py:315 #, python-format msgid "You must assign members on the project '%s' !" -msgstr "" +msgstr "Sie müssen dem Projekt '%s' Mitarbeiter zuordnen" #. module: project #: field:project.task,work_ids:0 @@ -109,7 +109,7 @@ msgstr "Arbeit erledigt" #: code:addons/project/project.py:1113 #, python-format msgid "Warning !" -msgstr "" +msgstr "Warnung!" #. module: project #: model:ir.model,name:project.model_project_task_delegate @@ -124,7 +124,7 @@ msgstr "zu validierende Stunden" #. module: project #: view:project.project:0 msgid "Pending Projects" -msgstr "" +msgstr "Projekte in Wartestellung" #. module: project #: help:project.task,remaining_hours:0 @@ -206,7 +206,7 @@ msgstr "Unternehmen" #. module: project #: view:report.project.task.user:0 msgid "Pending tasks" -msgstr "" +msgstr "Aufgaben in Wartestellung" #. module: project #: field:project.task.delegate,prefix:0 @@ -226,7 +226,7 @@ msgstr "Setze in Wartezustand" #. module: project #: selection:project.task,priority:0 msgid "Important" -msgstr "" +msgstr "Wichtig" #. module: project #: model:process.node,note:project.process_node_drafttask0 @@ -274,7 +274,7 @@ msgstr "Tag" #. module: project #: model:ir.ui.menu,name:project.menu_project_config_project msgid "Projects and Stages" -msgstr "" +msgstr "Projekte und Abschnitte" #. module: project #: view:project.project:0 @@ -311,12 +311,12 @@ msgstr "Meine offenen Aufgaben" #, python-format msgid "" "Please specify the Project Manager or email address of Project Manager." -msgstr "" +msgstr "Bitte erfassen Sie den Projekt-Manager oder desses EMail" #. module: project #: view:project.task:0 msgid "For cancelling the task" -msgstr "" +msgstr "Um eine Aufgabe abzubrechen" #. module: project #: model:ir.model,name:project.model_project_task_work @@ -386,7 +386,7 @@ msgstr "" #. module: project #: view:project.task:0 msgid "Show only tasks having a deadline" -msgstr "" +msgstr "Zeige nur Aufgaben mit Frist" #. module: project #: selection:project.task,state:0 @@ -413,7 +413,7 @@ msgstr "EMail Kopf" #. module: project #: view:project.task:0 msgid "Change to Next Stage" -msgstr "" +msgstr "Wechsle zu nächstem Stadium" #. module: project #: model:process.node,name:project.process_node_donetask0 @@ -423,7 +423,7 @@ msgstr "Erledigte Aufgaben" #. module: project #: field:project.task,color:0 msgid "Color Index" -msgstr "" +msgstr "Farb Index" #. module: project #: model:ir.ui.menu,name:project.menu_definitions @@ -434,7 +434,7 @@ msgstr "Konfiguration" #. module: project #: view:report.project.task.user:0 msgid "Current Month" -msgstr "" +msgstr "Aktueller Monat" #. module: project #: model:process.transition,note:project.process_transition_delegate0 @@ -506,12 +506,12 @@ msgstr "Abbrechen" #. module: project #: view:project.task.history.cumulative:0 msgid "Ready" -msgstr "" +msgstr "Bereit" #. module: project #: view:project.task:0 msgid "Change Color" -msgstr "" +msgstr "Farbe ändern" #. module: project #: constraint:account.analytic.account:0 @@ -528,7 +528,7 @@ msgstr " (Kopie)" #. module: project #: view:project.task:0 msgid "New Tasks" -msgstr "" +msgstr "Neue Aufgaben" #. module: project #: view:report.project.task.user:0 @@ -597,12 +597,12 @@ msgstr "# Tage" #. module: project #: view:project.project:0 msgid "Open Projects" -msgstr "" +msgstr "Offene Projekte" #. module: project #: view:report.project.task.user:0 msgid "In progress tasks" -msgstr "" +msgstr "Aufgaben in Bearbeitung" #. module: project #: help:project.project,progress_rate:0 @@ -626,7 +626,7 @@ msgstr "Projektaufgabe" #: selection:project.task.history.cumulative,state:0 #: view:report.project.task.user:0 msgid "New" -msgstr "" +msgstr "Neu" #. module: project #: help:project.task,total_hours:0 @@ -659,7 +659,7 @@ msgstr "Neuberechnung" #: code:addons/project/project.py:561 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (Kopie)" #. module: project #: view:report.project.task.user:0 @@ -676,7 +676,7 @@ msgstr "Medium" #: view:project.task:0 #: view:project.task.history.cumulative:0 msgid "Pending Tasks" -msgstr "" +msgstr "unerledigt Aufgaben" #. module: project #: view:project.task:0 @@ -691,19 +691,19 @@ msgstr "Verbleibende Stunden" #. module: project #: model:ir.model,name:project.model_mail_compose_message msgid "E-mail composition wizard" -msgstr "" +msgstr "Email-Zusammensetzung Assistent" #. module: project #: view:report.project.task.user:0 msgid "Creation Date" -msgstr "" +msgstr "Datum Erstellung" #. module: project #: view:project.task:0 #: field:project.task.history,remaining_hours:0 #: field:project.task.history.cumulative,remaining_hours:0 msgid "Remaining Time" -msgstr "" +msgstr "Verbleibende Zeit" #. module: project #: field:project.project,planned_hours:0 @@ -841,6 +841,7 @@ msgid "" "You cannot delete a project containing tasks. I suggest you to desactivate " "it." msgstr "" +"Projekte mit Aufgaben können nicht gelöscht werden. Bitte ggf. deaktivieren." #. module: project #: view:project.vs.hours:0 @@ -865,7 +866,7 @@ msgstr "Verzögerung in Stunden" #. module: project #: selection:project.task,priority:0 msgid "Very important" -msgstr "" +msgstr "Sehr wichtig" #. module: project #: model:ir.actions.act_window,name:project.action_project_task_user_tree @@ -925,7 +926,7 @@ msgstr "Stufen" #. module: project #: view:project.task:0 msgid "Change to Previous Stage" -msgstr "" +msgstr "Zum Vorherigen Status wechseln" #. module: project #: model:ir.actions.todo.category,name:project.category_project_config @@ -941,7 +942,7 @@ msgstr "Projekt Zeiteinheit" #. module: project #: view:report.project.task.user:0 msgid "In progress" -msgstr "" +msgstr "In Bearbeitung" #. module: project #: model:ir.actions.act_window,name:project.action_project_task_delegate @@ -970,7 +971,7 @@ msgstr "Hauptprojekt" #. module: project #: view:project.task:0 msgid "Mark as Blocked" -msgstr "" +msgstr "Als blockiert kennzeichnen" #. module: project #: model:ir.actions.act_window,help:project.action_view_task @@ -1051,7 +1052,7 @@ msgstr "Aufgaben Stufe" #. module: project #: model:project.task.type,name:project.project_tt_specification msgid "Design" -msgstr "" +msgstr "Erscheinungsbild" #. module: project #: field:project.task,planned_hours:0 @@ -1065,7 +1066,7 @@ msgstr "Geplante Stunden" #. module: project #: model:ir.actions.act_window,name:project.action_review_task_stage msgid "Review Task Stages" -msgstr "" +msgstr "Ãœberarbeite Aufgaben Abschnitte" #. module: project #: view:project.project:0 @@ -1075,7 +1076,7 @@ msgstr "Status: %(state)s" #. module: project #: help:project.task,sequence:0 msgid "Gives the sequence order when displaying a list of tasks." -msgstr "" +msgstr "Die Reihenfolge der Liste der Aufgaben." #. module: project #: view:project.project:0 @@ -1107,7 +1108,7 @@ msgstr "Hauptaufgabe" #: view:project.task.history.cumulative:0 #: selection:project.task.history.cumulative,kanban_state:0 msgid "Blocked" -msgstr "" +msgstr "Blockiert" #. module: project #: help:project.task,progress:0 @@ -1115,11 +1116,13 @@ msgid "" "If the task has a progress of 99.99% you should close the task if it's " "finished or reevaluate the time" msgstr "" +"Wenn die Aufgabe zu 99.99% erfüllt ist sollten Sie diese abschließen oder " +"die Zeit neu zuteilen" #. module: project #: field:project.task,user_email:0 msgid "User Email" -msgstr "" +msgstr "Benutzer EMail" #. module: project #: help:project.task,kanban_state:0 @@ -1143,7 +1146,7 @@ msgstr "Abrechnung" #. module: project #: view:project.task:0 msgid "For changing to delegate state" -msgstr "" +msgstr "Für Wechsel un Delegations Status" #. module: project #: field:project.task,priority:0 @@ -1210,7 +1213,7 @@ msgstr "Rechnungsadresse" #: field:project.task.history,kanban_state:0 #: field:project.task.history.cumulative,kanban_state:0 msgid "Kanban State" -msgstr "" +msgstr "Kanban Status" #. module: project #: view:project.project:0 @@ -1231,7 +1234,7 @@ msgstr "" #. module: project #: view:project.task:0 msgid "Change Type" -msgstr "" +msgstr "Ändere Typ" #. module: project #: help:project.project,members:0 @@ -1252,7 +1255,7 @@ msgstr "Projekt Manager" #: view:project.task:0 #: view:res.partner:0 msgid "For changing to done state" -msgstr "" +msgstr "Um in Erledigt Status zu wechseln" #. module: project #: model:ir.model,name:project.model_report_project_task_user @@ -1270,7 +1273,7 @@ msgstr "August" #: selection:project.task.history,kanban_state:0 #: selection:project.task.history.cumulative,kanban_state:0 msgid "Normal" -msgstr "" +msgstr "Normal" #. module: project #: view:project.project:0 @@ -1282,7 +1285,7 @@ msgstr "Projekt Bezeichnung" #: model:ir.model,name:project.model_project_task_history #: model:ir.model,name:project.model_project_task_history_cumulative msgid "History of Tasks" -msgstr "" +msgstr "Entwicklung der Aufgaben" #. module: project #: help:project.task.delegate,state:0 @@ -1298,7 +1301,7 @@ msgstr "" #: code:addons/project/wizard/mail_compose_message.py:45 #, python-format msgid "Please specify the Customer or email address of Customer." -msgstr "" +msgstr "Bitte Kunde oder Email des Kunden definieren" #. module: project #: selection:report.project.task.user,month:0 @@ -1330,7 +1333,7 @@ msgstr "Reaktiviere" #. module: project #: model:res.groups,name:project.group_project_user msgid "User" -msgstr "" +msgstr "Benutzer" #. module: project #: field:project.project,active:0 @@ -1351,7 +1354,7 @@ msgstr "November" #. module: project #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer msgid "Create your Firsts Projects" -msgstr "" +msgstr "Erzeugen Sie Ihre ersten Projekte" #. module: project #: code:addons/project/project.py:186 @@ -1377,7 +1380,7 @@ msgstr "Oktober" #. module: project #: view:project.task:0 msgid "Validate planned time and open task" -msgstr "" +msgstr "Validiere die geplante Zeit und öffne die Aufgabe" #. module: project #: model:process.node,name:project.process_node_opentask0 @@ -1387,7 +1390,7 @@ msgstr "Offene Aufgabe" #. module: project #: view:project.task:0 msgid "Delegations History" -msgstr "" +msgstr "Delegationsverlauf" #. module: project #: model:ir.model,name:project.model_res_users @@ -1416,7 +1419,7 @@ msgstr "Unternehmen" #. module: project #: view:project.project:0 msgid "Projects in which I am a member." -msgstr "" +msgstr "Projekte, deren Mitglied ich bin" #. module: project #: view:project.project:0 @@ -1515,6 +1518,8 @@ msgstr "Erweiterter Filter..." #, python-format msgid "Please delete the project linked with this account first." msgstr "" +"Löschen Sie bitte vorher das Projekt, das mit diesem Analysekonto verlinkt " +"ist" #. module: project #: field:project.task,total_hours:0 @@ -1540,7 +1545,7 @@ msgstr "Status" #: code:addons/project/project.py:890 #, python-format msgid "Delegated User should be specified" -msgstr "" +msgstr "Der beuaftragte Benutzer muss definiert werden." #. module: project #: code:addons/project/project.py:827 @@ -1623,7 +1628,7 @@ msgstr "In Bearbeitung" #. module: project #: view:project.task.history.cumulative:0 msgid "Task's Analysis" -msgstr "" +msgstr "Aufgaben Analyse" #. module: project #: code:addons/project/project.py:754 @@ -1632,11 +1637,13 @@ msgid "" "Child task still open.\n" "Please cancel or complete child task first." msgstr "" +"Untergeordnete Aufgabe ist noch offen.\n" +"Bitte diese fertigstellen oder stornieren." #. module: project #: view:project.task.type:0 msgid "Stages common to all projects" -msgstr "" +msgstr "gemeinsame Abschnitte für alle Projekte" #. module: project #: constraint:project.task:0 @@ -1657,7 +1664,7 @@ msgstr "Arbeitszeit" #. module: project #: view:project.project:0 msgid "Projects in which I am a manager" -msgstr "" +msgstr "Projekte, die ich manage" #. module: project #: code:addons/project/project.py:924 @@ -1767,6 +1774,8 @@ msgid "" "If you check this field, this stage will be proposed by default on each new " "project. It will not assign this stage to existing projects." msgstr "" +"Wenn markiert, dann wird dieser Abschnitt für alle neuen Projekte " +"vorgeschlagen. Alte Projekte werden nicht aktualisiert." #. module: project #: view:board.board:0 @@ -1806,7 +1815,7 @@ msgstr "Meine abrechenbaren Zeiten" #. module: project #: model:project.task.type,name:project.project_tt_merge msgid "Deployment" -msgstr "" +msgstr "Einsatz" #. module: project #: field:project.project,tasks:0 @@ -1833,7 +1842,7 @@ msgstr "" #. module: project #: field:project.task.type,project_default:0 msgid "Common to All Projects" -msgstr "" +msgstr "Allen Projekten gemeinsam" #. module: project #: model:process.transition,note:project.process_transition_opendonetask0 @@ -1869,7 +1878,7 @@ msgstr "Aufgaben nach Tagen" #. module: project #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Der Name der Firma darf nur einmal vorkommen!" #. module: project #: view:project.task:0 @@ -1890,7 +1899,7 @@ msgstr "Jahr" #. module: project #: view:project.task.history.cumulative:0 msgid "Month-2" -msgstr "" +msgstr "Monat-2" #. module: project #: help:report.project.task.user,closing_days:0 @@ -1901,7 +1910,7 @@ msgstr "Anzahl Tage f. Beendigung" #: view:project.task.history.cumulative:0 #: view:report.project.task.user:0 msgid "Month-1" -msgstr "" +msgstr "Monat-1" #. module: project #: selection:report.project.task.user,month:0 @@ -1927,7 +1936,7 @@ msgstr "Öffne Erledigte Aufgaben" #. module: project #: view:project.task.type:0 msgid "Common" -msgstr "" +msgstr "Gemeinsam" #. module: project #: view:project.task:0 @@ -1940,6 +1949,9 @@ msgid "" "The stages can be common to all project or specific to one project. Each " "task will follow the different stages in order to be closed." msgstr "" +"Die Abschnitte können allen gemeinsam sein oder nur für ein Projekt gelten. " +"Jede Aufgabe wird den Abschnitten des jeweiligen Projektes bis zum Abschluss " +"folgen." #. module: project #: help:project.project,sequence:0 @@ -1961,12 +1973,12 @@ msgstr "ID" #: model:ir.actions.act_window,name:project.action_view_task_history_burndown #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown msgid "Burndown Chart" -msgstr "" +msgstr "Burndown Chart" #. module: project #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened msgid "Assigned Tasks" -msgstr "" +msgstr "Zugeordnete Aufgaben" #. module: project #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft @@ -1976,12 +1988,12 @@ msgstr "Aufgaben mit Verzug" #. module: project #: view:report.project.task.user:0 msgid "Current Year" -msgstr "" +msgstr "Aktuelles Jahr" #. module: project #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen." #. module: project #: field:project.project,priority:0 @@ -2076,7 +2088,7 @@ msgstr "Die Aufgabe '%s' wurde abgebrochen." #: view:project.task:0 #: view:res.partner:0 msgid "For changing to open state" -msgstr "" +msgstr "Für Wechsel in Offen Status" #. module: project #: field:project.task.work,name:0 @@ -2111,7 +2123,7 @@ msgstr "EMail Fußtext" #: view:project.task:0 #: view:project.task.history.cumulative:0 msgid "In Progress Tasks" -msgstr "" +msgstr "Aufgaben in Bearbeitung" #~ msgid "Reinclude the description of the task in the task of the user." #~ msgstr "" diff --git a/addons/project/project.py b/addons/project/project.py index 5dcfef1a47e..aabea22da8e 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -522,13 +522,6 @@ class task(osv.osv): return {'value':{'partner_id':partner_id.id}} return {} - def _default_project(self, cr, uid, context=None): - if context is None: - context = {} - if 'project_id' in context and context['project_id']: - return int(context['project_id']) - return False - def duplicate_task(self, cr, uid, map_ids, context=None): for new in map_ids.values(): task = self.browse(cr, uid, new, context) @@ -642,7 +635,6 @@ class task(osv.osv): 'progress': 0, 'sequence': 10, 'active': True, - 'project_id': _default_project, 'user_id': lambda obj, cr, uid, context: uid, 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c) } diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index dab7e235671..28d451b9ee0 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -72,6 +72,7 @@ + 2 @@ -82,6 +83,7 @@ + 2 @@ -91,6 +93,7 @@ + 2 @@ -101,6 +104,7 @@ + 2 @@ -113,6 +117,7 @@ + 2 @@ -125,6 +130,7 @@ + 2 @@ -134,6 +140,7 @@ + 2 @@ -143,6 +150,7 @@ + 2 @@ -153,6 +161,7 @@ + 2 @@ -162,6 +171,7 @@ + 2 @@ -172,6 +182,7 @@ + 2 @@ -183,6 +194,7 @@ + 2 @@ -194,6 +206,7 @@ + 2 @@ -205,6 +218,7 @@ + 2 @@ -215,6 +229,7 @@ + 2 @@ -226,6 +241,7 @@ + 2 @@ -237,6 +253,7 @@ + 2 @@ -247,6 +264,7 @@ + 2 diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8f666067d50..c1b8fedbfb4 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -651,7 +651,7 @@ - + diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index e919f09cee1..3dc9cdbab46 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -17,3 +17,4 @@ access_account_analytic_line_project,account.analytic.line project,analytic.mode access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0 +access_mail_message_project_user,project.mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0 diff --git a/addons/project_caldav/i18n/de.po b/addons/project_caldav/i18n/de.po index eb2a7d349b1..d9135f0b8d6 100644 --- a/addons/project_caldav/i18n/de.po +++ b/addons/project_caldav/i18n/de.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-18 00:38+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-14 14:01+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:26+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-15 05:20+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_caldav #: help:project.task,exdate:0 @@ -76,7 +75,7 @@ msgstr "Öffentlich" #. module: project_caldav #: view:project.task:0 msgid " " -msgstr "" +msgstr " " #. module: project_caldav #: selection:project.task,month_list:0 @@ -167,7 +166,7 @@ msgstr "Son" #. module: project_caldav #: field:project.task,end_type:0 msgid "Recurrence termination" -msgstr "" +msgstr "Ende der Wiederholungen" #. module: project_caldav #: selection:project.task,select1:0 @@ -182,7 +181,7 @@ msgstr "Lagerort" #. module: project_caldav #: selection:project.task,class:0 msgid "Public for Employees" -msgstr "" +msgstr "Öffentlich für Mitarbeiter" #. module: project_caldav #: view:project.task:0 @@ -298,7 +297,7 @@ msgstr "Regel wiederk. Ereignis" #. module: project_caldav #: view:project.task:0 msgid "End of recurrency" -msgstr "" +msgstr "Ende der Wiederholungen" #. module: project_caldav #: view:project.task:0 @@ -328,7 +327,7 @@ msgstr "Juni" #. module: project_caldav #: selection:project.task,end_type:0 msgid "Number of repetitions" -msgstr "" +msgstr "Anzahl der Wiederholungen" #. module: project_caldav #: field:project.task,write_date:0 @@ -358,7 +357,7 @@ msgstr "Mittwoch" #. module: project_caldav #: view:project.task:0 msgid "Choose day in the month where repeat the meeting" -msgstr "" +msgstr "Wähle Tag des Monats für wiederkehrenden Termin" #. module: project_caldav #: selection:project.task,end_type:0 @@ -447,7 +446,7 @@ msgstr "Zuweisen Aufgabe" #. module: project_caldav #: view:project.task:0 msgid "Choose day where repeat the meeting" -msgstr "" +msgstr "Wähle Tag für Terminwiederholung" #. module: project_caldav #: selection:project.task,month_list:0 @@ -473,7 +472,7 @@ msgstr "April" #. module: project_caldav #: view:project.task:0 msgid "Recurrency period" -msgstr "" +msgstr "Wiederholungsintervall" #. module: project_caldav #: field:project.task,week_list:0 diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py index 7dae4706b70..2f4c19387d3 100644 --- a/addons/project_gtd/__openerp__.py +++ b/addons/project_gtd/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Todo Lists', 'version': '1.0', 'category': 'Project Management', + "sequence": 20, 'complexity': "easy", 'description': """ This module implements all concepts defined by the Getting Things Done methodology. diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po index 953bbbb8573..92f5a4b59ae 100644 --- a/addons/project_gtd/i18n/de.po +++ b/addons/project_gtd/i18n/de.po @@ -7,25 +7,24 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-01-13 04:51+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 20:13+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \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-12-23 06:59+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_gtd #: view:project.task:0 msgid "In Progress" -msgstr "" +msgstr "In Bearbeitung" #. module: project_gtd #: view:project.task:0 msgid "Show only tasks having a deadline" -msgstr "" +msgstr "Zeige nur Aufgaben mit Frist" #. module: project_gtd #: view:project.task:0 @@ -55,7 +54,7 @@ msgstr "Bereinigung des Zeitfensters war erfolgreich" #. module: project_gtd #: view:project.task:0 msgid "Pending Tasks" -msgstr "" +msgstr "unerledigt Aufgaben" #. module: project_gtd #: code:addons/project_gtd/wizard/project_gtd_empty.py:52 @@ -92,7 +91,7 @@ msgstr "Leeres Zeitfenster" #. module: project_gtd #: view:project.task:0 msgid "Pending" -msgstr "" +msgstr "Unerledigt" #. module: project_gtd #: view:project.gtd.timebox:0 @@ -118,7 +117,7 @@ msgstr "Fehler!" #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_timebox_tree #: view:project.task:0 msgid "My Tasks" -msgstr "" +msgstr "Meine Aufgaben" #. module: project_gtd #: constraint:project.task:0 @@ -144,7 +143,7 @@ msgstr "Leeres Zeitfenster" #. module: project_gtd #: view:project.task:0 msgid "Tasks having no timebox assigned yet" -msgstr "" +msgstr "Aufgaben ohne Zeitrahmen" #. module: project_gtd #: constraint:project.task:0 @@ -185,7 +184,7 @@ msgstr "Kontext" #. module: project_gtd #: view:project.task:0 msgid "Show Context" -msgstr "" +msgstr "Zeige Kontext" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill @@ -208,7 +207,7 @@ msgstr "Zeitfenster" #. module: project_gtd #: view:project.task:0 msgid "In Progress and draft tasks" -msgstr "" +msgstr "Aufgaben in Entwurf und Bearbeitung" #. module: project_gtd #: model:ir.model,name:project_gtd.model_project_gtd_context @@ -242,7 +241,7 @@ msgstr "Sequenz" #. module: project_gtd #: view:project.task:0 msgid "Show the context field" -msgstr "" +msgstr "Zeige Kontext Feld" #. module: project_gtd #: help:project.gtd.context,sequence:0 @@ -253,7 +252,7 @@ msgstr "" #. module: project_gtd #: view:project.task:0 msgid "Show Deadlines" -msgstr "" +msgstr "Zeige Fristen" #. module: project_gtd #: view:project.gtd.timebox:0 @@ -295,7 +294,7 @@ msgstr "" #. module: project_gtd #: view:project.task:0 msgid "For reopening the tasks" -msgstr "" +msgstr "Um Aufgaben wieder zu öffnen" #. module: project_gtd #: view:project.task:0 diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po index cb6407b9db1..89f67bebe08 100644 --- a/addons/project_gtd/i18n/pt_BR.po +++ b/addons/project_gtd/i18n/pt_BR.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2010-11-25 19:22+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-16 14:06+0000\n" +"Last-Translator: Rafael Sales \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-12-23 07:00+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-17 04:45+0000\n" +"X-Generator: Launchpad (build 14676)\n" #. module: project_gtd #: view:project.task:0 msgid "In Progress" -msgstr "" +msgstr "Em Progresso" #. module: project_gtd #: view:project.task:0 @@ -29,7 +29,7 @@ msgstr "" #. module: project_gtd #: view:project.task:0 msgid "Reactivate" -msgstr "" +msgstr "Reativar" #. module: project_gtd #: help:project.task,timebox_id:0 @@ -88,7 +88,7 @@ msgstr "" #. module: project_gtd #: view:project.task:0 msgid "Pending" -msgstr "" +msgstr "Pendente" #. module: project_gtd #: view:project.gtd.timebox:0 @@ -114,7 +114,7 @@ msgstr "Erro!" #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_timebox_tree #: view:project.task:0 msgid "My Tasks" -msgstr "" +msgstr "Minhas Tarefas" #. module: project_gtd #: constraint:project.task:0 @@ -145,7 +145,7 @@ msgstr "" #. module: project_gtd #: constraint:project.task:0 msgid "Error ! Task end-date must be greater then task start-date" -msgstr "" +msgstr "Erro ! A data final deve ser maior do que a data inicial" #. module: project_gtd #: field:project.gtd.timebox,icon:0 @@ -160,7 +160,7 @@ msgstr "" #. module: project_gtd #: model:ir.model,name:project_gtd.model_project_task msgid "Task" -msgstr "" +msgstr "Tarefa" #. module: project_gtd #: view:project.timebox.fill.plan:0 @@ -170,7 +170,7 @@ msgstr "Adicionar ao período" #. module: project_gtd #: field:project.timebox.empty,name:0 msgid "Name" -msgstr "" +msgstr "Nome" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py index 012f9b5e799..3fe54fc2a2f 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Issues Tracker', 'version': '1.0', 'category': 'Project Management', + "sequence": 22, 'complexity': "easy", 'description': """ This module provides Issues/Bugs Management in Project. diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po index c94bce466a4..3dd9ad84151 100644 --- a/addons/project_issue/i18n/de.po +++ b/addons/project_issue/i18n/de.po @@ -7,20 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-01-18 12:07+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 23:16+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:21+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-15 05:20+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_issue #: view:project.issue.report:0 msgid "Previous Month" -msgstr "" +msgstr "Vorheriger Monat" #. module: project_issue #: field:project.issue.report,delay_open:0 @@ -84,7 +83,7 @@ msgstr "Empf. EMailkopie" #. module: project_issue #: view:project.issue:0 msgid "Today's features" -msgstr "" +msgstr "Heutige Merkmale" #. module: project_issue #: model:ir.model,name:project_issue.model_project_issue_version @@ -103,7 +102,7 @@ msgid "" "You cannot escalate this issue.\n" "The relevant Project has not configured the Escalation Project!" msgstr "" -"Sie können das Problem nicht eskalieren.\n" +"Sie können den Fall nicht eskalieren.\n" "Für das entsprechende Projekt wurde kein Projekt definiert, in das eskaliert " "werden kann !" @@ -121,7 +120,7 @@ msgstr "Hoch" #. module: project_issue #: help:project.issue,inactivity_days:0 msgid "Difference in days between last action and current date" -msgstr "" +msgstr "Differenz in Tagen zwischen letzter Aktion und heute" #. module: project_issue #: view:project.issue.report:0 @@ -132,7 +131,7 @@ msgstr "Tag" #. module: project_issue #: field:project.issue,days_since_creation:0 msgid "Days since creation date" -msgstr "" +msgstr "Tage seit Erzeugung" #. module: project_issue #: view:project.issue:0 @@ -149,7 +148,7 @@ msgstr "Aufgabe" #. module: project_issue #: view:board.board:0 msgid "Issues By Stage" -msgstr "Probleme nach Stufe" +msgstr "Fälle nach Stufe" #. module: project_issue #: field:project.issue,message_ids:0 @@ -159,7 +158,7 @@ msgstr "Nachrichten" #. module: project_issue #: field:project.issue,inactivity_days:0 msgid "Days since last action" -msgstr "" +msgstr "Tage seit letzter Aktion" #. module: project_issue #: model:ir.model,name:project_issue.model_project_project @@ -173,7 +172,7 @@ msgstr "Projekt" #. module: project_issue #: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree msgid "My Open Project issues" -msgstr "Meine offenen Probleme" +msgstr "Meine offenen Fälle" #. module: project_issue #: selection:project.issue,state:0 @@ -184,7 +183,7 @@ msgstr "Abgebrochen" #. module: project_issue #: view:project.issue:0 msgid "Change to Next Stage" -msgstr "" +msgstr "Wechsle zu nächstem Stadium" #. module: project_issue #: field:project.issue.report,date_closed:0 @@ -194,17 +193,17 @@ msgstr "Datum Erledigt" #. module: project_issue #: view:project.issue:0 msgid "Issue Tracker Search" -msgstr "Problem Suche" +msgstr "Fall Suche" #. module: project_issue #: field:project.issue,color:0 msgid "Color Index" -msgstr "" +msgstr "Farb Index" #. module: project_issue #: view:project.issue:0 msgid "Issue / Partner" -msgstr "" +msgstr "Fall / Partner" #. module: project_issue #: field:project.issue.report,working_hours_open:0 @@ -247,7 +246,7 @@ msgstr "" #. module: project_issue #: view:project.issue:0 msgid "Change Color" -msgstr "" +msgstr "Farbe ändern" #. module: project_issue #: code:addons/project_issue/project_issue.py:482 @@ -286,7 +285,7 @@ msgstr "Wartung" #: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree #: view:project.issue.report:0 msgid "Issues Analysis" -msgstr "Statistik Probleme" +msgstr "Statistik Fälle" #. module: project_issue #: view:project.issue:0 @@ -319,12 +318,12 @@ msgstr "Version" #: selection:project.issue,state:0 #: view:project.issue.report:0 msgid "New" -msgstr "" +msgstr "Neu" #. module: project_issue #: model:ir.actions.act_window,name:project_issue.project_issue_categ_action msgid "Issue Categories" -msgstr "Probleme Kategorien" +msgstr "Fälle Kategorien" #. module: project_issue #: field:project.issue,email_from:0 @@ -346,7 +345,7 @@ msgstr "Niedrig" #. module: project_issue #: view:project.issue:0 msgid "Unassigned Issues" -msgstr "" +msgstr "Nicht zugeteilte Fälle" #. module: project_issue #: field:project.issue,create_date:0 @@ -364,7 +363,7 @@ msgstr "Versionen" #. module: project_issue #: view:project.issue:0 msgid "To Do Issues" -msgstr "" +msgstr "zu erledigende Fälle" #. module: project_issue #: view:project.issue:0 @@ -380,7 +379,7 @@ msgstr "Heute" #: model:ir.actions.act_window,name:project_issue.open_board_project_issue #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue msgid "Project Issue Dashboard" -msgstr "Pinnwand Probleme" +msgstr "Pinnwand Fälle" #. module: project_issue #: view:project.issue:0 @@ -415,7 +414,7 @@ msgstr "Information Historie" #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree msgid "Project issues" -msgstr "Projekt Probleme" +msgstr "Projekt Fälle" #. module: project_issue #: view:project.issue:0 @@ -425,12 +424,12 @@ msgstr "Kommunikation & Historie" #. module: project_issue #: view:project.issue.report:0 msgid "My Open Project Issue" -msgstr "Meine offenen Projektprobleme" +msgstr "Meine offenen Projektfälle" #. module: project_issue #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree msgid "My Project Issues" -msgstr "Meine Projektprobleme" +msgstr "Meine Projektfälle" #. module: project_issue #: view:project.issue:0 @@ -448,12 +447,12 @@ msgstr "Partner" #. module: project_issue #: view:board.board:0 msgid "My Issues" -msgstr "Meine Probleme" +msgstr "Meine Fälle" #. module: project_issue #: view:project.issue:0 msgid "Change to Previous Stage" -msgstr "" +msgstr "Zum Vorherigen Status wechseln" #. module: project_issue #: model:ir.actions.act_window,help:project_issue.project_issue_version_action @@ -462,11 +461,10 @@ msgid "" "development project, to handle claims in after-sales services, etc. Define " "here the different versions of your products on which you can work on issues." msgstr "" -"Sie können die Problemverfolgung auch in Projekten gut einsetzen, um " -"Probleme bei der Entwicklung oder Kundenanfragen sowie Beschwerden nach dem " -"Verkauf zu bearbeiten. Definieren Sie hier auch unterschiedliche " -"Versionsstände Ihres Produkts, um die Ursache für das Problem nach Versionen " -"darzustellen." +"Sie können die Fälleverfolgung auch in Projekten gut einsetzen, um Fälle bei " +"der Entwicklung oder Kundenanfragen sowie Beschwerden nach dem Verkauf zu " +"bearbeiten. Definieren Sie hier auch unterschiedliche Versionsstände Ihres " +"Produkts, um die Ursache für das Problem nach Versionen darzustellen." #. module: project_issue #: code:addons/project_issue/project_issue.py:330 @@ -477,7 +475,7 @@ msgstr "Aufgaben" #. module: project_issue #: field:project.issue.report,nbr:0 msgid "# of Issues" -msgstr "# Probleme" +msgstr "# Fälle" #. module: project_issue #: selection:project.issue.report,month:0 @@ -492,7 +490,7 @@ msgstr "Dezember" #. module: project_issue #: view:project.issue:0 msgid "Issue Tracker Tree" -msgstr "Probleme Listenansicht" +msgstr "Fälle Listenansicht" #. module: project_issue #: view:project.issue:0 @@ -526,7 +524,7 @@ msgstr "Aktualisiere Datum" #. module: project_issue #: view:project.issue:0 msgid "Open Features" -msgstr "" +msgstr "Offene Merkmale" #. module: project_issue #: view:project.issue:0 @@ -544,7 +542,7 @@ msgstr "Kategorie" #. module: project_issue #: field:project.issue,user_email:0 msgid "User Email" -msgstr "" +msgstr "Benutzer EMail" #. module: project_issue #: view:project.issue.report:0 @@ -554,12 +552,12 @@ msgstr "# Anz. Probl." #. module: project_issue #: view:project.issue:0 msgid "Reset to New" -msgstr "" +msgstr "Zurück auf Neu" #. module: project_issue #: help:project.issue,channel_id:0 msgid "Communication channel." -msgstr "" +msgstr "Kommunikationskanal" #. module: project_issue #: help:project.issue,email_cc:0 @@ -580,7 +578,7 @@ msgstr "Entwurf" #. module: project_issue #: view:project.issue:0 msgid "Contact Information" -msgstr "" +msgstr "Kontakt Information" #. module: project_issue #: field:project.issue,date_closed:0 @@ -614,12 +612,12 @@ msgstr "Status" #. module: project_issue #: view:project.issue.report:0 msgid "#Project Issues" -msgstr "# Projekt Probleme" +msgstr "# Projekt Fälle" #. module: project_issue #: view:board.board:0 msgid "Current Issues" -msgstr "Aktuelles Problem" +msgstr "Aktuelle Fälle" #. module: project_issue #: selection:project.issue.report,month:0 @@ -651,7 +649,7 @@ msgstr "Juni" #. module: project_issue #: view:project.issue:0 msgid "New Issues" -msgstr "" +msgstr "Neue Fälle" #. module: project_issue #: field:project.issue,day_close:0 @@ -682,18 +680,18 @@ msgstr "Oktober" #. module: project_issue #: view:board.board:0 msgid "Issues Dashboard" -msgstr "" +msgstr "Pinwand Fälle" #. module: project_issue #: view:project.issue:0 #: field:project.issue,type_id:0 msgid "Stages" -msgstr "" +msgstr "Stufen" #. module: project_issue #: help:project.issue,days_since_creation:0 msgid "Difference in days between creation date and current date" -msgstr "" +msgstr "Differenz in Tagen zwischen Erstellung und heute" #. module: project_issue #: selection:project.issue.report,month:0 @@ -713,7 +711,7 @@ msgstr "Diese Personen erhalten EMail Kopie" #. module: project_issue #: view:board.board:0 msgid "Issues By State" -msgstr "Probleme nach Stufe" +msgstr "Fälle nach Stufe" #. module: project_issue #: view:project.issue:0 @@ -764,7 +762,7 @@ msgstr "Allgemein" #. module: project_issue #: view:project.issue:0 msgid "Current Features" -msgstr "" +msgstr "aktuelle Merkmale" #. module: project_issue #: view:project.issue.version:0 @@ -799,12 +797,12 @@ msgstr "Offen" #: model:ir.ui.menu,name:project_issue.menu_project_issue_track #: view:project.issue:0 msgid "Issues" -msgstr "Probleme" +msgstr "Fälle" #. module: project_issue #: selection:project.issue,state:0 msgid "In Progress" -msgstr "" +msgstr "In Bearbeitung" #. module: project_issue #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage @@ -812,12 +810,12 @@ msgstr "" #: model:ir.model,name:project_issue.model_project_issue #: view:project.issue.report:0 msgid "Project Issue" -msgstr "Projekt Problem" +msgstr "Projekt Fälle" #. module: project_issue #: view:project.issue:0 msgid "Creation Month" -msgstr "" +msgstr "Monat Erstellung" #. module: project_issue #: help:project.issue,progress:0 @@ -842,7 +840,7 @@ msgstr "" #: view:board.board:0 #: view:project.issue:0 msgid "Pending Issues" -msgstr "Unerledigte Probleme" +msgstr "Unerledigte Fälle" #. module: project_issue #: field:project.issue,name:0 @@ -905,7 +903,7 @@ msgstr "Februar" #: code:addons/project_issue/project_issue.py:70 #, python-format msgid "Issue '%s' has been opened." -msgstr "Problem '%s' wurde eröffnet" +msgstr "Fall '%s' wurde eröffnet" #. module: project_issue #: view:project.issue:0 @@ -915,7 +913,7 @@ msgstr "Feature Beschreibung" #. module: project_issue #: view:project.issue:0 msgid "Edit" -msgstr "" +msgstr "Bearbeiten" #. module: project_issue #: field:project.project,project_escalation_id:0 @@ -940,7 +938,7 @@ msgstr "Monat -1" #: code:addons/project_issue/project_issue.py:85 #, python-format msgid "Issue '%s' has been closed." -msgstr "Problem '%s' wurde beendet" +msgstr "Fall '%s' wurde beendet" #. module: project_issue #: selection:project.issue.report,month:0 @@ -965,7 +963,7 @@ msgstr "ID" #. module: project_issue #: view:project.issue.report:0 msgid "Current Year" -msgstr "" +msgstr "Aktuelles Jahr" #. module: project_issue #: code:addons/project_issue/project_issue.py:415 @@ -1020,7 +1018,7 @@ msgstr "Dauer" #. module: project_issue #: view:board.board:0 msgid "My Open Issues by Creation Date" -msgstr "Meine offenen Probleme nach Erstelldatum" +msgstr "Meine offenen Fälle nach Erstelldatum" #~ msgid "Close Working hours" #~ msgstr "Arbeitszeit für Beendigung" diff --git a/addons/project_issue_sheet/i18n/de.po b/addons/project_issue_sheet/i18n/de.po index c9e4eba2f84..fa9466aa268 100644 --- a/addons/project_issue_sheet/i18n/de.po +++ b/addons/project_issue_sheet/i18n/de.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2010-11-02 07:24+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 18:40+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:20+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_issue_sheet #: model:ir.model,name:project_issue_sheet.model_account_analytic_line @@ -26,7 +25,7 @@ msgstr "Analytische Buchung" #: code:addons/project_issue_sheet/project_issue_sheet.py:57 #, python-format msgid "The Analytic Account is in pending !" -msgstr "" +msgstr "Das Analysekonto ist schwebend!" #. module: project_issue_sheet #: model:ir.model,name:project_issue_sheet.model_project_issue @@ -65,6 +64,7 @@ msgstr "Zeiterfassung" #: constraint:hr.analytic.timesheet:0 msgid "You cannot modify an entry in a Confirmed/Done timesheet !." msgstr "" +"Bestätigte und abgerechnete Zeitaufzeichungen können nicht geändert werden" #. module: project_issue_sheet #: field:hr.analytic.timesheet,issue_id:0 @@ -74,7 +74,7 @@ msgstr "Problem" #. module: project_issue_sheet #: constraint:account.analytic.line:0 msgid "You can not create analytic line on view account." -msgstr "" +msgstr "Für Sichten dürfen keine Analysezeilen erzeugt werden" #~ msgid "" #~ "\n" diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po index 51373aab108..f3f42053fd0 100644 --- a/addons/project_long_term/i18n/de.po +++ b/addons/project_long_term/i18n/de.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-12 18:37+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 22:37+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_long_term #: model:ir.actions.act_window,name:project_long_term.act_project_phases @@ -42,12 +41,12 @@ msgstr "Gruppierung..." #. module: project_long_term #: field:project.phase,user_ids:0 msgid "Assigned Users" -msgstr "" +msgstr "Zugeteilte Benutzer" #. module: project_long_term #: field:project.phase,progress:0 msgid "Progress" -msgstr "" +msgstr "Fortschritt" #. module: project_long_term #: constraint:project.project:0 @@ -57,7 +56,7 @@ msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen." #. module: project_long_term #: view:project.phase:0 msgid "In Progress Phases" -msgstr "" +msgstr "Fortschritts Phasen" #. module: project_long_term #: view:project.phase:0 @@ -88,7 +87,7 @@ msgstr "Tag" #. module: project_long_term #: model:ir.model,name:project_long_term.model_project_user_allocation msgid "Phase User Allocation" -msgstr "" +msgstr "Phase der Benuterzuteilung" #. module: project_long_term #: model:ir.model,name:project_long_term.model_project_task @@ -105,6 +104,12 @@ msgid "" "users, convert your phases into a series of tasks when you start working on " "the project." msgstr "" +"Ein Projekt kann in verschiedene Phasen geteilt werden. Für jede Phase " +"können Sie Benutzer zuteilen, verschiedene Aufgaben definieren Phasen zu " +"vorherigen oder nächsten verlinken, Datumseinschränkungen für den " +"Planungsprozess definieren. Verwenden Sie die Langzeitplanung um die " +"vorhandenen Benutzer zu planen und führen Sie die Phasen in Aufgaben über, " +"wenn Sie mit der Arbeit am Projekt beginnen." #. module: project_long_term #: selection:project.compute.phases,target_project:0 @@ -128,7 +133,7 @@ msgstr "ME (Mengeneinheit) entspr. Einheit für die Dauer" #: view:project.phase:0 #: view:project.user.allocation:0 msgid "Planning of Users" -msgstr "" +msgstr "Planung der Benutzer" #. module: project_long_term #: help:project.phase,date_end:0 @@ -174,7 +179,7 @@ msgstr "Frist" #. module: project_long_term #: selection:project.compute.phases,target_project:0 msgid "Compute All My Projects" -msgstr "" +msgstr "Berechne alle meine Projekte" #. module: project_long_term #: view:project.compute.phases:0 @@ -191,7 +196,7 @@ msgstr " (Kopie)" #. module: project_long_term #: view:project.user.allocation:0 msgid "Project User Allocation" -msgstr "" +msgstr "Projekt Benutzer Zuteilung" #. module: project_long_term #: view:project.phase:0 @@ -209,12 +214,12 @@ msgstr "Berechne" #: view:project.phase:0 #: selection:project.phase,state:0 msgid "New" -msgstr "" +msgstr "Neu" #. module: project_long_term #: help:project.phase,progress:0 msgid "Computed based on related tasks" -msgstr "" +msgstr "Berechnet aufgrund zugeordneter Aufgaben" #. module: project_long_term #: field:project.phase,product_uom:0 @@ -235,7 +240,7 @@ msgstr "Ressourcen" #. module: project_long_term #: view:project.phase:0 msgid "My Projects" -msgstr "" +msgstr "Meine Projekte" #. module: project_long_term #: help:project.user.allocation,date_start:0 @@ -250,13 +255,13 @@ msgstr "Verknüpfte Aufgaben" #. module: project_long_term #: view:project.phase:0 msgid "New Phases" -msgstr "" +msgstr "Neue Phasen" #. module: project_long_term #: code:addons/project_long_term/wizard/project_compute_phases.py:48 #, python-format msgid "Please specify a project to schedule." -msgstr "" +msgstr "Bitte wählen Si eine Projekt für die Planung" #. module: project_long_term #: help:project.phase,constraint_date_start:0 @@ -290,7 +295,7 @@ msgstr "Start Datum der Phase muss vor dem Ende Datum sein." #. module: project_long_term #: view:project.phase:0 msgid "Start Month" -msgstr "" +msgstr "Start Monat" #. module: project_long_term #: field:project.phase,date_start:0 @@ -308,6 +313,8 @@ msgstr "erzwinge Ende der Periode vor" msgid "" "The ressources on the project can be computed automatically by the scheduler" msgstr "" +"Die Ressourcen des Projektes können automatisch durch den Planungsprozess " +"berechnet werden" #. module: project_long_term #: view:project.phase:0 @@ -317,7 +324,7 @@ msgstr "Entwurf" #. module: project_long_term #: view:project.phase:0 msgid "Pending Phases" -msgstr "" +msgstr "unerledigte Phasen" #. module: project_long_term #: view:project.phase:0 @@ -393,7 +400,7 @@ msgstr "Arbeitszeit" #: model:ir.ui.menu,name:project_long_term.menu_compute_phase #: view:project.compute.phases:0 msgid "Schedule Phases" -msgstr "" +msgstr "geplante Phasen" #. module: project_long_term #: view:project.phase:0 @@ -408,7 +415,7 @@ msgstr "Gesamte Stunden" #. module: project_long_term #: view:project.user.allocation:0 msgid "Users" -msgstr "" +msgstr "Benutzer" #. module: project_long_term #: view:project.user.allocation:0 @@ -454,7 +461,7 @@ msgstr "Dauer" #. module: project_long_term #: view:project.phase:0 msgid "Project Users" -msgstr "" +msgstr "Projekt Benutzer" #. module: project_long_term #: model:ir.model,name:project_long_term.model_project_phase @@ -472,6 +479,9 @@ msgid "" "view.\n" " " msgstr "" +"Plane Phasen aller oder ausgewählter Projekte. Danach öffnet sich eine Gantt " +"Ansicht\n" +" " #. module: project_long_term #: model:ir.model,name:project_long_term.model_project_compute_phases @@ -509,7 +519,7 @@ msgstr "Gem. Standard in Tagen" #: view:project.phase:0 #: field:project.phase,user_force_ids:0 msgid "Force Assigned Users" -msgstr "" +msgstr "Erzwinge zugeteilte Benutzer" #. module: project_long_term #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po index eebf588381e..17f274e388f 100644 --- a/addons/project_mrp/i18n/de.po +++ b/addons/project_mrp/i18n/de.po @@ -7,20 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-18 11:22+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 18:38+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \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-12-23 06:53+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_mrp #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: project_mrp #: model:process.node,note:project_mrp.process_node_procuretasktask0 @@ -37,12 +36,12 @@ msgstr "Aufgabe von Beschaffungsauftrag" #. module: project_mrp #: model:ir.model,name:project_mrp.model_sale_order msgid "Sales Order" -msgstr "" +msgstr "Verkaufsauftrag" #. module: project_mrp #: field:procurement.order,sale_line_id:0 msgid "Sale order line" -msgstr "" +msgstr "Verkaufsauftragsposition" #. module: project_mrp #: model:process.transition,note:project_mrp.process_transition_createtask0 @@ -132,7 +131,7 @@ msgstr "" #. module: project_mrp #: field:project.task,sale_line_id:0 msgid "Sale Order Line" -msgstr "" +msgstr "Verkaufsauftragsposition" #~ msgid "If procure method is Make to order and supply method is produce" #~ msgstr "" diff --git a/addons/project_planning/i18n/de.po b/addons/project_planning/i18n/de.po index ac970a4cd24..a94b94431ba 100644 --- a/addons/project_planning/i18n/de.po +++ b/addons/project_planning/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-02-13 08:18+0000\n" -"Last-Translator: Steffi Frank (Bremskerl, DE) \n" +"PO-Revision-Date: 2012-01-13 18:38+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:26+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:13+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_planning #: constraint:account.analytic.account:0 @@ -548,7 +548,7 @@ msgstr "Bis Datum" #. module: project_planning #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Der Name der Firma darf nur einmal vorkommen!" #. module: project_planning #: report:report_account_analytic.planning.print:0 diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po index e4f47293699..78fc40200cf 100644 --- a/addons/project_scrum/i18n/ar.po +++ b/addons/project_scrum/i18n/ar.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-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-06-18 11:28+0000\n" -"Last-Translator: kifcaliph \n" +"PO-Revision-Date: 2012-01-13 19:26+0000\n" +"Last-Translator: kifcaliph \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-12-23 05:55+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:10+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_scrum #: view:project.scrum.backlog.assign.sprint:0 @@ -246,13 +246,13 @@ msgstr "" #. module: project_scrum #: field:project.scrum.sprint,date_stop:0 msgid "Ending Date" -msgstr "تاريخ انتهاء" +msgstr "تاريخ الانتهاء" #. module: project_scrum #: view:project.scrum.meeting:0 #: view:project.scrum.sprint:0 msgid "Links" -msgstr "" +msgstr "روابط" #. module: project_scrum #: help:project.scrum.sprint,effective_hours:0 diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po index b44c30fd993..d143a0869ac 100644 --- a/addons/project_scrum/i18n/de.po +++ b/addons/project_scrum/i18n/de.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-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-04-03 09:12+0000\n" +"PO-Revision-Date: 2012-01-13 22:10+0000\n" "Last-Translator: Ferdinand @ Camptocamp \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-12-23 05:55+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:10+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_scrum #: view:project.scrum.backlog.assign.sprint:0 @@ -46,7 +46,7 @@ msgstr "Was erledigten Sie seit dem letzten Meeting?" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Sprint Month" -msgstr "" +msgstr "Sprint Monat" #. module: project_scrum #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree @@ -128,7 +128,7 @@ msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren." #. module: project_scrum #: view:project.scrum.sprint:0 msgid "In Progress Sprints" -msgstr "" +msgstr "Sprints in Bearbeitung" #. module: project_scrum #: view:project.scrum.product.backlog:0 @@ -139,7 +139,7 @@ msgstr "" #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62 #, python-format msgid "Product Backlog '%s' is assigned to sprint %s" -msgstr "" +msgstr "Produkt Rückstand '%s' ist Sprint '%s' zugeteilt" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.dblc_proj @@ -211,12 +211,12 @@ msgstr "" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Backlogs Assigned To Current Sprints" -msgstr "" +msgstr "Aktuellen Sprints zugeordnete Rückstände" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "For cancelling the task" -msgstr "" +msgstr "Um eine Aufgabe abzubrechen" #. module: project_scrum #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog @@ -289,7 +289,7 @@ msgstr "Gesamtstunden" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Pending Sprints" -msgstr "" +msgstr "unerledigte Sprints" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_email.py:95 @@ -300,7 +300,7 @@ msgstr "Hindernisse für weitere Bearbeitung:" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Backlogs Not Assigned To Sprints." -msgstr "" +msgstr "Rückstände die keinen Sprints zugeordnet sind" #. module: project_scrum #: view:project.scrum.sprint:0 @@ -366,7 +366,7 @@ msgstr "Anzeige Sprint Aufgaben" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "New" -msgstr "" +msgstr "Neu" #. module: project_scrum #: field:project.scrum.sprint,meeting_ids:0 @@ -381,7 +381,7 @@ msgstr "Konvertiere" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Pending Backlogs" -msgstr "" +msgstr "unerledigte Rückstände" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form @@ -393,7 +393,7 @@ msgstr "Product Backlogs" #. module: project_scrum #: model:ir.model,name:project_scrum.model_mail_compose_message msgid "E-mail composition wizard" -msgstr "" +msgstr "Email-Zusammensetzung Assistent" #. module: project_scrum #: field:project.scrum.product.backlog,create_date:0 @@ -637,17 +637,17 @@ msgstr "Verschieben" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Change Type" -msgstr "" +msgstr "Ändere Typ" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "For changing to done state" -msgstr "" +msgstr "Um in Erledigt Status zu wechseln" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "New Sprints" -msgstr "" +msgstr "Neue Sprints" #. module: project_scrum #: view:project.scrum.meeting:0 @@ -809,7 +809,7 @@ msgstr "Verbleibende Stunden" #. module: project_scrum #: constraint:project.task:0 msgid "Error ! Task end-date must be greater then task start-date" -msgstr "" +msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein" #. module: project_scrum #: view:project.scrum.sprint:0 @@ -829,12 +829,12 @@ msgstr "Meine Backlogs" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "In Progress Backlogs" -msgstr "" +msgstr "Rückstände in Bearbeitung" #. module: project_scrum #: view:project.task:0 msgid "View Sprints" -msgstr "" +msgstr "Zeige Sprints" #. module: project_scrum #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form @@ -855,7 +855,7 @@ msgstr "" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Postpone backlog" -msgstr "" +msgstr "Rückstand verschieben" #. module: project_scrum #: model:process.transition,name:project_scrum.process_transition_backlogtask0 @@ -1019,7 +1019,7 @@ msgstr "Vielen Dank." #: view:project.scrum.meeting:0 #: view:project.task:0 msgid "Current Sprints" -msgstr "" +msgstr "aktuelle Sprints" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint @@ -1040,7 +1040,7 @@ msgstr "Möchten Sie wirklich das Backlog verschieben?" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "For changing to open state" -msgstr "" +msgstr "Für Wechsel in Offen Status" #. module: project_scrum #: field:project.scrum.backlog.assign.sprint,sprint_id:0 diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po index 8294a9e732f..fe5aed53880 100644 --- a/addons/project_timesheet/i18n/de.po +++ b/addons/project_timesheet/i18n/de.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-13 11:51+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 18:37+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \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-12-23 07:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task @@ -52,12 +51,12 @@ msgstr "Zeiterfassung Aufgaben" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by year of date" -msgstr "" +msgstr "Gruppiere je Jahr" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task Hours in current month" -msgstr "" +msgstr "Aufgaben Stunden im laufenden Monat" #. module: project_timesheet #: constraint:project.task:0 @@ -86,6 +85,9 @@ msgid "" "You cannot delete a partner which is assigned to project, we suggest you to " "uncheck the active box!" msgstr "" +"Der Partner ist einem Projekt zugeordnet und kann daher nicht gelöscht " +"werden.\r\n" +"Löschen Sie das Aktiv-Kennzeichen" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -111,7 +113,7 @@ msgstr "Jahr" #. module: project_timesheet #: view:project.project:0 msgid "Billable" -msgstr "" +msgstr "Abrechenbar" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue @@ -138,7 +140,7 @@ msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen." #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue msgid "Customer Projects" -msgstr "" +msgstr "Kundenprojekte" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_account_analytic_line @@ -173,7 +175,7 @@ msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren." #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours msgid "Timesheet Lines" -msgstr "" +msgstr "Zeiterfassung Positionen" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:231 @@ -184,12 +186,12 @@ msgstr "Fehlerhafte Aktion !" #. module: project_timesheet #: view:project.project:0 msgid "Billable Project" -msgstr "" +msgstr "Abrechenbare Projekte" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts msgid "Contracts to Renew" -msgstr "" +msgstr "Zu erneuernde Verträge" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in @@ -199,7 +201,7 @@ msgstr "Anmelden / Abmelden bei Projekt" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by month of date" -msgstr "" +msgstr "Gruppiere je Monat" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_project_task @@ -240,7 +242,7 @@ msgstr "Komplettiere Zeiterfassung" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task Hours in current year" -msgstr "" +msgstr "Aufgaben Stunden des laufenden Jahres" #. module: project_timesheet #: view:project.project:0 @@ -295,7 +297,7 @@ msgstr "November" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task hours of last month" -msgstr "" +msgstr "Aufgaben Stunden des Vormonats" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:59 @@ -360,7 +362,7 @@ msgstr "Rechnungsstellung" #. module: project_timesheet #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Error! Sie können keine rekursive assoziierte Mitglieder anlegen." #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -406,7 +408,7 @@ msgstr "Meine Zeiterfassung" #. module: project_timesheet #: constraint:account.analytic.line:0 msgid "You can not create analytic line on view account." -msgstr "" +msgstr "Für Sichten dürfen keine Analysezeilen erzeugt werden" #. module: project_timesheet #: view:project.project:0 diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po index 048e8d24a37..fabf4f2085e 100644 --- a/addons/project_timesheet/i18n/nl.po +++ b/addons/project_timesheet/i18n/nl.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-12-22 18:46+0000\n" -"PO-Revision-Date: 2010-10-30 13:13+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-08 13:59+0000\n" +"Last-Translator: Erwin (Endian Solutions) \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-12-23 07:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-09 04:50+0000\n" +"X-Generator: Launchpad (build 14640)\n" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task @@ -51,12 +51,12 @@ msgstr "Urenstaat taak" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by year of date" -msgstr "" +msgstr "Groepeer per jaar of datum" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task Hours in current month" -msgstr "" +msgstr "Taakuren in huidige maand" #. module: project_timesheet #: constraint:project.task:0 @@ -94,7 +94,7 @@ msgstr "Groepeer op..." #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_triggerinvoice0 msgid "Trigger invoices from sale order lines" -msgstr "" +msgstr "Trigger facturatie van verkooporder regels" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -110,7 +110,7 @@ msgstr "Jaar" #. module: project_timesheet #: view:project.project:0 msgid "Billable" -msgstr "" +msgstr "Factureerbaar" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue @@ -137,7 +137,7 @@ msgstr "Fout! Project startdatum moet liggen voor project einddatum." #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue msgid "Customer Projects" -msgstr "" +msgstr "Klant projecten" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_account_analytic_line @@ -172,7 +172,7 @@ msgstr "Fout! U kunt geen recursieve taken aanmaken." #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours msgid "Timesheet Lines" -msgstr "" +msgstr "Urenstaat regels" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:231 @@ -183,12 +183,12 @@ msgstr "Ongeldige actie !" #. module: project_timesheet #: view:project.project:0 msgid "Billable Project" -msgstr "" +msgstr "Factureerbaar project" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts msgid "Contracts to Renew" -msgstr "" +msgstr "Te vernieuwen contracten" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in @@ -239,7 +239,7 @@ msgstr "Maak uw urenstaat compleet." #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task Hours in current year" -msgstr "" +msgstr "Taakuren huidige jaar" #. module: project_timesheet #: view:project.project:0 @@ -373,12 +373,12 @@ msgstr "September" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "December" -msgstr "" +msgstr "December" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0 msgid "After task is completed, Create its invoice." -msgstr "" +msgstr "Wanneer taak voltooid is, wordt een factuur gecreeërd" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -394,12 +394,12 @@ msgstr "report.timesheet.task.user" #: view:report.timesheet.task.user:0 #: field:report.timesheet.task.user,month:0 msgid "Month" -msgstr "" +msgstr "Maand" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form msgid "My Timesheet" -msgstr "" +msgstr "Mijn urenstaat" #. module: project_timesheet #: constraint:account.analytic.line:0 @@ -425,7 +425,7 @@ msgstr "" #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user #: view:report.timesheet.task.user:0 msgid "Task Hours Per Month" -msgstr "" +msgstr "Taak uren per maand" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0 @@ -472,3 +472,6 @@ msgstr "Urenstaat invullen" #~ "die regels\n" #~ "\n" #~ " " + +#~ msgid " Month " +#~ msgstr " Maand " diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 373c7b51fc2..2504eb811b1 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Purchase Management', 'version': '1.1', 'category': 'Purchase Management', + "sequence": 19, 'complexity': "easy", 'description': """ Purchase module is for generating a purchase order for purchase of goods from a supplier. diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po index d5821148637..4f4759d3811 100644 --- a/addons/purchase/i18n/de.po +++ b/addons/purchase/i18n/de.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-11-07 12:44+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-15 09:15+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \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-12-23 05:53+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-16 05:18+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -49,6 +48,7 @@ msgstr "Zielort" #, python-format msgid "In order to delete a purchase order, it must be cancelled first!" msgstr "" +"Um einen Einkaufsauftrag zu löschen muss dieser vorher storniert werden." #. module: purchase #: code:addons/purchase/purchase.py:772 @@ -105,7 +105,7 @@ msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Approved purchase order" -msgstr "" +msgstr "Genehmigter Einkaufsauftrag" #. module: purchase #: view:purchase.order:0 @@ -125,7 +125,7 @@ msgstr "Preislisten" #. module: purchase #: view:stock.picking:0 msgid "To Invoice" -msgstr "" +msgstr "Abzurechnen" #. module: purchase #: view:purchase.order.line_invoice:0 @@ -171,7 +171,7 @@ msgstr "Keine Preisliste!" #. module: purchase #: model:ir.model,name:purchase.model_purchase_config_wizard msgid "purchase.config.wizard" -msgstr "" +msgstr "purchase.config.wizard" #. module: purchase #: view:board.board:0 @@ -182,7 +182,7 @@ msgstr "Angebotsanfragen" #. module: purchase #: selection:purchase.config.wizard,default_method:0 msgid "Based on Receptions" -msgstr "" +msgstr "Basierend auf Wareneingängen" #. module: purchase #: field:purchase.order,company_id:0 @@ -259,7 +259,7 @@ msgstr "Einkauf Eigenschaften" #. module: purchase #: model:ir.model,name:purchase.model_stock_partial_picking msgid "Partial Picking Processing Wizard" -msgstr "" +msgstr "Assistent für Teillieferungen" #. module: purchase #: view:purchase.order.line:0 @@ -280,17 +280,17 @@ msgstr "Tag" #. module: purchase #: selection:purchase.order,invoice_method:0 msgid "Based on generated draft invoice" -msgstr "" +msgstr "Basierend auf Entwurfsrechnung" #. module: purchase #: view:purchase.report:0 msgid "Order of Day" -msgstr "" +msgstr "Heutige Aufträge" #. module: purchase #: view:board.board:0 msgid "Monthly Purchases by Category" -msgstr "" +msgstr "Monatliche Einkäufe je Kategorie" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree @@ -300,7 +300,7 @@ msgstr "Beschaffungsaufträge" #. module: purchase #: view:purchase.order:0 msgid "Purchase order which are in draft state" -msgstr "" +msgstr "Einkaufsaufträge im Entwurf" #. module: purchase #: view:purchase.order:0 @@ -433,6 +433,7 @@ msgstr "Lieferung" #, python-format msgid "You must first cancel all invoices related to this purchase order." msgstr "" +"Sie müssen vorab alle Rechnungen zu diesem Einkaufsauftrag stornieren." #. module: purchase #: field:purchase.report,dest_address_id:0 @@ -478,13 +479,13 @@ msgstr "Geprüft durch" #. module: purchase #: view:purchase.report:0 msgid "Order in last month" -msgstr "" +msgstr "Aufträge letztes Monat" #. module: purchase #: code:addons/purchase/purchase.py:411 #, python-format msgid "You must first cancel all receptions related to this purchase order." -msgstr "" +msgstr "Sie müssen vorab alle Warenineingänge dieses Auftrags stornieren." #. module: purchase #: selection:purchase.order.line,state:0 @@ -509,7 +510,7 @@ msgstr "Es wird angezeigt, dass ein Lieferauftrag ansteht" #. module: purchase #: view:purchase.order:0 msgid "Purchase orders which are in exception state" -msgstr "" +msgstr "Einkaufsaufträge im Ausnahmezustand" #. module: purchase #: report:purchase.order:0 @@ -538,7 +539,7 @@ msgstr "Durchschnittspreis" #. module: purchase #: view:stock.picking:0 msgid "Incoming Shipments already processed" -msgstr "" +msgstr "Bereits verarbeitete Wareineingänge" #. module: purchase #: report:purchase.order:0 @@ -556,7 +557,7 @@ msgstr "Gebucht" #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice #: selection:purchase.order,invoice_method:0 msgid "Based on receptions" -msgstr "" +msgstr "Basierend auf Wareneingängen" #. module: purchase #: constraint:res.company:0 @@ -588,11 +589,16 @@ msgid "" "supplier invoice, you can generate a draft supplier invoice based on the " "lines from this menu." msgstr "" +"Wenn Sie die Steuerung der Eingangsrechnung auf \"Basierend auf " +"Einkaufsauftragsposition\" setzen, können Sie alle Positionen verfolgen, für " +"die Sie noch keine Rechnung erhalten haben. Beim Erhalt der Rechnung können " +"Sie eine Rechnung im Entwurfsstadium aufgrund dieser Position mit dem Menu " +"hier erzeugen." #. module: purchase #: view:purchase.order:0 msgid "Purchase order which are in the exception state" -msgstr "" +msgstr "Einkaufsaufträge im Ausnahmenzustand" #. module: purchase #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po @@ -650,12 +656,12 @@ msgstr "Gesamtpreis" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer msgid "Create or Import Suppliers" -msgstr "" +msgstr "Erzeuge oder Importiere Lieferanten" #. module: purchase #: view:stock.picking:0 msgid "Available" -msgstr "" +msgstr "Verfügbar" #. module: purchase #: field:purchase.report,partner_address_id:0 @@ -685,6 +691,7 @@ msgstr "Fehler !" #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." msgstr "" +"Sie dürfen keine Sicht als Quelle oder Ziel einer Lagerbewegung angeben" #. module: purchase #: code:addons/purchase/purchase.py:710 @@ -735,7 +742,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_configuration_misc msgid "Miscellaneous" -msgstr "" +msgstr "Sonstiges" #. module: purchase #: code:addons/purchase/purchase.py:788 @@ -808,7 +815,7 @@ msgstr "Wareneingang" #: code:addons/purchase/purchase.py:284 #, python-format msgid "You cannot confirm a purchase order without any lines." -msgstr "" +msgstr "Sie können keinen Einkaufsauftrag ohne Zeilen bestätigen." #. module: purchase #: model:ir.actions.act_window,help:purchase.action_invoice_pending @@ -834,7 +841,7 @@ msgstr "Angebotsanfrage" #: code:addons/purchase/edi/purchase_order.py:139 #, python-format msgid "EDI Pricelist (%s)" -msgstr "" +msgstr "EDI Preisliste(%s)" #. module: purchase #: selection:purchase.order,state:0 @@ -849,7 +856,7 @@ msgstr "Januar" #. module: purchase #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase msgid "Auto-email confirmed purchase orders" -msgstr "" +msgstr "Automatischer Versand bestätigter Einkaufsaufträge" #. module: purchase #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0 @@ -893,7 +900,7 @@ msgstr "Anz." #. module: purchase #: view:purchase.report:0 msgid "Month-1" -msgstr "" +msgstr "Monat-1" #. module: purchase #: help:purchase.order,minimum_planned_date:0 @@ -912,7 +919,7 @@ msgstr "Zusammenfassung Beschaffungsaufträge" #. module: purchase #: view:purchase.report:0 msgid "Order in current month" -msgstr "" +msgstr "Aufträge aktuelles Monat" #. module: purchase #: view:purchase.report:0 @@ -955,7 +962,7 @@ msgstr "Gesamte Auftragspositionen nach Benutzern pro Monat" #. module: purchase #: view:purchase.order:0 msgid "Approved purchase orders" -msgstr "" +msgstr "Bestätigte einkaufsaufträge" #. module: purchase #: view:purchase.report:0 @@ -966,7 +973,7 @@ msgstr "Monat" #. module: purchase #: model:email.template,subject:purchase.email_template_edi_purchase msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" -msgstr "" +msgstr "${object.company_id.name} Auftrag (Ref ${object.name or 'n/a' })" #. module: purchase #: report:purchase.quotation:0 @@ -986,7 +993,7 @@ msgstr "Nettobetrag" #. module: purchase #: model:res.groups,name:purchase.group_purchase_user msgid "User" -msgstr "" +msgstr "Benutzer" #. module: purchase #: field:purchase.order,shipped:0 @@ -1008,7 +1015,7 @@ msgstr "Dieser Lieferauftrag wurde abgearbeitet für diese Rechnung" #. module: purchase #: view:stock.picking:0 msgid "Is a Back Order" -msgstr "" +msgstr "Ist Auftragsrückstand" #. module: purchase #: model:process.node,note:purchase.process_node_invoiceafterpacking0 @@ -1057,7 +1064,7 @@ msgstr "Status Auftrag" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase msgid "Product Categories" -msgstr "" +msgstr "Produkt Kategorien" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice @@ -1067,7 +1074,7 @@ msgstr "Erzeuge Rechnungen" #. module: purchase #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Der Name der Firma darf nur einmal vorkommen!" #. module: purchase #: model:ir.model,name:purchase.model_purchase_order_line @@ -1084,7 +1091,7 @@ msgstr "Kalenderansicht" #. module: purchase #: selection:purchase.config.wizard,default_method:0 msgid "Based on Purchase Order Lines" -msgstr "" +msgstr "Basierend auf Auftragspositionen" #. module: purchase #: help:purchase.order,amount_untaxed:0 @@ -1095,7 +1102,7 @@ msgstr "Nettobetrag" #: code:addons/purchase/purchase.py:885 #, python-format msgid "PO: %s" -msgstr "" +msgstr "EA: %s" #. module: purchase #: model:process.transition,note:purchase.process_transition_purchaseinvoice0 @@ -1166,7 +1173,7 @@ msgstr "" #: model:ir.actions.act_window,name:purchase.action_email_templates #: model:ir.ui.menu,name:purchase.menu_email_templates msgid "Email Templates" -msgstr "" +msgstr "E-Mail Vorlagen" #. module: purchase #: selection:purchase.config.wizard,default_method:0 @@ -1202,7 +1209,7 @@ msgstr "Erweiterter Filter..." #. module: purchase #: view:purchase.config.wizard:0 msgid "Invoicing Control on Purchases" -msgstr "" +msgstr "Rechnungssteuerung für Einkäufe" #. module: purchase #: code:addons/purchase/wizard/purchase_order_group.py:48 @@ -1217,6 +1224,8 @@ msgid "" "can import your existing partners by CSV spreadsheet from \"Import Data\" " "wizard" msgstr "" +"Erzeuge oder importiere Lieferanten und deren Kontakte manuell in diesem " +"Formular oder von einer CSV Datei mit dem \"Import Daten\" Assistenten" #. module: purchase #: model:process.transition,name:purchase.process_transition_createpackinglist0 @@ -1241,12 +1250,12 @@ msgstr "Berechne" #. module: purchase #: view:stock.picking:0 msgid "Incoming Shipments Available" -msgstr "" +msgstr "Verfügbare Wareneingänge" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat msgid "Address Book" -msgstr "" +msgstr "Partnerverzeichnis" #. module: purchase #: model:ir.model,name:purchase.model_res_company @@ -1263,7 +1272,7 @@ msgstr "Storniere Beschaffungsauftrag" #: code:addons/purchase/purchase.py:417 #, python-format msgid "Unable to cancel this purchase order!" -msgstr "" +msgstr "Kann diesen Einkaufsauftrag nicht stornieren" #. module: purchase #: model:process.transition,note:purchase.process_transition_createpackinglist0 @@ -1290,7 +1299,7 @@ msgstr "Pinnwand" #. module: purchase #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Die Referenz muss je Firma eindeutig sein" #. module: purchase #: view:purchase.report:0 @@ -1301,7 +1310,7 @@ msgstr "Produktpreis" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form msgid "Partner Categories" -msgstr "" +msgstr "Partner Kategorien" #. module: purchase #: help:purchase.order,amount_tax:0 @@ -1322,6 +1331,12 @@ msgid "" "Based on generated invoice: create a draft invoice you can validate later.\n" "Based on receptions: let you create an invoice when receptions are validated." msgstr "" +"Basierend auf Auftragspositionen: wähle einzelne Zeilen aufgrund derer eine " +"Rechnung erstellt werden soll\n" +"Basierend auf generierter Rechnung: erzeugt eine Rechnung im Entwurf Status, " +"die später validiert werden kann.\n" +"Basierend auf Wareneingängen: Die Rechnung wird aufgrund des Wareneinganges " +"erzeugt." #. module: purchase #: model:ir.actions.act_window,name:purchase.action_supplier_address_form @@ -1353,7 +1368,7 @@ msgstr "Referenz zu Dokument der Anfrage für diesen Beschaffungsauftrag" #. module: purchase #: view:purchase.order:0 msgid "Purchase orders which are not approved yet." -msgstr "" +msgstr "Nicht bestätigte Einkaufsaufträge" #. module: purchase #: help:purchase.order,state:0 @@ -1423,7 +1438,7 @@ msgstr "Allgemeine Information" #. module: purchase #: view:purchase.order:0 msgid "Not invoiced" -msgstr "" +msgstr "Nicht fakturiert" #. module: purchase #: report:purchase.order:0 @@ -1489,7 +1504,7 @@ msgstr "Beschaffungsaufträge" #. module: purchase #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: purchase #: field:purchase.order,origin:0 @@ -1531,7 +1546,7 @@ msgstr "Tel.:" #. module: purchase #: view:purchase.report:0 msgid "Order of Month" -msgstr "" +msgstr "Aufträge des Monats" #. module: purchase #: report:purchase.order:0 @@ -1547,7 +1562,7 @@ msgstr "Suche Beschaffungsauftrag" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_config msgid "Set the Default Invoicing Control Method" -msgstr "" +msgstr "Bestimme die Standard Rechnungssteuerung" #. module: purchase #: model:process.node,note:purchase.process_node_draftpurchaseorder0 @@ -1579,7 +1594,7 @@ msgstr "Erwarte Auftragsbestätigung" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice msgid "Based on draft invoices" -msgstr "" +msgstr "Basierend auf Entwurfsrechnungen" #. module: purchase #: view:purchase.order:0 @@ -1621,11 +1636,13 @@ msgid "" "The selected supplier has a minimal quantity set to %s, you should not " "purchase less." msgstr "" +"Der Lieferant hat eine Minimalmenge von %s definiert, Sie sollten nicht " +"weniger bestellen." #. module: purchase #: view:purchase.report:0 msgid "Order of Year" -msgstr "" +msgstr "Aufträge des Jahres" #. module: purchase #: report:purchase.quotation:0 @@ -1635,7 +1652,7 @@ msgstr "Erwartete Auslieferungsadresse:" #. module: purchase #: view:stock.picking:0 msgid "Journal" -msgstr "" +msgstr "Journal" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po @@ -1668,12 +1685,12 @@ msgstr "Lieferung" #. module: purchase #: view:purchase.order:0 msgid "Purchase orders which are in done state." -msgstr "" +msgstr "Erledigte Einkaufsaufträge" #. module: purchase #: field:purchase.order.line,product_uom:0 msgid "Product UOM" -msgstr "Mengeneinheit" +msgstr "ME" #. module: purchase #: report:purchase.quotation:0 @@ -1704,7 +1721,7 @@ msgstr "Reservierung" #. module: purchase #: view:purchase.order:0 msgid "Purchase orders that include lines not invoiced." -msgstr "" +msgstr "Einkaufsäufträge mit nicht fakturierten Positionen" #. module: purchase #: view:purchase.order:0 @@ -1722,6 +1739,8 @@ msgid "" "This tool will help you to select the method you want to use to control " "supplier invoices." msgstr "" +"Dieser Assistent hilft Ihnen bei der Auswahl der Methode zur Steuerung der " +"Lieferantenrechnungen" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1 @@ -1771,6 +1790,9 @@ msgid "" "receptions\", you can track here all the product receptions and create " "invoices for those receptions." msgstr "" +"Wenn Sie die Rechnungssteuerung auf \"Basierend auf Wareneingänge\" setzen, " +"können Sie alle Wareneingänge verfolgen und darauf basieren die Rechnungen " +"erstellen" #. module: purchase #: view:purchase.order:0 @@ -1823,7 +1845,7 @@ msgstr "Diff. zu Standardpreis" #. module: purchase #: field:purchase.config.wizard,default_method:0 msgid "Default Invoicing Control Method" -msgstr "" +msgstr "Standard Rechnungssteuerung" #. module: purchase #: model:product.pricelist.type,name:purchase.pricelist_type_purchase @@ -1839,7 +1861,7 @@ msgstr "Rechnungserstellung" #. module: purchase #: view:stock.picking:0 msgid "Back Orders" -msgstr "" +msgstr "Auftragsrückstand" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0 @@ -1895,7 +1917,7 @@ msgstr "Preislisten Versionen" #. module: purchase #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen." #. module: purchase #: code:addons/purchase/purchase.py:358 @@ -1984,11 +2006,62 @@ msgid "" "% endif\n" " " msgstr "" +"\n" +"Hallo${object.partner_address_id.name and ' ' or " +"''}${object.partner_address_id.name or ''},\n" +"\n" +"Das ist eine Auftragsbestätigung von ${object.company_id.name}:\n" +" | Auftragsnummer: *${object.name}*\n" +" | Auftrags Gesamtsumme: *${object.amount_total} " +"${object.pricelist_id.currency_id.name}*\n" +" | Auftragsdatum: ${object.date_order}\n" +" % if object.origin:\n" +" | Auftrags referenz: ${object.origin}\n" +" % endif\n" +" % if object.partner_ref:\n" +" | Ihre Referenz: ${object.partner_ref}
\n" +" % endif\n" +" | Ihr Kontakt: ${object.validator.name} ${object.validator.user_email " +"and '<%s>'%(object.validator.user_email) or ''}\n" +"\n" +"Sie können den Auftrag ansehen oder herunterladen indem Sie auf den " +"folgenden Link klicken:\n" +" ${ctx.get('edi_web_url_view') or 'n/a'}\n" +"\n" +"Wenn Sie Fragen haben kontaktieren Sie uns bitte.\n" +"\n" +"Besten Dank!\n" +"\n" +"\n" +"--\n" +"${object.validator.name} ${object.validator.user_email and " +"'<%s>'%(object.validator.user_email) or ''}\n" +"${object.company_id.name}\n" +"% if object.company_id.street:\n" +"${object.company_id.street or ''}\n" +"% endif\n" +"% if object.company_id.street2:\n" +"${object.company_id.street2}\n" +"% endif\n" +"% if object.company_id.city or object.company_id.zip:\n" +"${object.company_id.zip or ''} ${object.company_id.city or ''}\n" +"% endif\n" +"% if object.company_id.country_id:\n" +"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) " +"or ''} ${object.company_id.country_id.name or ''}\n" +"% endif\n" +"% if object.company_id.phone:\n" +"Phone: ${object.company_id.phone}\n" +"% endif\n" +"% if object.company_id.website:\n" +"${object.company_id.website or ''}\n" +"% endif\n" +" " #. module: purchase #: view:purchase.order:0 msgid "Purchase orders which are in draft state" -msgstr "" +msgstr "Einkaufsaufträge im Entwurf" #. module: purchase #: selection:purchase.report,month:0 @@ -1998,17 +2071,17 @@ msgstr "Mai" #. module: purchase #: model:res.groups,name:purchase.group_purchase_manager msgid "Manager" -msgstr "" +msgstr "Manager" #. module: purchase #: view:purchase.config.wizard:0 msgid "res_config_contents" -msgstr "" +msgstr "res_config_contents" #. module: purchase #: view:purchase.report:0 msgid "Order in current year" -msgstr "" +msgstr "Aufträge aktuelles Jahr" #. module: purchase #: model:process.process,name:purchase.process_process_purchaseprocess0 @@ -2026,7 +2099,7 @@ msgstr "Jahr" #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft #: selection:purchase.order,invoice_method:0 msgid "Based on Purchase Order lines" -msgstr "" +msgstr "Basierend auf Einkaufsauftragspositionen" #. module: purchase #: model:ir.actions.todo.category,name:purchase.category_purchase_config diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po index c1ef5914035..624d5f95cef 100644 --- a/addons/purchase/i18n/nl.po +++ b/addons/purchase/i18n/nl.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-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-11-07 12:53+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-15 12:46+0000\n" +"Last-Translator: Erwin (Endian Solutions) \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-12-23 05:53+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-16 05:18+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -123,7 +123,7 @@ msgstr "Prijslijsten" #. module: purchase #: view:stock.picking:0 msgid "To Invoice" -msgstr "" +msgstr "Te factureren" #. module: purchase #: view:purchase.order.line_invoice:0 diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 54fb2267368..6dd6db4085a 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -715,11 +715,11 @@ class purchase_order_line(osv.osv): res = {} prod= self.pool.get('product.product').browse(cr, uid, product) product_uom_pool = self.pool.get('product.uom') + lang=False if partner_id: lang=self.pool.get('res.partner').read(cr, uid, partner_id, ['lang'])['lang'] - context={'lang':lang} - context['partner_id'] = partner_id + context_partner = {'lang': lang, 'partner_id': partner_id} prod = self.pool.get('product.product').browse(cr, uid, product, context=context) prod_uom_po = prod.uom_po_id.id @@ -735,7 +735,7 @@ class purchase_order_line(osv.osv): if uom1_cat != uom2_cat: uom = False - prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1] + prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context_partner)[0][1] res = {} for s in prod.seller_ids: if s.name.id == partner_id: diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po index a705bf76e68..40b1698083e 100644 --- a/addons/purchase_analytic_plans/i18n/de.po +++ b/addons/purchase_analytic_plans/i18n/de.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-12 14:29+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 18:33+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \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-12-23 05:47+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:10+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: purchase_analytic_plans #: field:purchase.order.line,analytics_id:0 @@ -25,7 +24,7 @@ msgstr "Analytische Verrechnung" #. module: purchase_analytic_plans #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: purchase_analytic_plans #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line diff --git a/addons/purchase_double_validation/i18n/de.po b/addons/purchase_double_validation/i18n/de.po index d38428ed813..031543d683b 100644 --- a/addons/purchase_double_validation/i18n/de.po +++ b/addons/purchase_double_validation/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-02-15 15:37+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-13 18:33+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:32+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:13+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: purchase_double_validation #: view:purchase.double.validation.installer:0 @@ -47,7 +47,7 @@ msgstr "Konfiguriere Betragsgrenze für Einkauf" #: view:board.board:0 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting msgid "Purchase Order Waiting Approval" -msgstr "" +msgstr "Beschaffungsaufträge (Erwarte Auftragsbestätigung)" #. module: purchase_double_validation #: view:purchase.double.validation.installer:0 diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po index 46dce2d2280..3d153980a22 100644 --- a/addons/purchase_requisition/i18n/de.po +++ b/addons/purchase_requisition/i18n/de.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-04-03 09:28+0000\n" +"PO-Revision-Date: 2012-01-13 18:32+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:27+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:13+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: purchase_requisition #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: purchase_requisition #: view:purchase.requisition:0 @@ -64,7 +64,7 @@ msgstr "Status" #. module: purchase_requisition #: view:purchase.requisition:0 msgid "Purchase Requisition in negociation" -msgstr "" +msgstr "Bedarfsanforderung in Verhandlung" #. module: purchase_requisition #: report:purchase.requisition:0 @@ -75,7 +75,7 @@ msgstr "Lieferant" #: view:purchase.requisition:0 #: selection:purchase.requisition,state:0 msgid "New" -msgstr "" +msgstr "Neu" #. module: purchase_requisition #: report:purchase.requisition:0 @@ -109,7 +109,7 @@ msgstr "Bedarfsanforderung Positionen" #. module: purchase_requisition #: view:purchase.order:0 msgid "Purchase Orders with requisition" -msgstr "" +msgstr "Einkaufsaufträge mit Bedarfsanforderung" #. module: purchase_requisition #: model:ir.model,name:purchase_requisition.model_product_product @@ -141,7 +141,7 @@ msgstr "" #: code:addons/purchase_requisition/purchase_requisition.py:136 #, python-format msgid "Warning" -msgstr "" +msgstr "Warnung" #. module: purchase_requisition #: report:purchase.requisition:0 @@ -183,12 +183,12 @@ msgstr "Zurücksetzen auf Entwurf" #. module: purchase_requisition #: view:purchase.requisition:0 msgid "Current Purchase Requisition" -msgstr "" +msgstr "aktuelle Einkaufsanforderungen" #. module: purchase_requisition #: model:res.groups,name:purchase_requisition.group_purchase_requisition_user msgid "User" -msgstr "" +msgstr "Benutzer" #. module: purchase_requisition #: field:purchase.requisition.partner,partner_address_id:0 @@ -226,7 +226,7 @@ msgstr "Menge" #. module: purchase_requisition #: view:purchase.requisition:0 msgid "Unassigned Requisition" -msgstr "" +msgstr "nicht zugeteilte Anforderungen" #. module: purchase_requisition #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition @@ -320,7 +320,7 @@ msgstr "Bedarfsanforderung Typ" #. module: purchase_requisition #: view:purchase.requisition:0 msgid "New Purchase Requisition" -msgstr "" +msgstr "Neue Einkaufsanforderung" #. module: purchase_requisition #: view:purchase.requisition:0 @@ -355,7 +355,7 @@ msgstr "Bedarfsmeldung Partner" #. module: purchase_requisition #: view:purchase.requisition:0 msgid "Start" -msgstr "" +msgstr "Beginn" #. module: purchase_requisition #: report:purchase.requisition:0 @@ -412,7 +412,7 @@ msgstr "Bedarfsmeldung (Exklusiv)" #. module: purchase_requisition #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager msgid "Manager" -msgstr "" +msgstr "Manager" #. module: purchase_requisition #: constraint:product.product:0 diff --git a/addons/report_webkit/i18n/de.po b/addons/report_webkit/i18n/de.po index 31576db5a82..8fed162e33e 100644 --- a/addons/report_webkit/i18n/de.po +++ b/addons/report_webkit/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-13 16:56+0000\n" +"PO-Revision-Date: 2012-01-13 18:30+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:27+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:13+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: report_webkit #: view:ir.actions.report.xml:0 @@ -57,6 +57,9 @@ msgid "" " but memory and disk " "usage is wider" msgstr "" +"Dieses Modul erlaubt eine präzise Positionierung der Elemente, da jedes " +"Objekt auf einer eigenen HTML Seite gedruckt wird. Menory und Plattenbedarf " +"ist aber größer." #. module: report_webkit #: selection:ir.header_webkit,format:0 @@ -78,7 +81,7 @@ msgstr "Pfad zu wkhtmltopdf ist nicht absolut" #. module: report_webkit #: view:ir.header_webkit:0 msgid "Company and Page Setup" -msgstr "" +msgstr "Konfiguration von Unternehmen und Seite" #. module: report_webkit #: selection:ir.header_webkit,format:0 @@ -132,7 +135,7 @@ msgstr "Webkit verursacht Fehler" #: model:ir.actions.act_window,name:report_webkit.action_header_webkit #: model:ir.ui.menu,name:report_webkit.menu_header_webkit msgid "Webkit Headers/Footers" -msgstr "" +msgstr "Webkit Kopf-/Fuss-Zeilen" #. module: report_webkit #: selection:ir.header_webkit,format:0 @@ -194,7 +197,7 @@ msgstr "ir.header_img" #. module: report_webkit #: field:ir.actions.report.xml,precise_mode:0 msgid "Precise Mode" -msgstr "" +msgstr "Präziser Modus" #. module: report_webkit #: constraint:res.company:0 @@ -323,7 +326,7 @@ msgstr "B3 18 353 x 500 mm" #. module: report_webkit #: field:ir.actions.report.xml,webkit_header:0 msgid "Webkit Header" -msgstr "" +msgstr "Webkit Kopfzeilen" #. module: report_webkit #: help:ir.actions.report.xml,webkit_debug:0 @@ -387,7 +390,7 @@ msgstr "A9 13 37 x 52 mm" #. module: report_webkit #: view:ir.header_webkit:0 msgid "Footer" -msgstr "" +msgstr "Fußzeilen" #. module: report_webkit #: model:ir.model,name:report_webkit.model_res_company @@ -440,7 +443,7 @@ msgstr "Papierformat" #. module: report_webkit #: view:ir.header_webkit:0 msgid "Header" -msgstr "" +msgstr "Kopfzeilen" #. module: report_webkit #: selection:ir.header_webkit,format:0 @@ -450,7 +453,7 @@ msgstr "B10 16 31 x 44 mm" #. module: report_webkit #: view:ir.header_webkit:0 msgid "CSS Style" -msgstr "" +msgstr "CSS Stil" #. module: report_webkit #: field:ir.header_webkit,css:0 @@ -466,7 +469,7 @@ msgstr "B4 19 250 x 353 mm" #: model:ir.actions.act_window,name:report_webkit.action_header_img #: model:ir.ui.menu,name:report_webkit.menu_header_img msgid "Webkit Logos" -msgstr "" +msgstr "Webkit Logos" #. module: report_webkit #: selection:ir.header_webkit,format:0 diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 7e828403437..c3753f5de3b 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -38,6 +38,7 @@ import time import logging from mako.template import Template +from mako.lookup import TemplateLookup from mako import exceptions import netsvc @@ -56,8 +57,8 @@ def mako_template(text): This template uses UTF-8 encoding """ - # default_filters=['unicode', 'h'] can be used to set global filters - return Template(text, input_encoding='utf-8', output_encoding='utf-8') + tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance + return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup) class WebKitParser(report_sxw): diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po index 385ceb8ebe4..96ee9a8a906 100644 --- a/addons/resource/i18n/de.po +++ b/addons/resource/i18n/de.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-18 09:11+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 18:25+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: resource #: help:resource.calendar.leaves,resource_id:0 @@ -94,6 +93,7 @@ msgstr "Ressourcen" #, python-format msgid "Make sure the Working time has been configured with proper week days!" msgstr "" +"Ãœberprüfen Sie, dass die Arbeitszeit zu den richtigen Wochentagen passt!" #. module: resource #: field:resource.calendar,manager:0 @@ -247,7 +247,7 @@ msgstr "Arbeitszeit von" msgid "" "Define working hours and time table that could be scheduled to your project " "members" -msgstr "" +msgstr "Definition der Arbeitszeit, die für die Projektmitarbeiter gilt" #. module: resource #: help:resource.resource,user_id:0 @@ -263,7 +263,7 @@ msgstr "Definire den Einsatzplan für diese Ressource" #. module: resource #: view:resource.calendar.leaves:0 msgid "Starting Date of Leave" -msgstr "" +msgstr "Anfangsdatum der Abwesenheit" #. module: resource #: field:resource.resource,code:0 @@ -338,7 +338,7 @@ msgstr "(Ferien)" #: code:addons/resource/resource.py:392 #, python-format msgid "Configuration Error!" -msgstr "" +msgstr "Konfigurationsfehler !" #. module: resource #: selection:resource.resource,resource_type:0 diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 318e305b8ea..d4b37bf311c 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Sales Management', 'version': '1.0', 'category': 'Sales Management', + "sequence": 14, 'complexity': "easy", 'description': """ The base module to manage quotations and sales orders. diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po index 1660ab7a4ff..39cc96a72b4 100644 --- a/addons/sale/i18n/ar.po +++ b/addons/sale/i18n/ar.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-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-11-05 10:31+0000\n" +"PO-Revision-Date: 2012-01-13 14:36+0000\n" "Last-Translator: Ahmad Khayyat \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-12-23 06:46+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:11+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale #: field:sale.config.picking_policy,timesheet:0 @@ -32,7 +32,7 @@ msgstr "" #: view:board.board:0 #: model:ir.actions.act_window,name:sale.action_sales_by_salesman msgid "Sales by Salesman in last 90 days" -msgstr "مبيعات مندوب المبيعات آخر 90 يوماً" +msgstr "مبيعات بواسطة مندوب المبيعات ÙÙ‰ آخر 90 يوماً" #. module: sale #: help:sale.order,picking_policy:0 @@ -81,12 +81,12 @@ msgstr "تم تحويل العرض المالي '%s' إلى طلب مبيعات" #: code:addons/sale/wizard/sale_make_invoice.py:42 #, python-format msgid "Warning !" -msgstr "" +msgstr "تحذير !" #. module: sale #: report:sale.order:0 msgid "VAT" -msgstr "" +msgstr "ضريبة القيمة المضاÙØ©" #. module: sale #: model:process.node,note:sale.process_node_saleorderprocurement0 @@ -336,7 +336,7 @@ msgstr "" #. module: sale #: view:sale.order:0 msgid "Conditions" -msgstr "" +msgstr "الشروط" #. module: sale #: code:addons/sale/sale.py:1034 @@ -654,7 +654,7 @@ msgstr "سطر أمر المبيعات" #. module: sale #: field:sale.shop,warehouse_id:0 msgid "Warehouse" -msgstr "المستودع" +msgstr "المخزن" #. module: sale #: report:sale.order:0 @@ -1113,7 +1113,7 @@ msgstr "بإنتظار الجدول" #. module: sale #: field:sale.order.line,type:0 msgid "Procurement Method" -msgstr "طريقة التحصيل" +msgstr "طريقة الشراء" #. module: sale #: model:process.node,name:sale.process_node_packinglist0 @@ -1505,7 +1505,7 @@ msgstr "" #. module: sale #: field:sale.order,origin:0 msgid "Source Document" -msgstr "المستند المصدر" +msgstr "مستند المصدر" #. module: sale #: view:sale.order.line:0 @@ -1607,7 +1607,7 @@ msgstr "" #. module: sale #: view:sale.order.line:0 msgid "Order" -msgstr "" +msgstr "أمر" #. module: sale #: code:addons/sale/sale.py:1016 @@ -1643,7 +1643,7 @@ msgstr "" #. module: sale #: view:sale.order:0 msgid "States" -msgstr "" +msgstr "حالات" #. module: sale #: view:sale.config.picking_policy:0 @@ -2360,9 +2360,6 @@ msgstr "أصدر الÙواتير بناءً على التسليم" #~ msgid " Month " #~ msgstr " الشهر " -#~ msgid " Month-1 " -#~ msgstr " الشهر 1 " - #~ msgid "Complete Delivery" #~ msgstr "تسليم كامل" @@ -2432,3 +2429,6 @@ msgstr "أصدر الÙواتير بناءً على التسليم" #~ msgid "Configuration Progress" #~ msgstr "تقدم الإعدادات" + +#~ msgid " Month-1 " +#~ msgstr " شهر- Ù¡ " diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po index 4922a9980fe..c7dabddad3c 100644 --- a/addons/sale/i18n/de.po +++ b/addons/sale/i18n/de.po @@ -8,20 +8,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-01-18 11:11+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-01-13 23:07+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:46+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:11+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale #: field:sale.config.picking_policy,timesheet:0 msgid "Based on Timesheet" -msgstr "" +msgstr "Basierend auf Zeitaufzeichnung" #. module: sale #: view:sale.order.line:0 @@ -29,6 +28,8 @@ msgid "" "Sale Order Lines that are confirmed, done or in exception state and haven't " "yet been invoiced" msgstr "" +"Verkaufsauftragspositionen, die bestätigt, erledigt oder in Ausnahmezustand " +"sind, aber noch nicht verrechnet wurden" #. module: sale #: view:board.board:0 @@ -46,7 +47,7 @@ msgstr "Erlaube Teillieferung, wenn nicht genügend auf Lager liegt." #. module: sale #: view:sale.order:0 msgid "UoS" -msgstr "" +msgstr "VE" #. module: sale #: help:sale.order,partner_shipping_id:0 @@ -122,6 +123,9 @@ msgid "" "cancel a sale order, you must first cancel related picking or delivery " "orders." msgstr "" +"Bevor Sie einen bestätigten Verkaufsauftrag löschen können, müssen Sie " +"diesen stornieren und davor noch die zugehörigen Lieferscheine und " +"Lieferaufträge." #. module: sale #: model:process.node,name:sale.process_node_saleprocurement0 @@ -137,7 +141,7 @@ msgstr "Partner" #. module: sale #: selection:sale.order,order_policy:0 msgid "Invoice based on deliveries" -msgstr "" +msgstr "Rechnung auf Basis Auslieferung" #. module: sale #: view:sale.order:0 @@ -191,12 +195,12 @@ msgstr "Standard Zahlungsbedingung" #. module: sale #: field:sale.config.picking_policy,deli_orders:0 msgid "Based on Delivery Orders" -msgstr "" +msgstr "Basierend auf Lieferaufträgen" #. module: sale #: field:sale.config.picking_policy,time_unit:0 msgid "Main Working Time Unit" -msgstr "" +msgstr "Haupteinheit für Arbeitszeiten" #. module: sale #: view:sale.order:0 @@ -227,7 +231,7 @@ msgstr "" #. module: sale #: view:sale.order:0 msgid "My Sale Orders" -msgstr "" +msgstr "Meine Verkaufsaufträge" #. module: sale #: selection:sale.order,invoice_quantity:0 @@ -272,12 +276,12 @@ msgstr "" #. module: sale #: field:sale.config.picking_policy,task_work:0 msgid "Based on Tasks' Work" -msgstr "" +msgstr "Basierend auf der Arbeitszeit der Aufgaben" #. module: sale #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order msgid "Quotations and Sales" -msgstr "" +msgstr "Angebote und Verkäufe" #. module: sale #: model:ir.model,name:sale.model_sale_make_invoice @@ -288,7 +292,7 @@ msgstr "Verkauf erstellt Rechnung" #: code:addons/sale/sale.py:330 #, python-format msgid "Pricelist Warning!" -msgstr "" +msgstr "Preisliste Warnung!" #. module: sale #: field:sale.order.line,discount:0 @@ -355,7 +359,7 @@ msgstr "Verkaufsaufträge in Fehlerliste" #: code:addons/sale/wizard/sale_make_invoice_advance.py:70 #, python-format msgid "Configuration Error !" -msgstr "" +msgstr "Fehler Konfiguration !" #. module: sale #: view:sale.order:0 @@ -418,7 +422,7 @@ msgstr "Oktober" #. module: sale #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Die Referenz muss je Firma eindeutig sein" #. module: sale #: view:board.board:0 @@ -488,6 +492,7 @@ msgstr "" #, python-format msgid "You cannot cancel a sale order line that has already been invoiced!" msgstr "" +"Sie können eine bereits verrechnete Auftragsposition nicht stornieren." #. module: sale #: code:addons/sale/sale.py:1066 @@ -539,7 +544,7 @@ msgstr "Bemerkungen" #. module: sale #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Der Name der Firma darf nur einmal vorkommen!" #. module: sale #: help:sale.order,partner_invoice_id:0 @@ -549,12 +554,12 @@ msgstr "Rechnungsadresse für diesen Verkaufsauftrag." #. module: sale #: view:sale.report:0 msgid "Month-1" -msgstr "" +msgstr "Monat-1" #. module: sale #: view:sale.report:0 msgid "Ordered month of the sales order" -msgstr "" +msgstr "Bestellmonat des AUftrags" #. module: sale #: code:addons/sale/sale.py:504 @@ -562,11 +567,13 @@ msgstr "" msgid "" "You cannot group sales having different currencies for the same partner." msgstr "" +"Verkaufsaufträge mit verschiedenen Währungen können nicht für den selben " +"Partner gruppiert werden." #. module: sale #: selection:sale.order,picking_policy:0 msgid "Deliver each product when available" -msgstr "" +msgstr "Liefere jedes Produkt bei Verfügbarkeit" #. module: sale #: field:sale.order,invoiced_rate:0 @@ -603,11 +610,12 @@ msgstr "März" #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." msgstr "" +"Sie dürfen keine Sicht als Quelle oder Ziel einer Lagerbewegung angeben" #. module: sale #: field:sale.config.picking_policy,sale_orders:0 msgid "Based on Sales Orders" -msgstr "" +msgstr "Basierend auf Verkaufsauftrag" #. module: sale #: help:sale.order,state:0 @@ -639,7 +647,7 @@ msgstr "Rechnungsanschrift:" #. module: sale #: field:sale.order.line,sequence:0 msgid "Line Sequence" -msgstr "" +msgstr "Zeilen Sequenz" #. module: sale #: model:process.transition,note:sale.process_transition_saleorderprocurement0 @@ -731,7 +739,7 @@ msgstr "Datum Auftragserstellung" #. module: sale #: model:ir.ui.menu,name:sale.menu_sales_configuration_misc msgid "Miscellaneous" -msgstr "" +msgstr "Sonstiges" #. module: sale #: model:ir.actions.act_window,name:sale.action_order_line_tree3 @@ -778,7 +786,7 @@ msgstr "Menge" #: code:addons/sale/sale.py:1314 #, python-format msgid "Hour" -msgstr "" +msgstr "Stunde" #. module: sale #: view:sale.order:0 @@ -801,7 +809,7 @@ msgstr "Alle Angebote" #. module: sale #: view:sale.config.picking_policy:0 msgid "Options" -msgstr "" +msgstr "Optionen" #. module: sale #: selection:sale.report,month:0 @@ -812,7 +820,7 @@ msgstr "September" #: code:addons/sale/sale.py:632 #, python-format msgid "You cannot confirm a sale order which has no line." -msgstr "" +msgstr "Sie können einen Verkaufsauftrag ohne Zeilen nicht bestätigen" #. module: sale #: code:addons/sale/sale.py:1246 @@ -821,6 +829,8 @@ msgid "" "You have to select a pricelist or a customer in the sales form !\n" "Please set one before choosing a product." msgstr "" +"Sie müssen eine Preisliste oder einen Kunden im Verkaufsformular auswählen, " +"bevor Sie ein Produkt auswählen." #. module: sale #: view:sale.report:0 @@ -894,7 +904,7 @@ msgstr "" #. module: sale #: field:sale.order,date_order:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: sale #: view:sale.report:0 @@ -915,7 +925,7 @@ msgstr "Unternehmen" #: code:addons/sale/sale.py:1259 #, python-format msgid "No valid pricelist line found ! :" -msgstr "" +msgstr "Keine gültige Preisliste gefunden" #. module: sale #: view:sale.order:0 @@ -925,7 +935,7 @@ msgstr "Historie" #. module: sale #: selection:sale.order,order_policy:0 msgid "Invoice on order after delivery" -msgstr "" +msgstr "Rechnung auf Basis Auftrag nach Lieferung" #. module: sale #: help:sale.order,invoice_ids:0 @@ -972,7 +982,7 @@ msgstr "Referenzen" #. module: sale #: view:sale.order.line:0 msgid "My Sales Order Lines" -msgstr "" +msgstr "Meine Verkaufsauftragspositionen" #. module: sale #: model:process.transition.action,name:sale.process_transition_action_cancel0 @@ -988,7 +998,7 @@ msgstr "Abbrechen" #. module: sale #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: sale #: model:process.transition,name:sale.process_transition_invoice0 @@ -1007,7 +1017,7 @@ msgstr "Nettobetrag" #. module: sale #: view:sale.order.line:0 msgid "Order reference" -msgstr "" +msgstr "Auftrag Referenz" #. module: sale #: view:sale.open.invoice:0 @@ -1033,7 +1043,7 @@ msgstr "Offene Posten" #. module: sale #: model:ir.actions.server,name:sale.ir_actions_server_edi_sale msgid "Auto-email confirmed sale orders" -msgstr "" +msgstr "Bestätigte Verkaufsaufträge automatisch mit EMail versenden" #. module: sale #: code:addons/sale/sale.py:413 @@ -1061,7 +1071,7 @@ msgstr "Basierend auf gelieferte oder bestellte Mengen" #. module: sale #: selection:sale.order,picking_policy:0 msgid "Deliver all products at once" -msgstr "" +msgstr "Alle Produkte auf einmal Liefern" #. module: sale #: field:sale.order,picking_ids:0 @@ -1098,12 +1108,12 @@ msgstr "Erzeugt Lieferauftrag" #: code:addons/sale/sale.py:1290 #, python-format msgid "Cannot delete a sales order line which is in state '%s'!" -msgstr "" +msgstr "Kann Varkaufsauftragspositionen im Status %s nicht löschen." #. module: sale #: view:sale.order:0 msgid "Qty(UoS)" -msgstr "" +msgstr "ME(VE)" #. module: sale #: view:sale.order:0 @@ -1118,7 +1128,7 @@ msgstr "Erzeuge Packauftrag" #. module: sale #: view:sale.report:0 msgid "Ordered date of the sales order" -msgstr "" +msgstr "Bestelldatum des Verkaufsauftrages" #. module: sale #: view:sale.report:0 @@ -1284,7 +1294,7 @@ msgstr "Umsatzsteuer" #. module: sale #: view:sale.order:0 msgid "Sales Order ready to be invoiced" -msgstr "" +msgstr "Fakturierbare Verkaufsaufträge" #. module: sale #: help:sale.order,create_date:0 @@ -1305,7 +1315,7 @@ msgstr "Erzeuge Rechnungen" #. module: sale #: view:sale.report:0 msgid "Sales order created in current month" -msgstr "" +msgstr "Verkaufsaufträge des aktuellen Monats" #. module: sale #: report:sale.order:0 @@ -1328,7 +1338,7 @@ msgstr "Anzahlung" #. module: sale #: field:sale.config.picking_policy,charge_delivery:0 msgid "Do you charge the delivery?" -msgstr "" +msgstr "Verrechnen Sie Lieferkosten?" #. module: sale #: selection:sale.order,invoice_quantity:0 @@ -1347,6 +1357,8 @@ msgid "" "If you change the pricelist of this order (and eventually the currency), " "prices of existing order lines will not be updated." msgstr "" +"Wenn Sie die Preisliste diese Auftrags ändern (und ggf die Währung) werden " +"sich die Preise der Zeilen nicht automatisch ändern!" #. module: sale #: model:ir.model,name:sale.model_stock_picking @@ -1372,12 +1384,12 @@ msgstr "Verkaufsauftrag konnte nicht storniert werden" #. module: sale #: view:sale.order:0 msgid "Qty(UoM)" -msgstr "" +msgstr "Menge (ME)" #. module: sale #: view:sale.report:0 msgid "Ordered Year of the sales order" -msgstr "" +msgstr "Jahr des Verkaufsauftrages" #. module: sale #: selection:sale.report,month:0 @@ -1399,7 +1411,7 @@ msgstr "Versand Fehlerliste" #: code:addons/sale/sale.py:1143 #, python-format msgid "Picking Information ! : " -msgstr "" +msgstr "Lieferschein Info!: " #. module: sale #: field:sale.make.invoice,grouped:0 @@ -1409,13 +1421,13 @@ msgstr "Gruppiere Rechnungen" #. module: sale #: field:sale.order,order_policy:0 msgid "Invoice Policy" -msgstr "" +msgstr "Fakturierungsregel" #. module: sale #: model:ir.actions.act_window,name:sale.action_config_picking_policy #: view:sale.config.picking_policy:0 msgid "Setup your Invoicing Method" -msgstr "" +msgstr "Bestimmen Sie Ihre Fakturierungsmethode" #. module: sale #: model:process.node,note:sale.process_node_invoice0 @@ -1433,6 +1445,8 @@ msgid "" "This tool will help you to install the right module and configure the system " "according to the method you use to invoice your customers." msgstr "" +"Dieser Assistent wird für Sie die richtigen Module zu konfigurieren, je " +"nachdem welche Fakturierungsmethode ausgewählt wurde." #. module: sale #: model:ir.model,name:sale.model_sale_order_line_make_invoice @@ -1512,13 +1526,13 @@ msgstr "" #. module: sale #: view:sale.order.line:0 msgid "Confirmed sale order lines, not yet delivered" -msgstr "" +msgstr "Bestätigte Auftragspositionen, noch nicht geliefert" #. module: sale #: code:addons/sale/sale.py:473 #, python-format msgid "Customer Invoices" -msgstr "" +msgstr "Kundenrechnungen" #. module: sale #: model:process.process,name:sale.process_process_salesprocess0 @@ -1603,7 +1617,7 @@ msgstr "Monat" #. module: sale #: model:email.template,subject:sale.email_template_edi_sale msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" -msgstr "" +msgstr "${object.company_id.name} Auftrag (Ref ${object.name or 'n/a' })" #. module: sale #: view:sale.order.line:0 @@ -1628,7 +1642,7 @@ msgstr "sale.config.picking_policy" #: view:board.board:0 #: model:ir.actions.act_window,name:sale.action_turnover_by_month msgid "Monthly Turnover" -msgstr "" +msgstr "Monatlicher Umsatz" #. module: sale #: field:sale.order,invoice_quantity:0 @@ -1743,13 +1757,13 @@ msgstr "" #. module: sale #: selection:sale.order,order_policy:0 msgid "Pay before delivery" -msgstr "" +msgstr "Zahle vor Lieferung" #. module: sale #: view:board.board:0 #: model:ir.actions.act_window,name:sale.open_board_sales msgid "Sales Dashboard" -msgstr "" +msgstr "Pinnwand Verkauf" #. module: sale #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice @@ -1773,7 +1787,7 @@ msgstr "Datum der Auftragsbestätigung" #. module: sale #: field:sale.order,project_id:0 msgid "Contract/Analytic Account" -msgstr "" +msgstr "Vertrag / Analyse Konto" #. module: sale #: field:sale.order,company_id:0 @@ -1801,6 +1815,9 @@ msgid "" "Couldn't find a pricelist line matching this product and quantity.\n" "You have to change either the product, the quantity or the pricelist." msgstr "" +"Konnte keine Preisliste passend zu Produkt und Menge finden.\n" +"\n" +"Sie können nun entweder das Produkt, die Menge oder die Preisliste ändern." #. module: sale #: help:sale.order,picking_ids:0 @@ -1830,7 +1847,7 @@ msgstr "Abgebrochen" #. module: sale #: view:sale.order.line:0 msgid "Sales Order Lines related to a Sales Order of mine" -msgstr "" +msgstr "Auftragspositionen meiner Verkaufsaufträge" #. module: sale #: model:ir.actions.act_window,name:sale.action_shop_form @@ -1876,7 +1893,7 @@ msgstr "Menge (Verkaufseinheit)" #. module: sale #: view:sale.order.line:0 msgid "Sale Order Lines that are in 'done' state" -msgstr "" +msgstr "Unerledigte Auftragspositionen" #. module: sale #: model:process.transition,note:sale.process_transition_packing0 @@ -1901,7 +1918,7 @@ msgstr "Bestätigt" #. module: sale #: field:sale.config.picking_policy,order_policy:0 msgid "Main Method Based On" -msgstr "" +msgstr "Vorwiegende Methode basiert auf" #. module: sale #: model:process.transition.action,name:sale.process_transition_action_confirm0 @@ -1946,12 +1963,12 @@ msgstr "Konfiguration" #: code:addons/sale/edi/sale_order.py:146 #, python-format msgid "EDI Pricelist (%s)" -msgstr "" +msgstr "EDI Preisliste(%s)" #. module: sale #: view:sale.report:0 msgid "Sales order created in current year" -msgstr "" +msgstr "Verkaufsaufträge des aktuellen Jahres" #. module: sale #: code:addons/sale/wizard/sale_line_invoice.py:113 @@ -1970,7 +1987,7 @@ msgstr "" #. module: sale #: view:sale.order.line:0 msgid "Sale order lines done" -msgstr "" +msgstr "Erledigte Verkaufsauftragspositionen" #. module: sale #: field:sale.order.line,th_weight:0 @@ -2085,23 +2102,23 @@ msgstr "Steuerbetrag" #. module: sale #: view:sale.order:0 msgid "Packings" -msgstr "Verpackungen" +msgstr "Lieferscheine" #. module: sale #: view:sale.order.line:0 msgid "Sale Order Lines ready to be invoiced" -msgstr "" +msgstr "Verkaufsauftragspositionen zu fakturieren" #. module: sale #: view:sale.report:0 msgid "Sales order created in last month" -msgstr "" +msgstr "Verkaufsaufträge des letzen Monats" #. module: sale #: model:ir.actions.act_window,name:sale.action_email_templates #: model:ir.ui.menu,name:sale.menu_email_templates msgid "Email Templates" -msgstr "" +msgstr "E-Mail Vorlagen" #. module: sale #: model:ir.actions.act_window,name:sale.action_order_form @@ -2163,7 +2180,7 @@ msgstr "Tage bis Auftrag" #. module: sale #: selection:sale.order,order_policy:0 msgid "Deliver & invoice on demand" -msgstr "" +msgstr "Lieferung und Fakturierung nach Abruf" #. module: sale #: model:process.node,note:sale.process_node_saleprocurement0 @@ -2192,7 +2209,7 @@ msgstr "Bestätigte Verkaufsaufträge zur Abrechnung" #. module: sale #: view:sale.order:0 msgid "Sales Order that haven't yet been confirmed" -msgstr "" +msgstr "Nicht bestätigte Verkaufsaufträge" #. module: sale #: code:addons/sale/sale.py:322 @@ -2214,7 +2231,7 @@ msgstr "Fertig" #: code:addons/sale/sale.py:1248 #, python-format msgid "No Pricelist ! : " -msgstr "" +msgstr "Keine Preisliste! " #. module: sale #: field:sale.order,shipped:0 @@ -2294,7 +2311,7 @@ msgstr "Anfrage Verkaufsauftrag" #: code:addons/sale/sale.py:1242 #, python-format msgid "Not enough stock ! : " -msgstr "" +msgstr "Nicht genug auf Lager! " #. module: sale #: report:sale.order:0 diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po index cbb77135e1d..bc9f3627708 100644 --- a/addons/sale/i18n/zh_CN.po +++ b/addons/sale/i18n/zh_CN.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-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-01-28 02:08+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-01-12 05:29+0000\n" +"Last-Translator: shjerryzhou \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-12-23 06:47+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-13 04:40+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale #: field:sale.config.picking_policy,timesheet:0 @@ -282,7 +282,7 @@ msgstr "我的报价å•" #: model:ir.actions.act_window,name:sale.open_board_sales_manager #: model:ir.ui.menu,name:sale.menu_board_sales_manager msgid "Sales Manager Dashboard" -msgstr "销售ç»ç†æŽ§åˆ¶å°" +msgstr "销售ç»ç†ä»ªè¡¨ç›˜" #. module: sale #: field:sale.order.line,product_packaging:0 diff --git a/addons/sale/sale.py b/addons/sale/sale.py index af5cb906ec9..4f430c0a957 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -206,7 +206,7 @@ class sale_order(osv.osv): ('invoice_except', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled') - ], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True), + ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True), 'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}), 'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."), 'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."), diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po index 0a50bb00b7f..a446dcd1adf 100644 --- a/addons/sale_crm/i18n/de.po +++ b/addons/sale_crm/i18n/de.po @@ -8,30 +8,30 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-04-03 09:13+0000\n" +"PO-Revision-Date: 2012-01-13 18:23+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 06:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:11+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale_crm #: field:sale.order,categ_id:0 msgid "Category" -msgstr "" +msgstr "Kategorie" #. module: sale_crm #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:112 #, python-format msgid "Converted to Sales Quotation(%s)." -msgstr "" +msgstr "Konvertiert zu Angebot (%s)" #. module: sale_crm #: view:crm.make.sale:0 @@ -63,7 +63,7 @@ msgstr "Erzeuge" #. module: sale_crm #: view:sale.order:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mein(e) Verkaufsteam(s)" #. module: sale_crm #: help:crm.make.sale,close:0 @@ -75,7 +75,7 @@ msgstr "" #. module: sale_crm #: view:board.board:0 msgid "My Opportunities" -msgstr "" +msgstr "Meine Verkaufschancen" #. module: sale_crm #: view:crm.lead:0 @@ -106,7 +106,7 @@ msgstr "Schließe Verkaufschance" #. module: sale_crm #: view:board.board:0 msgid "My Planned Revenues by Stage" -msgstr "" +msgstr "Meine gepl. Umsätze nach Stufe" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:110 diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po index 45a53b5ed73..23e3dfe313e 100644 --- a/addons/sale_journal/i18n/de.po +++ b/addons/sale_journal/i18n/de.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-13 08:42+0000\n" +"PO-Revision-Date: 2012-01-13 18:21+0000\n" "Last-Translator: Ferdinand @ Camptocamp \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-12-23 06:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale_journal #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: sale_journal #: field:sale_journal.invoice.type,note:0 @@ -29,19 +29,19 @@ msgstr "Bemerkung" #. module: sale_journal #: field:res.partner,property_invoice_type:0 msgid "Invoicing Type" -msgstr "" +msgstr "Rechnungstyp" #. module: sale_journal #: help:res.partner,property_invoice_type:0 msgid "" "This invoicing type will be used, by default, for invoicing the current " "partner." -msgstr "" +msgstr "Diese Rechnungstyp wird für diesen Partner vorgeschlagen" #. module: sale_journal #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Error! Sie können keine rekursive assoziierte Mitglieder anlegen." #. module: sale_journal #: view:res.partner:0 @@ -98,7 +98,7 @@ msgstr "" #. module: sale_journal #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Die Referenz muss je Firma eindeutig sein" #. module: sale_journal #: field:sale.order,invoice_type_id:0 diff --git a/addons/sale_layout/i18n/de.po b/addons/sale_layout/i18n/de.po index d1d5ae54eec..db5a0304c6f 100644 --- a/addons/sale_layout/i18n/de.po +++ b/addons/sale_layout/i18n/de.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-13 13:59+0000\n" +"PO-Revision-Date: 2012-01-13 18:20+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale_layout #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: sale_layout #: selection:sale.order.line,layout_type:0 @@ -45,7 +45,7 @@ msgstr "Notiz" #. module: sale_layout #: field:sale.order.line,layout_type:0 msgid "Line Type" -msgstr "" +msgstr "Zeilenart" #. module: sale_layout #: report:sale.order.layout:0 diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po index 9452ffad714..3a78962ae97 100644 --- a/addons/sale_margin/i18n/de.po +++ b/addons/sale_margin/i18n/de.po @@ -9,19 +9,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-13 12:41+0000\n" +"PO-Revision-Date: 2012-01-13 18:20+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:16+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale_margin #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: sale_margin #: field:sale.order.line,purchase_price:0 diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po index 6c313c22f90..a80cbea3263 100644 --- a/addons/sale_mrp/i18n/de.po +++ b/addons/sale_mrp/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-12 15:03+0000\n" -"Last-Translator: Ferdinand-camptocamp \n" +"PO-Revision-Date: 2012-01-13 18:19+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale_mrp #: help:mrp.production,sale_ref:0 @@ -40,7 +40,7 @@ msgstr "Bezeichnung Verkaufsauftrag" #. module: sale_mrp #: sql_constraint:mrp.production:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Die Referenz muss je Firma eindeutig sein" #. module: sale_mrp #: constraint:mrp.production:0 diff --git a/addons/sale_order_dates/i18n/de.po b/addons/sale_order_dates/i18n/de.po index 69edbc7f162..5356f99eeda 100644 --- a/addons/sale_order_dates/i18n/de.po +++ b/addons/sale_order_dates/i18n/de.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-13 08:28+0000\n" +"PO-Revision-Date: 2012-01-13 18:19+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale_order_dates #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Die Bestellreferenz muss je Firma eindeutig sein" #. module: sale_order_dates #: help:sale.order,requested_date:0 diff --git a/addons/sale_order_dates/i18n/nl.po b/addons/sale_order_dates/i18n/nl.po index d297fd7b212..82d5b88965e 100644 --- a/addons/sale_order_dates/i18n/nl.po +++ b/addons/sale_order_dates/i18n/nl.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-01-18 08:44+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2012-01-15 12:45+0000\n" +"Last-Translator: Erwin (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-16 05:19+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: sale_order_dates #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Orderreferentie moet uniek zijn per bedrijf!" #. module: sale_order_dates #: help:sale.order,requested_date:0 diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po index 043a1628696..4041a75c3fe 100644 --- a/addons/share/i18n/de.po +++ b/addons/share/i18n/de.po @@ -7,39 +7,39 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-04-03 09:09+0000\n" +"PO-Revision-Date: 2012-01-13 22:29+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: share #: field:share.wizard,embed_option_title:0 msgid "Display title" -msgstr "" +msgstr "Titel anzeigen" #. module: share #: view:share.wizard:0 msgid "Access granted!" -msgstr "" +msgstr "Zugriff erteilt!" #. module: share #: field:share.wizard,user_type:0 msgid "Sharing method" -msgstr "" +msgstr "Freigabe Methode" #. module: share #: view:share.wizard:0 msgid "Share with these people (one e-mail per line)" -msgstr "" +msgstr "Freigabe für diese Personen (eine EMail pro Zeile)" #. module: share #: field:share.wizard,name:0 msgid "Share Title" -msgstr "" +msgstr "Freigabe Bezeichnung" #. module: share #: model:ir.module.category,name:share.module_category_share @@ -49,19 +49,21 @@ msgstr "Freigaben" #. module: share #: field:share.wizard,share_root_url:0 msgid "Share Access URL" -msgstr "" +msgstr "Freigabe Zugriffs URL" #. module: share #: code:addons/share/wizard/share_wizard.py:783 #, python-format msgid "You may use your current login (%s) and password to view them.\n" msgstr "" +"Sie können Ihre aktuelles Login (%s) und Passwort verwenden um dies zu " +"sehen.\n" #. module: share #: code:addons/share/wizard/share_wizard.py:602 #, python-format msgid "(Modified)" -msgstr "" +msgstr "(Verändert)" #. module: share #: code:addons/share/wizard/share_wizard.py:770 @@ -70,6 +72,8 @@ msgid "" "The documents are not attached, you can view them online directly on my " "OpenERP server at:" msgstr "" +"Die Dokumente sind nicht im Anhang, Sie können diese direkt in meinem " +"OpenERP System sehen." #. module: share #: code:addons/share/wizard/share_wizard.py:580 @@ -87,13 +91,15 @@ msgstr "Freigabe URL" #: code:addons/share/wizard/share_wizard.py:777 #, python-format msgid "These are your credentials to access this protected area:\n" -msgstr "" +msgstr "Dies sind Ihre Berechtigungen um den geschützten Bereich zu sehen\n" #. module: share #: code:addons/share/wizard/share_wizard.py:644 #, python-format msgid "You must be a member of the Share/User group to use the share wizard" msgstr "" +"Sie müssen ein Mitglied der Freigabe Benutzergruppe sein um den Freigabe " +"Assistenten verwenden zu können" #. module: share #: view:share.wizard:0 @@ -109,7 +115,7 @@ msgstr "Freigabe" #: code:addons/share/wizard/share_wizard.py:552 #, python-format msgid "(Duplicated for modified sharing permissions)" -msgstr "" +msgstr "(Duplikat für modifizierte Freigabe Berechtigungen)" #. module: share #: help:share.wizard,domain:0 @@ -124,7 +130,7 @@ msgstr "Sie können nicht zwei identische Benutzeranmeldungen definieren!" #. module: share #: model:ir.model,name:share.model_ir_model_access msgid "ir.model.access" -msgstr "" +msgstr "ir.model.access" #. module: share #: view:share.wizard:0 @@ -140,13 +146,13 @@ msgstr "Benutzername" #. module: share #: view:share.wizard:0 msgid "Sharing Options" -msgstr "" +msgstr "Freigabeoptionen" #. module: share #: code:addons/share/wizard/share_wizard.py:766 #, python-format msgid "Hello," -msgstr "" +msgstr "Hallo," #. module: share #: view:share.wizard:0 @@ -158,6 +164,8 @@ msgstr "Beenden" #, python-format msgid "Action and Access Mode are required to create a shared access" msgstr "" +"Aktion und Zutritt Methode sind notwendig um eine Freigabe Zugang zu " +"erzeugen." #. module: share #: view:share.wizard:0 @@ -175,6 +183,7 @@ msgid "" "The documents have been automatically added to your current OpenERP " "documents.\n" msgstr "" +"Die Dokumente wurden automatisch zu Ihren OpenERP Dokumenten hinzugefügt\n" #. module: share #: view:share.wizard:0 @@ -205,11 +214,13 @@ msgstr "" #: help:share.wizard,name:0 msgid "Title for the share (displayed to users as menu and shortcut name)" msgstr "" +"Bezeichnung der Freigabe (wird den Benutzern als Menü und Lesezeichen " +"angezeigt)" #. module: share #: view:share.wizard:0 msgid "Options" -msgstr "" +msgstr "Optionen" #. module: share #: view:res.groups:0 @@ -224,6 +235,9 @@ msgid "" "Sales, HR, etc.)\n" "It is open source and can be found on http://www.openerp.com." msgstr "" +"OpenERP ist eine mächtige und benutzerfreundliche Sammlung von " +"Geschäftsanwendungen ( CRM, Verkauf, Personal, etc)\n" +"Die Open Source Anwendungen sind unter http://www.openerp.com abrufbar." #. module: share #: field:share.wizard,action_id:0 @@ -233,7 +247,7 @@ msgstr "Freizugebende Aufgabe" #. module: share #: view:share.wizard:0 msgid "Optional: include a personal message" -msgstr "" +msgstr "Optional: fügen Sie eine persönliche Nachricht hinzu" #. module: share #: field:res.users,share:0 @@ -245,12 +259,15 @@ msgstr "Freizugebende Benutzer" #, python-format msgid "Please indicate the emails of the persons to share with, one per line" msgstr "" +"Bitte geben Sie die EMail Adressen der Personen an, für die die Freigabe " +"gelten soll,\r\n" +"eine Adresse je Zeile" #. module: share #: field:share.wizard,embed_code:0 #: field:share.wizard.result.line,user_id:0 msgid "unknown" -msgstr "" +msgstr "unbekannt" #. module: share #: help:res.groups,share:0 @@ -295,12 +312,12 @@ msgstr "Indirekter Freigabefilter des Benutzers %s (%s) für die Gruppe %s" #: code:addons/share/wizard/share_wizard.py:768 #, python-format msgid "I've shared %s with you!" -msgstr "" +msgstr "Ich habe %s fpr Sie freigegeben!" #. module: share #: help:share.wizard,share_root_url:0 msgid "Main access page for users that are granted shared access" -msgstr "" +msgstr "Haupt Seite für Benutzer die Freigabe erhalten haben" #. module: share #: sql_constraint:res.groups:0 @@ -310,7 +327,7 @@ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !" #. module: share #: model:res.groups,name:share.group_share_user msgid "User" -msgstr "" +msgstr "Benutzer" #. module: share #: view:res.groups:0 @@ -333,7 +350,7 @@ msgstr "" #. module: share #: view:share.wizard:0 msgid "Use this link" -msgstr "" +msgstr "Verwenden Sie diesen Link" #. module: share #: code:addons/share/wizard/share_wizard.py:780 @@ -361,19 +378,20 @@ msgstr "Kopierte Rechte für Nutzung" #. module: share #: model:ir.actions.act_window,name:share.action_share_wizard_step1 msgid "Share your documents" -msgstr "" +msgstr "Geben Sie Ihre Dokumente frei" #. module: share #: view:share.wizard:0 msgid "Or insert the following code where you want to embed your documents" msgstr "" +"Oder Fügen Sie diesen Code ein, wenn das Dokument eingebettet werden soll" #. module: share #: view:share.wizard:0 msgid "" "An e-mail notification with instructions has been sent to the following " "people:" -msgstr "" +msgstr "Eine EMail mit Anleitung wurde an folgende Personen versandt" #. module: share #: model:ir.model,name:share.model_share_wizard_result_line @@ -388,23 +406,25 @@ msgstr "Wählen Sie die Benutzer aus, für die Sie Daten freigeben wollen" #. module: share #: field:share.wizard,view_type:0 msgid "Current View Type" -msgstr "" +msgstr "aktueller Ansicht Typ" #. module: share #: selection:share.wizard,access_mode:0 msgid "Can view" -msgstr "" +msgstr "Kann sehen" #. module: share #: selection:share.wizard,access_mode:0 msgid "Can edit" -msgstr "" +msgstr "Kann verändern" #. module: share #: help:share.wizard,message:0 msgid "" "An optional personal message, to be included in the e-mail notification." msgstr "" +"Eine optionale persönliche Nachricht, die in der EMail Verständigung " +"gedruckt wird." #. module: share #: model:ir.model,name:share.model_res_users @@ -416,7 +436,7 @@ msgstr "res.users" #: code:addons/share/wizard/share_wizard.py:636 #, python-format msgid "Sharing access could not be created" -msgstr "" +msgstr "Freigabe konnte nicht erteilt werden." #. module: share #: help:res.users,share:0 @@ -436,7 +456,7 @@ msgstr "Freigabeassistent" #: code:addons/share/wizard/share_wizard.py:741 #, python-format msgid "Shared access created!" -msgstr "" +msgstr "Freigabe wurde erteilt!" #. module: share #: model:res.groups,comment:share.group_share_user @@ -445,6 +465,10 @@ msgid "" "Members of this groups have access to the sharing wizard, which allows them " "to invite external users to view or edit some of their documents." msgstr "" +"\n" +"Mitglieder dieser Gruppe können dern Freigabe Assistenten verwenden. Dieser " +"erlaubt externe Benutzer einzuladen, die dann die freigegebenen Dokumente " +"lesen und/oder bearbeiten können." #. module: share #: model:ir.model,name:share.model_res_groups @@ -461,23 +485,23 @@ msgstr "Passwort" #. module: share #: field:share.wizard,new_users:0 msgid "Emails" -msgstr "" +msgstr "E-Mails" #. module: share #: field:share.wizard,embed_option_search:0 msgid "Display search view" -msgstr "" +msgstr "Zeige Such Ansicht" #. module: share #: code:addons/share/wizard/share_wizard.py:198 #, python-format msgid "No e-mail address configured" -msgstr "" +msgstr "Keine EMail Adresse konfiguriert" #. module: share #: field:share.wizard,message:0 msgid "Personal Message" -msgstr "" +msgstr "Persönliche Nachricht" #. module: share #: code:addons/share/wizard/share_wizard.py:757 @@ -492,7 +516,7 @@ msgstr "" #. module: share #: field:share.wizard.result.line,login:0 msgid "Login" -msgstr "" +msgstr "Login" #. module: share #: view:res.users:0 @@ -507,7 +531,7 @@ msgstr "Zugriff" #. module: share #: view:share.wizard:0 msgid "Sharing: preparation" -msgstr "" +msgstr "Freigabe: Voerbereitung" #. module: share #: code:addons/share/wizard/share_wizard.py:199 @@ -516,11 +540,13 @@ msgid "" "You must configure your e-mail address in the user preferences before using " "the Share button." msgstr "" +"Sie müssen Ihre EMail-Adresse in Ihren Einstellungen definieren, bevor Sie " +"den Freigabe Schaltfläche verwenden können." #. module: share #: help:share.wizard,access_mode:0 msgid "Access rights to be granted on the shared documents." -msgstr "" +msgstr "Zugriffsrechte, die für die freigegebenen Dokumente vergeben werden" #, python-format #~ msgid "%s (Shared)" diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 393d50e3181..5b800b43050 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -48,6 +48,7 @@ Thanks to the double entry management, the inventory controlling is powerful and "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"], "depends" : ["product", "account"], "category" : "Warehouse Management", + "sequence": 16, "init_xml" : [], "demo_xml" : [ "stock_demo.xml", diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po index c6aa2fbf8e3..fef6bc55b4e 100644 --- a/addons/stock/i18n/de.po +++ b/addons/stock/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:54+0000\n" -"PO-Revision-Date: 2011-11-29 07:02+0000\n" +"PO-Revision-Date: 2012-01-15 09:16+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-24 05:40+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-16 05:18+0000\n" +"X-Generator: Launchpad (build 14664)\n" #. module: stock #: field:product.product,track_outgoing:0 @@ -25,7 +25,7 @@ msgstr "Verfolge Warenversand" #. module: stock #: model:ir.model,name:stock.model_stock_move_split_lines msgid "Stock move Split lines" -msgstr "" +msgstr "Lager Buchung Teile Zeilen" #. module: stock #: help:product.category,property_stock_account_input_categ:0 @@ -80,7 +80,7 @@ msgstr "Revisions Nummer" #. module: stock #: view:stock.move:0 msgid "Orders processed Today or planned for Today" -msgstr "" +msgstr "heutige Aufträge" #. module: stock #: view:stock.partial.move.line:0 @@ -128,7 +128,7 @@ msgstr "" #: code:addons/stock/wizard/stock_change_product_qty.py:87 #, python-format msgid "Quantity cannot be negative." -msgstr "" +msgstr "Menge darf nicht negativ sein" #. module: stock #: view:stock.picking:0 @@ -202,13 +202,13 @@ msgstr "Lagerjournal" #: view:report.stock.inventory:0 #: view:report.stock.move:0 msgid "Current month" -msgstr "" +msgstr "Aktueller Monat" #. module: stock #: code:addons/stock/wizard/stock_move.py:216 #, python-format msgid "Unable to assign all lots to this move!" -msgstr "" +msgstr "Kann nicht alle Lose zu dieser Buchung zuordnen" #. module: stock #: code:addons/stock/stock.py:2499 @@ -231,18 +231,18 @@ msgstr "Sie können keine Datensätze löschen!" #. module: stock #: view:stock.picking:0 msgid "Delivery orders to invoice" -msgstr "" +msgstr "Zu fakturierend Auslieferungsuafträge" #. module: stock #: view:stock.picking:0 msgid "Assigned Delivery Orders" -msgstr "" +msgstr "Ausleiferungsaufträge zuteilen" #. module: stock #: field:stock.partial.move.line,update_cost:0 #: field:stock.partial.picking.line,update_cost:0 msgid "Need cost update" -msgstr "" +msgstr "Benötige Kosten Update" #. module: stock #: code:addons/stock/wizard/stock_splitinto.py:49 @@ -317,7 +317,7 @@ msgstr "" #: view:stock.partial.move:0 #: view:stock.partial.picking:0 msgid "_Validate" -msgstr "" +msgstr "_Validiere" #. module: stock #: code:addons/stock/stock.py:1138 @@ -362,6 +362,8 @@ msgid "" "Can not create Journal Entry, Input Account defined on this product and " "Valuation account on category of this product are same." msgstr "" +"Sie können keinen Journaleintrag erzeugen da beide Konten (Eingangskonto, " +"Bestandskonto) dieser Kategorie ident sind." #. module: stock #: selection:stock.return.picking,invoice_state:0 @@ -371,7 +373,7 @@ msgstr "Keine Rechnungslegung" #. module: stock #: view:stock.move:0 msgid "Stock moves that have been processed" -msgstr "" +msgstr "Verarbeitete Lagerbuchungen" #. module: stock #: model:ir.model,name:stock.model_stock_production_lot @@ -398,7 +400,7 @@ msgstr "Lieferungen für dieses Paket" #. module: stock #: view:stock.picking:0 msgid "Incoming Shipments Available" -msgstr "" +msgstr "Verfügbare Wareneingänge" #. module: stock #: selection:report.stock.inventory,location_type:0 @@ -506,7 +508,7 @@ msgstr "Teile in" #. module: stock #: view:stock.location:0 msgid "Internal Locations" -msgstr "" +msgstr "Interne Läger" #. module: stock #: field:stock.move,price_currency_id:0 @@ -596,7 +598,7 @@ msgstr "Ziel" #. module: stock #: model:ir.model,name:stock.model_stock_partial_move_line msgid "stock.partial.move.line" -msgstr "" +msgstr "stock.partial.move.line" #. module: stock #: code:addons/stock/stock.py:771 @@ -655,7 +657,7 @@ msgstr "Lagerort / Produkt" #. module: stock #: field:stock.move,address_id:0 msgid "Destination Address " -msgstr "" +msgstr "Zieladresse " #. module: stock #: code:addons/stock/stock.py:1320 @@ -723,6 +725,7 @@ msgid "" "There is no inventory Valuation account defined on the product category: " "\"%s\" (id: %d)" msgstr "" +"Das Inventurkonto ist für dies Kategorie nicht definiert. \"%s\" (id: %d)" #. module: stock #: view:report.stock.move:0 @@ -811,7 +814,7 @@ msgstr "Verarbeite Lieferauftrag" #. module: stock #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Die Referenz muss je Firma eindeutig sein" #. module: stock #: code:addons/stock/product.py:419 @@ -838,7 +841,7 @@ msgstr "" #: code:addons/stock/product.py:75 #, python-format msgid "Valuation Account is not specified for Product Category: %s" -msgstr "" +msgstr "Das Bewertungskonto ist für diese Kategorie %s nicht definiert" #. module: stock #: field:stock.move,move_dest_id:0 @@ -907,7 +910,7 @@ msgstr "Ändere Produktanzahl" #. module: stock #: field:report.stock.inventory,month:0 msgid "unknown" -msgstr "" +msgstr "unbekannt" #. module: stock #: model:ir.model,name:stock.model_stock_inventory_merge @@ -971,7 +974,7 @@ msgstr "Suche Paket" #. module: stock #: view:stock.picking:0 msgid "Pickings already processed" -msgstr "" +msgstr "Lieferscheine Bereits verarbeitet" #. module: stock #: field:stock.partial.move.line,currency:0 @@ -1016,7 +1019,7 @@ msgstr "Lieferzeit (Tage)" #. module: stock #: model:ir.model,name:stock.model_stock_partial_move msgid "Partial Move Processing Wizard" -msgstr "" +msgstr "Assistent für Teillieferungen" #. module: stock #: model:ir.actions.act_window,name:stock.act_stock_product_location_open @@ -1075,7 +1078,7 @@ msgstr "Ansicht" #: view:report.stock.inventory:0 #: view:report.stock.move:0 msgid "Last month" -msgstr "" +msgstr "Letzter Monat" #. module: stock #: field:stock.location,parent_left:0 @@ -1091,7 +1094,7 @@ msgstr "Lagerbestandskonto" #: code:addons/stock/stock.py:1336 #, python-format msgid "is waiting." -msgstr "" +msgstr "ist unerledigt" #. module: stock #: constraint:product.product:0 @@ -1199,6 +1202,8 @@ msgid "" "In order to cancel this inventory, you must first unpost related journal " "entries." msgstr "" +"Um diese Inventur zu stornieren müssen zuerst die zugehörigen Buchungen " +"storniert werden." #. module: stock #: field:stock.picking,date_done:0 @@ -1208,7 +1213,7 @@ msgstr "Erledigt am" #. module: stock #: view:stock.move:0 msgid "Stock moves that are Available (Ready to process)" -msgstr "" +msgstr "Verfügbare Lagerbuchungen (zur Verarbeitung)" #. module: stock #: report:stock.picking.list:0 @@ -1275,7 +1280,7 @@ msgstr "Lagerort beim Partner" #: view:report.stock.inventory:0 #: view:report.stock.move:0 msgid "Current year" -msgstr "" +msgstr "Aktuelles Jahr" #. module: stock #: view:report.stock.inventory:0 @@ -1336,7 +1341,7 @@ msgstr "Lieferauftrag:" #. module: stock #: selection:stock.move,state:0 msgid "Waiting Another Move" -msgstr "" +msgstr "Erwarte eine andere Buchung" #. module: stock #: help:product.template,property_stock_production:0 @@ -1435,7 +1440,7 @@ msgstr "Von" #. module: stock #: view:stock.picking:0 msgid "Incoming Shipments already processed" -msgstr "" +msgstr "Eingangslieferungen bereits verarbeitet" #. module: stock #: code:addons/stock/wizard/stock_return_picking.py:99 @@ -1493,12 +1498,12 @@ msgstr "Typ" #. module: stock #: view:stock.picking:0 msgid "Available Pickings" -msgstr "" +msgstr "Verfügbare Lieferscheine" #. module: stock #: view:stock.move:0 msgid "Stock to be receive" -msgstr "" +msgstr "Erwartet Materialeingänge" #. module: stock #: help:stock.location,valuation_out_account_id:0 @@ -1549,7 +1554,7 @@ msgstr "Kundenlagerort" #. module: stock #: model:ir.model,name:stock.model_stock_inventory_line_split_lines msgid "Inventory Split lines" -msgstr "" +msgstr "Inventur Teilzeilen" #. module: stock #: model:ir.actions.report.xml,name:stock.report_location_overview @@ -1565,7 +1570,7 @@ msgstr "Allgemeine Informationen" #. module: stock #: view:report.stock.inventory:0 msgid "Analysis including future moves (similar to virtual stock)" -msgstr "" +msgstr "Analyse mit zukünftigen Buchungen" #. module: stock #: model:ir.actions.act_window,name:stock.action3 @@ -1726,7 +1731,7 @@ msgstr "Lager Statistik" #. module: stock #: view:report.stock.move:0 msgid "Month Planned" -msgstr "" +msgstr "Planungsmonat" #. module: stock #: field:product.product,track_production:0 @@ -1736,12 +1741,12 @@ msgstr "Verfolge Fertigung" #. module: stock #: view:stock.picking:0 msgid "Is a Back Order" -msgstr "" +msgstr "Ist Auftragsrückstand" #. module: stock #: field:stock.location,valuation_out_account_id:0 msgid "Stock Valuation Account (Outgoing)" -msgstr "" +msgstr "Lagerbewertungskonto (Ausgehend)" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_stock_move_open @@ -1785,7 +1790,7 @@ msgstr "Erzeugte Warenbewegung" #. module: stock #: field:stock.location,valuation_in_account_id:0 msgid "Stock Valuation Account (Incoming)" -msgstr "" +msgstr "Lagerbewertungskonto (Eingehend)" #. module: stock #: field:stock.report.tracklots,tracking_id:0 @@ -1795,7 +1800,7 @@ msgstr "Los Verfolgung" #. module: stock #: view:stock.picking:0 msgid "Confirmed Pickings" -msgstr "" +msgstr "Bestätigte Lieferscheine" #. module: stock #: view:product.product:0 @@ -1838,7 +1843,7 @@ msgstr "" #. module: stock #: view:report.stock.move:0 msgid "Day Planned" -msgstr "" +msgstr "Geplantes Datum" #. module: stock #: view:report.stock.inventory:0 @@ -1995,7 +2000,7 @@ msgstr "Inventur Bewertung" #. module: stock #: view:stock.move:0 msgid "Orders planned for today" -msgstr "" +msgstr "Für heute geplante Aufträge" #. module: stock #: view:stock.move:0 @@ -2037,6 +2042,8 @@ msgid "" "Can not create Journal Entry, Output Account defined on this product and " "Valuation account on category of this product are same." msgstr "" +"Kann keine Buchung erzeugen, da beide Konten (Bestand und Verbrauch) dieser " +"Kategorie ident sind" #. module: stock #: field:report.stock.move,day_diff1:0 @@ -2051,7 +2058,7 @@ msgstr "Preis" #. module: stock #: model:ir.model,name:stock.model_stock_return_picking_memory msgid "stock.return.picking.memory" -msgstr "" +msgstr "stock.return.picking.memory" #. module: stock #: view:stock.inventory:0 @@ -2138,7 +2145,7 @@ msgstr "Paket (Palette, Kiste, Paket...)" #. module: stock #: view:stock.location:0 msgid "Customer Locations" -msgstr "" +msgstr "Kunden Lagerort" #. module: stock #: view:stock.change.product.qty:0 @@ -2184,7 +2191,7 @@ msgstr "Erzeugung" #: view:report.stock.inventory:0 msgid "" "Analysis of current inventory (only moves that have already been processed)" -msgstr "" +msgstr "Analyse des aktuellen Bestandes (bereits verbuchte Buchungen)" #. module: stock #: field:stock.partial.move.line,cost:0 @@ -2202,7 +2209,7 @@ msgstr "Konto Wareneingang" #. module: stock #: view:report.stock.move:0 msgid "Shipping type specify, goods coming in or going out" -msgstr "" +msgstr "Lieferung, Wareneingang oder -ausgang" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt @@ -2270,7 +2277,7 @@ msgstr "Eingangslieferscheine" #: field:stock.partial.move.line,product_uom:0 #: field:stock.partial.picking.line,product_uom:0 msgid "Unit of Measure" -msgstr "Mengeneinheit" +msgstr "ME" #. module: stock #: code:addons/stock/product.py:175 @@ -2364,7 +2371,7 @@ msgstr "Liefertyp" #. module: stock #: view:stock.move:0 msgid "Stock moves that are Confirmed, Available or Waiting" -msgstr "" +msgstr "Lagerbuchungen bestätigt,verfügbar, wartend" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_location_open @@ -2403,7 +2410,7 @@ msgstr "Lagerort, wo das System die Fertigprodukte lagert." #. module: stock #: view:stock.move:0 msgid "Stock to be delivered (Available or not)" -msgstr "" +msgstr "Zu liefernde Produkte (verfügbar oder nicht)" #. module: stock #: view:board.board:0 @@ -2459,7 +2466,7 @@ msgstr "Anzahl" #. module: stock #: view:stock.picking:0 msgid "Internal Pickings to invoice" -msgstr "" +msgstr "zu fakturierende interne Lieferungen" #. module: stock #: view:stock.production.lot:0 @@ -2711,12 +2718,13 @@ msgstr "" #. module: stock #: model:stock.location,name:stock.stock_location_company msgid "Your Company" -msgstr "" +msgstr "Ihr Unternehmen" #. module: stock #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." msgstr "" +"Sie dürfen keine Sicht als Quelle oder Ziel einer Lagerbewegung angeben" #. module: stock #: help:stock.tracking,active:0 @@ -2886,7 +2894,7 @@ msgstr "Lieferbedingungen" #. module: stock #: model:ir.model,name:stock.model_stock_partial_picking_line msgid "stock.partial.picking.line" -msgstr "" +msgstr "stock.partial.picking.line" #. module: stock #: report:lot.stock.overview:0 @@ -3085,7 +3093,7 @@ msgstr "Rechnungslegung" #. module: stock #: view:stock.picking:0 msgid "Assigned Internal Moves" -msgstr "" +msgstr "Zugeordnete Interne Buchungen" #. module: stock #: code:addons/stock/stock.py:2365 @@ -3151,12 +3159,12 @@ msgstr "Produkte nach Kategorien" #. module: stock #: selection:stock.picking,state:0 msgid "Waiting Another Operation" -msgstr "" +msgstr "Wartet auf anderen Vorgang" #. module: stock #: view:stock.location:0 msgid "Supplier Locations" -msgstr "" +msgstr "Lieferanten Lager" #. module: stock #: field:stock.partial.move.line,wizard_id:0 @@ -3168,7 +3176,7 @@ msgstr "Assistent" #. module: stock #: view:report.stock.move:0 msgid "Completed Stock-Moves" -msgstr "" +msgstr "Abgeschlossene Lagerbuchungen" #. module: stock #: model:ir.actions.act_window,name:stock.action_view_stock_location_product @@ -3208,7 +3216,7 @@ msgstr "Auftrag" #. module: stock #: view:product.product:0 msgid "Cost Price :" -msgstr "" +msgstr "Standard Preis:" #. module: stock #: field:stock.tracking,name:0 @@ -3227,7 +3235,7 @@ msgstr "Quelle" #. module: stock #: view:stock.move:0 msgid " Waiting" -msgstr "" +msgstr " Wartend" #. module: stock #: view:product.template:0 @@ -3237,13 +3245,13 @@ msgstr "Buchungen" #. module: stock #: model:res.groups,name:stock.group_stock_manager msgid "Manager" -msgstr "" +msgstr "Manager" #. module: stock #: view:stock.move:0 #: view:stock.picking:0 msgid "Unit Of Measure" -msgstr "Mengeneinheit" +msgstr "ME" #. module: stock #: report:stock.picking.list:0 @@ -3349,7 +3357,7 @@ msgstr "Begründung" #. module: stock #: model:ir.model,name:stock.model_stock_partial_picking msgid "Partial Picking Processing Wizard" -msgstr "" +msgstr "Assistent für Teillieferungen" #. module: stock #: model:ir.actions.act_window,help:stock.action_production_lot_form @@ -3438,7 +3446,7 @@ msgstr "Abgebrochen" #. module: stock #: view:stock.picking:0 msgid "Confirmed Delivery Orders" -msgstr "" +msgstr "Bestätigte Auslieferungsaufträge" #. module: stock #: view:stock.move:0 @@ -3517,7 +3525,7 @@ msgstr "Warenauslieferung" #. module: stock #: view:stock.picking:0 msgid "Delivery orders already processed" -msgstr "" +msgstr "Erledigte Auslieferungsaufträge" #. module: stock #: help:res.partner,property_stock_customer:0 @@ -3579,7 +3587,7 @@ msgstr "Zugehörige Lieferaufträge" #. module: stock #: view:report.stock.move:0 msgid "Year Planned" -msgstr "" +msgstr "Jahr geplant" #. module: stock #: view:report.stock.move:0 @@ -3590,7 +3598,7 @@ msgstr "Gesamte Warenausgangsmenge" #: selection:stock.move,state:0 #: selection:stock.picking,state:0 msgid "New" -msgstr "" +msgstr "Neu" #. module: stock #: help:stock.partial.move.line,cost:0 @@ -3626,7 +3634,7 @@ msgstr "Menge, die in aktuellem Paket belassen wird" #. module: stock #: view:stock.move:0 msgid "Stock available to be delivered" -msgstr "" +msgstr "Auslieferbarer Lagerbestand" #. module: stock #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping @@ -3637,7 +3645,7 @@ msgstr "Erzeuge Rechnung" #. module: stock #: view:stock.picking:0 msgid "Confirmed Internal Moves" -msgstr "" +msgstr "Bestätigte Interne Buchungen" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_configuration @@ -3694,7 +3702,7 @@ msgstr "Kundenlagerort" #: selection:stock.move,state:0 #: selection:stock.picking,state:0 msgid "Waiting Availability" -msgstr "" +msgstr "Warten auf Verfügbarkeit" #. module: stock #: code:addons/stock/stock.py:1334 @@ -3710,7 +3718,7 @@ msgstr "Lagerbestandsaufnahme Einzelpositionen" #. module: stock #: view:stock.move:0 msgid "Waiting " -msgstr "" +msgstr "Wartend " #. module: stock #: code:addons/stock/product.py:429 @@ -3758,7 +3766,7 @@ msgstr "Dezember" #. module: stock #: view:stock.production.lot:0 msgid "Available Product Lots" -msgstr "" +msgstr "Verfügbare Produktionslose" #. module: stock #: model:ir.actions.act_window,help:stock.action_move_form2 @@ -3901,7 +3909,7 @@ msgstr "Setze auf Null" #. module: stock #: model:res.groups,name:stock.group_stock_user msgid "User" -msgstr "" +msgstr "Benutzer" #. module: stock #: code:addons/stock/wizard/stock_invoice_onshipping.py:98 @@ -4127,7 +4135,7 @@ msgstr "" #. module: stock #: view:report.stock.move:0 msgid "Future Stock-Moves" -msgstr "" +msgstr "Zukünftige Lagerbewegungen" #. module: stock #: model:ir.model,name:stock.model_stock_move_split @@ -4251,16 +4259,18 @@ msgid "" "By default, the pack reference is generated following the sscc standard. " "(Serial number + 1 check digit)" msgstr "" +"Standardmäßig werden die Verpackungsreferenzen nach dem SSCC Standard " +"generiert (Serial Nummer + 1 Prüfziffer)" #. module: stock #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen." #. module: stock #: constraint:product.category:0 msgid "Error ! You cannot create recursive categories." -msgstr "" +msgstr "Fehler! Rekursive Kategorien sind nicht zulässig" #. module: stock #: help:stock.move,move_dest_id:0 @@ -4284,7 +4294,7 @@ msgstr "Physikalische Lagerorte" #: view:stock.picking:0 #: selection:stock.picking,state:0 msgid "Ready to Process" -msgstr "" +msgstr "Bereit zur Verarbeitung" #. module: stock #: help:stock.location,posx:0 diff --git a/addons/stock/product.py b/addons/stock/product.py index a6198ef83a3..304fa8dcd87 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -184,6 +184,7 @@ class product_product(osv.osv): location_obj = self.pool.get('stock.location') warehouse_obj = self.pool.get('stock.warehouse') + shop_obj = self.pool.get('sale.shop') states = context.get('states',[]) what = context.get('what',()) @@ -193,18 +194,15 @@ class product_product(osv.osv): if not ids: return res - # TODO: write in more ORM way, less queries, more pg84 magic if context.get('shop', False): - cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),)) - res2 = cr.fetchone() - if res2: - context['warehouse'] = res2[0] + warehouse_id = shop_obj.read(cr, uid, int(context['shop']), ['warehouse_id'])['warehouse_id'][0] + if warehouse_id: + context['warehouse'] = warehouse_id if context.get('warehouse', False): - cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),)) - res2 = cr.fetchone() - if res2: - context['location'] = res2[0] + lot_id = warehouse_obj.read(cr, uid, int(context['warehouse']), ['lot_stock_id'])['lot_stock_id'][0] + if lot_id: + context['location'] = lot_id if context.get('location', False): if type(context['location']) == type(1): diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index db5352f3162..bded802dfe6 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -145,8 +145,8 @@

    -
  • Stock on hand:
    • -
  • Stock available:
    • +
  • Stock on hand:
    • +
  • Stock available:
  • Price:
  • Cost:
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 2949f53b117..4f320ab58a9 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -141,7 +141,7 @@ form tree,graph - {'full':'1','contact_display': 'partner','search_default_done':1,'search_default_year':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,} + {'contact_display': 'partner','search_default_done':1,'search_default_year':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,} Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance. diff --git a/addons/stock/stock.py b/addons/stock/stock.py index cd9242c6b1f..e9928eb0aa7 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -74,35 +74,22 @@ class stock_location(osv.osv): _order = 'parent_left' def name_get(self, cr, uid, ids, context=None): - res = [] - if context is None: - context = {} - if not len(ids): - return [] - reads = self.read(cr, uid, ids, ['name','location_id'], context=context) - for record in reads: - name = record['name'] - if context.get('full',False): - if record['location_id']: - name = record['location_id'][1] + ' / ' + name - res.append((record['id'], name)) - else: - res.append((record['id'], name)) - return res + # always return the full hierarchical name + res = self._complete_name(cr, uid, ids, 'complete_name', None, context=context) + return res.items() def _complete_name(self, cr, uid, ids, name, args, context=None): """ Forms complete name of location from parent location to child location. @return: Dictionary of values """ - def _get_one_full_name(location, level=4): - if location.location_id: - parent_path = _get_one_full_name(location.location_id, level-1) + "/" - else: - parent_path = '' - return parent_path + location.name res = {} for m in self.browse(cr, uid, ids, context=context): - res[m.id] = _get_one_full_name(m) + names = [m.name] + parent = m.location_id + while parent: + names.append(parent.name) + parent = parent.location_id + res[m.id] = ' / '.join(reversed(names)) return res @@ -529,9 +516,8 @@ class stock_tracking(osv.osv): @param context: A standard dictionary @return: A dictionary of values """ - value={} - value=self.pool.get('action.traceability').action_traceability(cr,uid,ids,context) - return value + return self.pool.get('action.traceability').action_traceability(cr,uid,ids,context) + stock_tracking() #---------------------------------------------------------- @@ -2613,6 +2599,13 @@ class stock_inventory(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c) } + def copy(self, cr, uid, id, default=None, context=None): + if default is None: + default = {} + default = default.copy() + default.update({'move_ids': [], 'date_done': False}) + return super(stock_inventory, self).copy(cr, uid, id, default, context=context) + def _inventory_line_hook(self, cr, uid, inventory_line, move_vals): """ Creates a stock move from an inventory line @param inventory_line: diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 2ba44fb6e97..4ed57da90a5 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -186,7 +186,6 @@ stock.inventory form - {'full':'1'} Periodical Inventories are used to count the number of products available per location. You can use it once a year when you do the general inventory or whenever you need it, to correct the current stock level of a product. @@ -217,9 +216,9 @@