From 680214c47e80f30d2fd62cd56dfd6169dd9f2fbb Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 13 Aug 2014 22:59:13 +0200 Subject: [PATCH 1/5] [FIX] tools.translate: when loading entries from a PO file, use also the POT. On Launchpad, as commented on bug 933496, PO entries (and their comments) are shared between series. This mean that e.g. the 7.0 series can have the wrong `reference` comments (those beginning with #:) as they would be copied from say the trunk series. Those `reference` comments are used to import translations and look them up. This patch adds a few lines of code to tools.translate so that targets defined in the POT `reference` comments are used in addition to those from the PO file. Also adds a test module to validate the new behavior. This patch stems from: - the 6.1 branch by Vo Minh Thu: https://code.launchpad.net/+branch/~openerp-dev/openobject-server/6.1-fix-po-targets-933496-vmt - the 7.0 port by Numerigraphe: https://code.launchpad.net/~numerigraphe-team/openobject-server/7.0-fix-po-targets-933496-vmt --- .../test_translation_import/__init__.py | 2 + .../test_translation_import/__openerp__.py | 15 +++++ .../addons/test_translation_import/i18n/fr.po | 52 ++++++++++++++ .../i18n/test_translation_import.pot | 58 ++++++++++++++++ .../addons/test_translation_import/models.py | 20 ++++++ .../addons/test_translation_import/tests.yml | 13 ++++ .../test_translation_import/tests/__init__.py | 9 +++ .../tests/test_term_count.py | 16 +++++ .../addons/test_translation_import/view.xml | 23 +++++++ openerp/tools/translate.py | 67 +++++++++++++++++-- 10 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 openerp/tests/addons/test_translation_import/__init__.py create mode 100644 openerp/tests/addons/test_translation_import/__openerp__.py create mode 100644 openerp/tests/addons/test_translation_import/i18n/fr.po create mode 100644 openerp/tests/addons/test_translation_import/i18n/test_translation_import.pot create mode 100644 openerp/tests/addons/test_translation_import/models.py create mode 100644 openerp/tests/addons/test_translation_import/tests.yml create mode 100644 openerp/tests/addons/test_translation_import/tests/__init__.py create mode 100644 openerp/tests/addons/test_translation_import/tests/test_term_count.py create mode 100644 openerp/tests/addons/test_translation_import/view.xml diff --git a/openerp/tests/addons/test_translation_import/__init__.py b/openerp/tests/addons/test_translation_import/__init__.py new file mode 100644 index 0000000000000..89d26e2f59742 --- /dev/null +++ b/openerp/tests/addons/test_translation_import/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +import models diff --git a/openerp/tests/addons/test_translation_import/__openerp__.py b/openerp/tests/addons/test_translation_import/__openerp__.py new file mode 100644 index 0000000000000..29c3c59639648 --- /dev/null +++ b/openerp/tests/addons/test_translation_import/__openerp__.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +{ + 'name': 'test-translation-import', + 'version': '0.1', + 'category': 'Tests', + 'description': """A module to test translation import.""", + 'author': 'OpenERP SA', + 'maintainer': 'OpenERP SA', + 'website': 'http://www.openerp.com', + 'depends': ['base'], + 'data': ['view.xml'], + 'test': ['tests.yml'], + 'installable': True, + 'auto_install': False, +} diff --git a/openerp/tests/addons/test_translation_import/i18n/fr.po b/openerp/tests/addons/test_translation_import/i18n/fr.po new file mode 100644 index 0000000000000..f179cc1eefd5c --- /dev/null +++ b/openerp/tests/addons/test_translation_import/i18n/fr.po @@ -0,0 +1,52 @@ +# This is a test PO file, not a true french translation. +# See the POT file for further information. +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-10-17 12:36+0000\n" +"PO-Revision-Date: 2012-10-17 12:36+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +# Note: there is normally an additional line: +# #: code:addons/test_translation_import/models.py:17 +# This line is present in the POT and removed here to test the translation +# import behavior. +#. module: test_translation_import +#: field:test.translation.import,name:0 +#, python-format +msgid "1XBUO5PUYH2RYZSA1FTLRYS8SPCNU1UYXMEYMM25ASV7JC2KTJZQESZYRV9L8CGB" +msgstr "1XBUO5PUYH2RYZSA1FTLRYS8SPCNU1UYXMEYMM25ASV7JC2KTJZQESZYRV9L8CGB in french" + +#. module: test_translation_import +#: code:addons/test_translation_import/models.py:14 +#, python-format +msgid "Ijkl" +msgstr "Ijkl in french" + +#. module: test_translation_import +#: model:ir.model,name:test_translation_import.model_test_translation_import +msgid "test.translation.import" +msgstr "test.translation.import in french" + +#. module: test_translation_import +#: help:test.translation.import,name:0 +msgid "Efgh" +msgstr "Efgh in french" + +#. module: test_translation_import +#: model:ir.actions.act_window,name:test_translation_import.action_test_translation_import +#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import +msgid "Test translation import" +msgstr "Test translation import in french" + +#. module: test_translation_import +#: model:ir.ui.menu,name:test_translation_import.menu_test_translation +msgid "Test translation" +msgstr "Test translation in french" + diff --git a/openerp/tests/addons/test_translation_import/i18n/test_translation_import.pot b/openerp/tests/addons/test_translation_import/i18n/test_translation_import.pot new file mode 100644 index 0000000000000..034fa5254dc6b --- /dev/null +++ b/openerp/tests/addons/test_translation_import/i18n/test_translation_import.pot @@ -0,0 +1,58 @@ +# This is a test POT file, not a true template. It is manually maintained +# to test the import translation behavior of OpenERP. +# +# In particular, the +# `1XBUO5PUYH2RYZSA1FTLRYS8SPCNU1UYXMEYMM25ASV7JC2KTJZQESZYRV9L8CGB` source is +# given with two targets (the #: comments): `code` and `field`. The code one is +# removed in the fr.po file. Still, the import should generate a database entry +# for the `code` one. I.e. the targets defined in the POT must be added to the +# targets defined in the PO file. This was done to fix a bug, as reported by +# lp:933496. +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-10-17 12:36+0000\n" +"PO-Revision-Date: 2012-10-17 12:36+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: test_translation_import +#: code:addons/test_translation_import/models.py:17 +#: field:test.translation.import,name:0 +#, python-format +msgid "1XBUO5PUYH2RYZSA1FTLRYS8SPCNU1UYXMEYMM25ASV7JC2KTJZQESZYRV9L8CGB" +msgstr "" + +#. module: test_translation_import +#: code:addons/test_translation_import/models.py:14 +#, python-format +msgid "Ijkl" +msgstr "" + +#. module: test_translation_import +#: model:ir.model,name:test_translation_import.model_test_translation_import +msgid "test.translation.import" +msgstr "" + +#. module: test_translation_import +#: help:test.translation.import,name:0 +msgid "Efgh" +msgstr "" + +#. module: test_translation_import +#: model:ir.actions.act_window,name:test_translation_import.action_test_translation_import +#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import +msgid "Test translation import" +msgstr "" + +#. module: test_translation_import +#: model:ir.ui.menu,name:test_translation_import.menu_test_translation +msgid "Test translation" +msgstr "" + diff --git a/openerp/tests/addons/test_translation_import/models.py b/openerp/tests/addons/test_translation_import/models.py new file mode 100644 index 0000000000000..3dc3f1c71ccf9 --- /dev/null +++ b/openerp/tests/addons/test_translation_import/models.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +import openerp +from openerp.tools.translate import _ + +class m(openerp.osv.orm.TransientModel): + """ A model to provide source strings. + """ + _name = 'test.translation.import' + + _columns = { + 'name': openerp.osv.fields.char( + '1XBUO5PUYH2RYZSA1FTLRYS8SPCNU1UYXMEYMM25ASV7JC2KTJZQESZYRV9L8CGB', + size=32, help='Efgh'), + } + + _('Ijkl') + + # With the name label above, this source string should be generated twice. + _('1XBUO5PUYH2RYZSA1FTLRYS8SPCNU1UYXMEYMM25ASV7JC2KTJZQESZYRV9L8CGB') + diff --git a/openerp/tests/addons/test_translation_import/tests.yml b/openerp/tests/addons/test_translation_import/tests.yml new file mode 100644 index 0000000000000..8ccae43f6eefd --- /dev/null +++ b/openerp/tests/addons/test_translation_import/tests.yml @@ -0,0 +1,13 @@ +- + Load the french translation. +- + !python {model: ir.translation }: | + import openerp + openerp.tools.trans_load(cr, 'test_translation_import/i18n/fr.po', 'fr_FR', verbose=False) +- + Assert we have loaded the correct number of entries for the given source string. +- + !python {model: ir.translation }: | + ids = self.search(cr, uid, + [('src', '=', '1XBUO5PUYH2RYZSA1FTLRYS8SPCNU1UYXMEYMM25ASV7JC2KTJZQESZYRV9L8CGB')]) + assert len(ids) == 2, "2 entries are expected, got %s instead." % len(ids) diff --git a/openerp/tests/addons/test_translation_import/tests/__init__.py b/openerp/tests/addons/test_translation_import/tests/__init__.py new file mode 100644 index 0000000000000..09e712b0f8099 --- /dev/null +++ b/openerp/tests/addons/test_translation_import/tests/__init__.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +import unittest2 + +import test_term_count + +suite = [ + test_term_count + ] + diff --git a/openerp/tests/addons/test_translation_import/tests/test_term_count.py b/openerp/tests/addons/test_translation_import/tests/test_term_count.py new file mode 100644 index 0000000000000..2d065b05f18d3 --- /dev/null +++ b/openerp/tests/addons/test_translation_import/tests/test_term_count.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +import openerp +from openerp.tests import common + +class TestTermCount(common.TransactionCase): + + def test_count_term(self): + """ + Just make sure we have as many translation entries as we wanted. + """ + openerp.tools.trans_load(self.cr, 'test_translation_import/i18n/fr.po', 'fr_FR', verbose=False) + ids = self.registry('ir.translation').search(self.cr, self.uid, + [('src', '=', '1XBUO5PUYH2RYZSA1FTLRYS8SPCNU1UYXMEYMM25ASV7JC2KTJZQESZYRV9L8CGB')]) + self.assertEqual(len(ids), 2) + diff --git a/openerp/tests/addons/test_translation_import/view.xml b/openerp/tests/addons/test_translation_import/view.xml new file mode 100644 index 0000000000000..2fb26fbbdc5b9 --- /dev/null +++ b/openerp/tests/addons/test_translation_import/view.xml @@ -0,0 +1,23 @@ + + + + + + Test translation import + ir.actions.act_window + test.translation.import + form + tree,form + current + + + + + + + + + diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index b3bea678cf86d..529f3b916c4c1 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -313,6 +313,10 @@ def next(self): if not line.startswith('module:'): comments.append(line) elif line.startswith('#:'): + # Process the `reference` comments. Each line can specify + # multiple targets (e.g. model, view, code, selection, + # ...). For each target, we will return an additional + # entry. for lpart in line[2:].strip().split(' '): trans_info = lpart.strip().split(':',2) if trans_info and len(trans_info) == 2: @@ -362,6 +366,9 @@ def next(self): line = self.lines.pop(0).strip() if targets and not fuzzy: + # Use the first target for the current entry (returned at the + # end of this next() call), and keep the others to generate + # additional entries (returned the next next() calls). trans_type, name, res_id = targets.pop(0) for t, n, r in targets: if t == trans_type == 'code': continue @@ -945,6 +952,10 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True, # lets create the language with locale information lang_obj.load_lang(cr, SUPERUSER_ID, lang=lang, lang_name=lang_name) + # Parse also the POT: it will possibly provide additional targets. + # (Because the POT comments are correct on Launchpad but not the + # PO comments due to a Launchpad limitation. See LP bug 933496.) + pot_reader = [] # now, the serious things: we read the language file fileobj.seek(0) @@ -957,19 +968,42 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True, elif fileformat == 'po': reader = TinyPoFile(fileobj) f = ['type', 'name', 'res_id', 'src', 'value', 'comments'] + + # Make a reader for the POT file and be somewhat defensive for the + # stable branch. + if fileobj.name.endswith('.po'): + try: + # Normally the path looks like /path/to/xxx/i18n/lang.po + # and we try to find the corresponding + # /path/to/xxx/i18n/xxx.pot file. + head, _ = os.path.split(fileobj.name) + head2, _ = os.path.split(head) + head3, tail3 = os.path.split(head2) + pot_handle = misc.file_open(os.path.join(head3, tail3, 'i18n', tail3 + '.pot')) + pot_reader = TinyPoFile(pot_handle) + except: + pass + else: _logger.error('Bad file format: %s', fileformat) raise Exception(_('Bad file format')) + # Read the POT `reference` comments, and keep them indexed by source + # string. + pot_targets = {} + for type, name, res_id, src, _, comments in pot_reader: + if type is not None: + pot_targets.setdefault(src, {'value': None, 'targets': []}) + pot_targets[src]['targets'].append((type, name, res_id)) + # read the rest of the file - line = 1 irt_cursor = trans_obj._get_import_cursor(cr, SUPERUSER_ID, context=context) - for row in reader: - line += 1 + def process_row(row): + """Process a single PO (or POT) entry.""" # skip empty rows and rows where the translation field (=last fiefd) is empty #if (not row) or (not row[-1]): - # continue + # return # dictionary which holds values for this line of the csv file # {'lang': ..., 'type': ..., 'name': ..., 'res_id': ..., @@ -979,9 +1013,17 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True, for i, field in enumerate(f): dic[field] = row[i] + # Get the `reference` comments from the POT. + src = row[3] + if pot_reader and src in pot_targets: + pot_targets[src]['targets'] = filter(lambda x: x != row[:3], pot_targets[src]['targets']) + pot_targets[src]['value'] = row[4] + if not pot_targets[src]['targets']: + del pot_targets[src] + # This would skip terms that fail to specify a res_id if not dic.get('res_id'): - continue + return res_id = dic.pop('res_id') if res_id and isinstance(res_id, (int, long)) \ @@ -1002,6 +1044,21 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True, irt_cursor.push(dic) + # First process the entries from the PO file (doing so also fills/removes + # the entries from the POT file). + for row in reader: + process_row(row) + + # Then process the entries implied by the POT file (which is more + # correct w.r.t. the targets) if some of them remain. + pot_rows = [] + for src in pot_targets: + value = pot_targets[src]['value'] + for type, name, res_id in pot_targets[src]['targets']: + pot_rows.append((type, name, res_id, src, value, comments)) + for row in pot_rows: + process_row(row) + irt_cursor.finish() trans_obj.clear_caches() if verbose: From 69eef5ac8d3f446f3f529dc04c63deffde3591d3 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 14 Aug 2014 02:07:59 +0200 Subject: [PATCH 2/5] [FIX] tools.translate: addons path resolution failed with duplicates When the addons_path config contained the default path, the system was working with an empty addons_path in the middle of the other paths. This empty one matched for all files, making all files appear to belong to the root path component, e.g. `home` if the root path is in /home. Refactored a bit to avoid duplicates and redundant path calculations. --- openerp/tools/translate.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index 529f3b916c4c1..721fb47d9a3b4 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -827,18 +827,20 @@ def push_local_constraints(module, model, cons_type='sql_constraints'): if model_obj._sql_constraints: push_local_constraints(module, model_obj, 'sql_constraints') - def get_module_from_path(path, mod_paths=None): - if not mod_paths: - # First, construct a list of possible paths - def_path = os.path.abspath(os.path.join(config.config['root_path'], 'addons')) # default addons path (base) - ad_paths= map(lambda m: os.path.abspath(m.strip()),config.config['addons_path'].split(',')) - mod_paths=[def_path] - for adp in ad_paths: - mod_paths.append(adp) - if not os.path.isabs(adp): - mod_paths.append(adp) - elif adp.startswith(def_path): - mod_paths.append(adp[len(def_path)+1:]) + def get_module_paths(): + # default addons path (base) + def_path = os.path.abspath(os.path.join(config.config['root_path'], 'addons')) + mod_paths = { def_path } + ad_paths = map(lambda m: os.path.abspath(m.strip()),config.config['addons_path'].split(',')) + for adp in ad_paths: + mod_paths.add(adp) + if not os.path.isabs(adp): + mod_paths.add(adp) + elif adp != def_path and adp.startswith(def_path): + mod_paths.add(adp[len(def_path)+1:]) + return mod_paths + + def get_module_from_path(path, mod_paths): for mp in mod_paths: if path.startswith(mp) and (os.path.dirname(path) != mp): path = path[len(mp)+1:] @@ -863,7 +865,7 @@ def get_module_from_path(path, mod_paths=None): _logger.debug("Scanning modules at paths: %s", path_list) - mod_paths = [] + mod_paths = get_module_paths() def verified_module_filepaths(fname, path, root): fabsolutepath = join(root, fname) From 96c36e895c76b22df774091fe41a15cdbf34da6b Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 14 Aug 2014 02:24:06 +0200 Subject: [PATCH 3/5] [I18N] Update all 7.0 translation templates with latest terms and annotations Total new terms: 168 Total deleted terms: 95 Total identical terms: 16329 (Some modules skipped, typically all l10n_* modules) --- addons/account/i18n/account.pot | 626 ++++++------ .../i18n/account_analytic_analysis.pot | 8 +- .../i18n/account_analytic_plans.pot | 32 +- addons/account_budget/i18n/account_budget.pot | 8 +- .../account_payment/i18n/account_payment.pot | 6 +- .../account_voucher/i18n/account_voucher.pot | 52 +- addons/analytic/i18n/analytic.pot | 24 +- .../i18n/analytic_user_function.pot | 20 +- addons/audittrail/i18n/audittrail.pot | 8 +- addons/auth_oauth/i18n/auth_oauth.pot | 40 +- addons/auth_signup/i18n/auth_signup.pot | 36 +- addons/base_calendar/i18n/base_calendar.pot | 28 +- addons/base_import/i18n/base_import.pot | 105 +- addons/base_status/i18n/base_status.pot | 19 +- addons/base_vat/i18n/base_vat.pot | 14 +- addons/crm/i18n/crm.pot | 57 +- addons/crm_claim/i18n/crm_claim.pot | 24 +- addons/crm_helpdesk/i18n/crm_helpdesk.pot | 6 +- addons/delivery/i18n/delivery.pot | 56 +- addons/document/i18n/document.pot | 22 +- addons/document_page/i18n/document_page.pot | 11 +- addons/edi/i18n/edi.pot | 6 +- addons/email_template/i18n/email_template.pot | 32 +- addons/event/i18n/event.pot | 20 +- addons/event_sale/i18n/event_sale.pot | 6 +- addons/fleet/i18n/fleet.pot | 18 +- addons/hr/i18n/hr.pot | 16 +- addons/hr_attendance/i18n/hr_attendance.pot | 16 +- addons/hr_expense/i18n/hr_expense.pot | 32 +- addons/hr_holidays/i18n/hr_holidays.pot | 65 +- addons/hr_payroll/i18n/hr_payroll.pot | 43 +- .../i18n/hr_payroll_account.pot | 18 +- addons/hr_recruitment/i18n/hr_recruitment.pot | 16 +- .../i18n/hr_timesheet_invoice.pot | 33 +- .../i18n/hr_timesheet_sheet.pot | 98 +- addons/idea/i18n/idea.pot | 10 +- addons/lunch/i18n/lunch.pot | 16 +- addons/mail/i18n/mail.pot | 186 ++-- .../i18n/marketing_campaign.pot | 16 +- addons/mrp/i18n/mrp.pot | 89 +- addons/mrp_operations/i18n/mrp_operations.pot | 40 +- addons/mrp_repair/i18n/mrp_repair.pot | 56 +- addons/pad/i18n/pad.pot | 30 +- addons/plugin/i18n/plugin.pot | 12 +- addons/point_of_sale/i18n/point_of_sale.pot | 240 ++--- addons/portal/i18n/portal.pot | 87 +- addons/portal_claim/i18n/portal_claim.pot | 9 +- addons/portal_crm/i18n/portal_crm.pot | 54 +- addons/portal_sale/i18n/portal_sale.pot | 26 +- addons/procurement/i18n/procurement.pot | 68 +- addons/product/i18n/product.pot | 78 +- .../i18n/product_visible_discount.pot | 37 +- addons/project/i18n/project.pot | 52 +- addons/project_gtd/i18n/project_gtd.pot | 20 +- addons/project_issue/i18n/project_issue.pot | 20 +- addons/project_mrp/i18n/project_mrp.pot | 5 +- .../i18n/project_timesheet.pot | 62 +- addons/purchase/i18n/purchase.pot | 252 ++--- .../i18n/purchase_analytic_plans.pot | 9 +- .../i18n/purchase_requisition.pot | 8 +- addons/report_webkit/i18n/report_webkit.pot | 34 +- addons/sale/i18n/sale.pot | 141 +-- addons/sale_crm/i18n/sale_crm.pot | 16 +- addons/sale_mrp/i18n/sale_mrp.pot | 25 +- addons/sale_stock/i18n/sale_stock.pot | 57 +- addons/sale_stock/sale_stock_view.xml | 2 +- addons/share/i18n/share.pot | 22 +- addons/stock/i18n/stock.pot | 285 +++--- addons/subscription/i18n/subscription.pot | 46 +- addons/survey/i18n/survey.pot | 292 ++++-- addons/warning/i18n/warning.pot | 31 +- addons/web/i18n/web.pot | 770 +++++++-------- addons/web_calendar/i18n/web_calendar.pot | 60 +- addons/web_graph/i18n/web_graph.pot | 13 +- addons/web_kanban/i18n/web_kanban.pot | 20 +- openerp/addons/base/i18n/base.pot | 904 ++++++++++-------- 76 files changed, 3169 insertions(+), 2652 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 9d3c0d1625638..8f809a517c809 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-06-14 22:29+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -74,9 +74,9 @@ msgid "Import from invoice or payment" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1058 -#: code:addons/account/account_move_line.py:1143 -#: code:addons/account/account_move_line.py:1210 +#: code:addons/account/account_move_line.py:1069 +#: code:addons/account/account_move_line.py:1154 +#: code:addons/account/account_move_line.py:1221 #, python-format msgid "Bad Account!" msgstr "" @@ -122,18 +122,22 @@ msgid "If the active field is set to False, it will allow you to hide the paymen msgstr "" #. module: account -#: code:addons/account/account.py:641 -#: code:addons/account/account.py:686 -#: code:addons/account/account.py:781 -#: code:addons/account/account.py:1058 -#: code:addons/account/account_invoice.py:820 -#: code:addons/account/account_invoice.py:823 -#: code:addons/account/account_invoice.py:826 -#: code:addons/account/account_invoice.py:1545 +#: code:addons/account/account.py:650 +#: code:addons/account/account.py:662 +#: code:addons/account/account.py:665 +#: code:addons/account/account.py:695 +#: code:addons/account/account.py:790 +#: code:addons/account/account.py:1033 +#: code:addons/account/account.py:1052 +#: code:addons/account/account_invoice.py:827 +#: code:addons/account/account_invoice.py:830 +#: code:addons/account/account_invoice.py:833 +#: code:addons/account/account_invoice.py:1554 #: code:addons/account/account_move_line.py:98 -#: code:addons/account/account_move_line.py:771 -#: code:addons/account/account_move_line.py:824 -#: code:addons/account/account_move_line.py:864 +#: code:addons/account/account_move_line.py:777 +#: code:addons/account/account_move_line.py:830 +#: code:addons/account/account_move_line.py:869 +#: code:addons/account/account_move_line.py:1033 #: code:addons/account/wizard/account_fiscalyear_close.py:62 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 @@ -145,7 +149,7 @@ msgid "Warning!" msgstr "" #. module: account -#: code:addons/account/account.py:3197 +#: code:addons/account/account.py:3205 #, python-format msgid "Miscellaneous Journal" msgstr "" @@ -622,7 +626,7 @@ msgid "Profit Account" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1156 +#: code:addons/account/account_move_line.py:1167 #, python-format msgid "No period found or more than one period found for the given date." msgstr "" @@ -638,13 +642,13 @@ msgid "Report of the Sales by Account Type" msgstr "" #. module: account -#: code:addons/account/account.py:3201 +#: code:addons/account/account.py:3209 #, python-format msgid "SAJ" msgstr "" #. module: account -#: code:addons/account/account.py:1591 +#: code:addons/account/account.py:1562 #, python-format msgid "Cannot create move with currency different from .." msgstr "" @@ -734,7 +738,7 @@ msgid "Are you sure you want to create entries?" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1361 +#: code:addons/account/account_invoice.py:1368 #, python-format msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." msgstr "" @@ -745,7 +749,7 @@ msgid "Print Invoice" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:111 +#: code:addons/account/wizard/account_invoice_refund.py:120 #, python-format msgid "Cannot %s invoice which is already reconciled, invoice should be unreconciled first. You can only refund this invoice." msgstr "" @@ -806,7 +810,7 @@ msgid "Type" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:826 +#: code:addons/account/account_invoice.py:833 #, python-format msgid "Taxes are missing!\n" "Click on compute button." @@ -828,7 +832,7 @@ msgid "Supplier Invoices And Refunds" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:851 +#: code:addons/account/account_move_line.py:859 #, python-format msgid "Entry is already reconciled." msgstr "" @@ -903,7 +907,7 @@ msgid "

\n" msgstr "" #. module: account -#: code:addons/account/account.py:1677 +#: code:addons/account/account.py:1650 #, python-format msgid "You cannot unreconcile journal items if they has been generated by the opening/closing fiscal year process." msgstr "" @@ -984,7 +988,7 @@ msgid "Liability" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:899 +#: code:addons/account/account_invoice.py:906 #, python-format msgid "Please define sequence on the journal related to this invoice." msgstr "" @@ -1051,16 +1055,6 @@ msgstr "" msgid "Features" msgstr "" -#. module: account -#: code:addons/account/account.py:2346 -#: code:addons/account/account_bank_statement.py:424 -#: code:addons/account/account_invoice.py:77 -#: code:addons/account/account_invoice.py:775 -#: code:addons/account/account_move_line.py:195 -#, python-format -msgid "No Analytic Journal !" -msgstr "" - #. module: account #: report:account.partner.balance:0 #: model:ir.actions.act_window,name:account.action_account_partner_balance @@ -1108,6 +1102,11 @@ msgstr "" msgid "Landscape Mode" msgstr "" +#. module: account +#: model:email.template,subject:account.email_template_edi_invoice +msgid "${object.company_id.name|safe} Invoice (Ref ${object.number or 'n/a'})" +msgstr "" + #. module: account #: help:account.fiscalyear.close,fy_id:0 msgid "Select a Fiscal year to close" @@ -1138,6 +1137,12 @@ msgstr "" msgid "In dispute" msgstr "" +#. module: account +#: code:addons/account/account_invoice.py:1474 +#, python-format +msgid "You must first select a partner!" +msgstr "" + #. module: account #: view:account.journal:0 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree @@ -1167,7 +1172,7 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_bank #: selection:account.bank.accounts.wizard,account_type:0 -#: code:addons/account/account.py:3092 +#: code:addons/account/account.py:3089 #, python-format msgid "Bank" msgstr "" @@ -1351,7 +1356,7 @@ msgid "Taxes" msgstr "" #. module: account -#: code:addons/account/wizard/account_financial_report.py:70 +#: code:addons/account/wizard/account_financial_report.py:71 #, python-format msgid "Select a starting and an ending period" msgstr "" @@ -1455,13 +1460,19 @@ msgid "Account Receivable" msgstr "" #. module: account -#: code:addons/account/account.py:612 -#: code:addons/account/account.py:767 -#: code:addons/account/account.py:768 +#: code:addons/account/account.py:621 +#: code:addons/account/account.py:776 +#: code:addons/account/account.py:777 #, python-format msgid "%s (copy)" msgstr "" +#. module: account +#: code:addons/account/wizard/account_validate_account_move.py:61 +#, python-format +msgid "Selected Entry Lines does not have any account move entries in draft state." +msgstr "" + #. module: account #: report:account.account.balance:0 #: selection:account.balance.report,display_account:0 @@ -1473,7 +1484,7 @@ msgid "With balance is not equal to 0" msgstr "" #. module: account -#: code:addons/account/account.py:1483 +#: code:addons/account/account.py:1459 #, python-format msgid "There is no default debit account defined \n" "on journal \"%s\"." @@ -1526,7 +1537,7 @@ msgstr "" #. module: account #: code:addons/account/report/common_report_header.py:92 -#: code:addons/account/wizard/account_report_common.py:164 +#: code:addons/account/wizard/account_report_common.py:169 #, python-format msgid "Not implemented." msgstr "" @@ -1701,7 +1712,7 @@ msgstr "" #: view:account.invoice:0 #: view:account.invoice.report:0 #: field:account.move.line,invoice:0 -#: code:addons/account/account_invoice.py:1157 +#: code:addons/account/account_invoice.py:1164 #: model:ir.model,name:account.model_account_invoice #: model:res.request.link,name:account.req_link_invoice #, python-format @@ -1769,7 +1780,7 @@ msgid "The journal must have centralized counterpart without the Skipping draft msgstr "" #. module: account -#: code:addons/account/account_move_line.py:854 +#: code:addons/account/account_move_line.py:864 #, python-format msgid "Some entries are already reconciled." msgstr "" @@ -1795,6 +1806,12 @@ msgstr "" msgid "Pending Accounts" msgstr "" +#. module: account +#: code:addons/account/account_move_line.py:862 +#, python-format +msgid "The account is not defined to be reconciled !" +msgstr "" + #. module: account #: report:account.journal.period.print.sale.purchase:0 #: view:account.tax.template:0 @@ -1901,54 +1918,56 @@ msgid "This menu prints a tax declaration based on invoices or payments. Select msgstr "" #. module: account -#: code:addons/account/account.py:409 -#: code:addons/account/account.py:414 -#: code:addons/account/account.py:431 -#: code:addons/account/account.py:634 -#: code:addons/account/account.py:636 -#: code:addons/account/account.py:930 -#: code:addons/account/account.py:1071 -#: code:addons/account/account.py:1073 -#: code:addons/account/account.py:1116 -#: code:addons/account/account.py:1319 -#: code:addons/account/account.py:1333 -#: code:addons/account/account.py:1356 -#: code:addons/account/account.py:1363 -#: code:addons/account/account.py:1587 -#: code:addons/account/account.py:1591 -#: code:addons/account/account.py:1677 -#: code:addons/account/account.py:2358 -#: code:addons/account/account.py:2678 -#: code:addons/account/account.py:3465 -#: code:addons/account/account_analytic_line.py:89 -#: code:addons/account/account_analytic_line.py:98 +#: code:addons/account/account.py:415 +#: code:addons/account/account.py:420 +#: code:addons/account/account.py:437 +#: code:addons/account/account.py:643 +#: code:addons/account/account.py:645 +#: code:addons/account/account.py:934 +#: code:addons/account/account.py:1026 +#: code:addons/account/account.py:1065 +#: code:addons/account/account.py:1067 +#: code:addons/account/account.py:1110 +#: code:addons/account/account.py:1290 +#: code:addons/account/account.py:1304 +#: code:addons/account/account.py:1327 +#: code:addons/account/account.py:1334 +#: code:addons/account/account.py:1558 +#: code:addons/account/account.py:1562 +#: code:addons/account/account.py:1650 +#: code:addons/account/account.py:2333 +#: code:addons/account/account.py:2653 +#: code:addons/account/account.py:3470 +#: code:addons/account/account_analytic_line.py:95 +#: code:addons/account/account_analytic_line.py:104 #: code:addons/account/account_bank_statement.py:368 #: code:addons/account/account_bank_statement.py:381 #: code:addons/account/account_bank_statement.py:419 #: code:addons/account/account_cash_statement.py:256 #: code:addons/account/account_cash_statement.py:300 -#: code:addons/account/account_invoice.py:899 -#: code:addons/account/account_invoice.py:933 -#: code:addons/account/account_invoice.py:1124 -#: code:addons/account/account_move_line.py:579 -#: code:addons/account/account_move_line.py:828 -#: code:addons/account/account_move_line.py:851 -#: code:addons/account/account_move_line.py:854 -#: code:addons/account/account_move_line.py:1119 -#: code:addons/account/account_move_line.py:1121 -#: code:addons/account/account_move_line.py:1156 +#: code:addons/account/account_invoice.py:906 +#: code:addons/account/account_invoice.py:940 +#: code:addons/account/account_invoice.py:1131 +#: code:addons/account/account_move_line.py:585 +#: code:addons/account/account_move_line.py:834 +#: code:addons/account/account_move_line.py:859 +#: code:addons/account/account_move_line.py:864 +#: code:addons/account/account_move_line.py:1116 +#: code:addons/account/account_move_line.py:1130 +#: code:addons/account/account_move_line.py:1132 +#: code:addons/account/account_move_line.py:1167 #: code:addons/account/report/common_report_header.py:92 #: code:addons/account/wizard/account_change_currency.py:38 #: code:addons/account/wizard/account_change_currency.py:59 #: code:addons/account/wizard/account_change_currency.py:64 #: code:addons/account/wizard/account_change_currency.py:70 -#: code:addons/account/wizard/account_financial_report.py:70 -#: code:addons/account/wizard/account_invoice_refund.py:109 -#: code:addons/account/wizard/account_invoice_refund.py:111 +#: code:addons/account/wizard/account_financial_report.py:71 +#: code:addons/account/wizard/account_invoice_refund.py:118 +#: code:addons/account/wizard/account_invoice_refund.py:120 #: code:addons/account/wizard/account_move_bank_reconcile.py:49 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39 -#: code:addons/account/wizard/account_report_common.py:158 -#: code:addons/account/wizard/account_report_common.py:164 +#: code:addons/account/wizard/account_report_common.py:163 +#: code:addons/account/wizard/account_report_common.py:169 #: code:addons/account/wizard/account_use_model.py:44 #: code:addons/account/wizard/pos_box.py:31 #: code:addons/account/wizard/pos_box.py:35 @@ -1991,7 +2010,7 @@ msgid "period close" msgstr "" #. module: account -#: code:addons/account/account.py:1058 +#: code:addons/account/account.py:1052 #, python-format msgid "This journal already contains items for this period, therefore you cannot modify its company field." msgstr "" @@ -2086,16 +2105,11 @@ msgid "Product Category" msgstr "" #. module: account -#: code:addons/account/account.py:656 +#: code:addons/account/account.py:665 #, python-format msgid "You cannot change the type of account to '%s' type as it contains journal items!" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_aged_trial_balance -msgid "Account Aged Trial balance Report" -msgstr "" - #. module: account #: view:account.fiscalyear.close.state:0 msgid "Close Fiscal Year" @@ -2274,9 +2288,9 @@ msgid "30 Net Days" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:256 +#: code:addons/account/account_bank_statement.py:424 #, python-format -msgid "You do not have rights to open this %s journal !" +msgid "You have to assign an analytic journal on the '%s' journal!" msgstr "" #. module: account @@ -2431,7 +2445,7 @@ msgid "Keep empty for all open fiscal year" msgstr "" #. module: account -#: code:addons/account/account.py:653 +#: code:addons/account/account.py:662 #, python-format msgid "You cannot change the type of account from 'Closed' to any other type as it contains journal items!" msgstr "" @@ -2447,7 +2461,7 @@ msgid "Create an Account Based on this Template" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:933 +#: code:addons/account/account_invoice.py:940 #, python-format msgid "Cannot create the invoice.\n" "The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'." @@ -2487,7 +2501,7 @@ msgid "Fiscal Positions" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:579 +#: code:addons/account/account_move_line.py:585 #, python-format msgid "You cannot create journal items on a closed account %s %s." msgstr "" @@ -2595,7 +2609,7 @@ msgid "Account Model Entries" msgstr "" #. module: account -#: code:addons/account/account.py:3202 +#: code:addons/account/account.py:3210 #, python-format msgid "EXJ" msgstr "" @@ -2688,14 +2702,14 @@ msgid "Accounts" msgstr "" #. module: account -#: code:addons/account/account.py:3541 +#: code:addons/account/account.py:3546 #: code:addons/account/account_bank_statement.py:405 -#: code:addons/account/account_invoice.py:507 -#: code:addons/account/account_invoice.py:609 -#: code:addons/account/account_invoice.py:624 -#: code:addons/account/account_invoice.py:632 -#: code:addons/account/account_invoice.py:657 -#: code:addons/account/account_move_line.py:536 +#: code:addons/account/account_invoice.py:510 +#: code:addons/account/account_invoice.py:616 +#: code:addons/account/account_invoice.py:631 +#: code:addons/account/account_invoice.py:639 +#: code:addons/account/account_invoice.py:664 +#: code:addons/account/account_move_line.py:538 #, python-format msgid "Configuration Error!" msgstr "" @@ -2879,7 +2893,7 @@ msgid "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pr msgstr "" #. module: account -#: code:addons/account/account.py:1071 +#: code:addons/account/account.py:1065 #, python-format msgid "You should choose the periods that belong to the same company." msgstr "" @@ -2892,7 +2906,7 @@ msgid "Sales by Account" msgstr "" #. module: account -#: code:addons/account/account.py:1449 +#: code:addons/account/account.py:1425 #, python-format msgid "You cannot delete a posted journal entry \"%s\"." msgstr "" @@ -2908,21 +2922,21 @@ msgid "Sale journal" msgstr "" #. module: account -#: code:addons/account/account.py:2346 -#: code:addons/account/account_invoice.py:775 +#: code:addons/account/account.py:2321 +#: code:addons/account/account_invoice.py:782 #: code:addons/account/account_move_line.py:195 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" msgstr "" #. module: account -#: code:addons/account/account.py:781 +#: code:addons/account/account.py:790 #, python-format msgid "This journal already contains items, therefore you cannot modify its company field." msgstr "" #. module: account -#: code:addons/account/account.py:409 +#: code:addons/account/account.py:415 #, python-format msgid "You need an Opening journal with centralisation checked to set the initial balance." msgstr "" @@ -2995,6 +3009,13 @@ msgstr "" msgid "Only One Chart Template Available" msgstr "" +#. module: account +#: code:addons/account/account_invoice.py:929 +#, python-format +msgid "Please verify the price of the invoice!\n" +"The encoded total does not match the computed total." +msgstr "" + #. module: account #: view:account.chart.template:0 #: field:product.category,property_account_expense_categ:0 @@ -3063,7 +3084,7 @@ msgid "Fiscal Position" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:823 +#: code:addons/account/account_invoice.py:830 #, python-format msgid "Tax base different!\n" "Click on compute to update the tax base." @@ -3089,7 +3110,7 @@ msgid "Trial Balance" msgstr "" #. module: account -#: code:addons/account/account.py:431 +#: code:addons/account/account.py:437 #, python-format msgid "Unable to adapt the initial balance (negative value)." msgstr "" @@ -3103,8 +3124,9 @@ msgid "Customer Invoice" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_open_closed_fiscalyear -msgid "Choose Fiscal Year" +#: code:addons/account/installer.py:115 +#, python-format +msgid "No unconfigured company!" msgstr "" #. module: account @@ -3150,7 +3172,7 @@ msgid "This will select how the current currency rate for outgoing transactions msgstr "" #. module: account -#: code:addons/account/account.py:2678 +#: code:addons/account/account.py:2653 #, python-format msgid "There is no parent code for the template account." msgstr "" @@ -3212,7 +3234,7 @@ msgid "View" msgstr "" #. module: account -#: code:addons/account/account.py:3460 +#: code:addons/account/account.py:3465 #: code:addons/account/account_bank.py:94 #, python-format msgid "BNK" @@ -3445,7 +3467,7 @@ msgid "if you give the Name other then /, its created Accounting Entries Move wi msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1016 +#: code:addons/account/account_invoice.py:1023 #, python-format msgid "You cannot create an invoice on a centralized journal. Uncheck the centralized counterpart box in the related journal from the configuration menu." msgstr "" @@ -3456,12 +3478,6 @@ msgstr "" msgid "Starting Balance" msgstr "" -#. module: account -#: code:addons/account/account_invoice.py:1465 -#, python-format -msgid "No Partner Defined !" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_account_period_close #: model:ir.actions.act_window,name:account.action_account_period_tree @@ -3501,7 +3517,7 @@ msgid "Paypal account (email) for receiving online payments (credit card, etc.) msgstr "" #. module: account -#: code:addons/account/account_move_line.py:536 +#: code:addons/account/account_move_line.py:538 #, python-format msgid "Cannot find any account journal of %s type for this company.\n" "\n" @@ -3538,6 +3554,12 @@ msgstr "" msgid "Pending Invoice" msgstr "" +#. module: account +#: code:addons/account/account_move_line.py:1034 +#, python-format +msgid "Opening Entries have already been generated. Please run \"Cancel Closing Entries\" wizard to cancel those entries and then run this wizard." +msgstr "" + #. module: account #: view:account.invoice.report:0 #: selection:account.subscription,period_type:0 @@ -3639,7 +3661,7 @@ msgid "Period Length (days)" msgstr "" #. module: account -#: code:addons/account/account.py:1363 +#: code:addons/account/account.py:1334 #, python-format msgid "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." @@ -3662,7 +3684,7 @@ msgid "Category of Product" msgstr "" #. module: account -#: code:addons/account/account.py:930 +#: code:addons/account/account.py:934 #, python-format msgid "There is no fiscal year defined for this date.\n" "Please create one from the configuration of the accounting menu." @@ -3796,7 +3818,7 @@ msgid "Chart of Accounts Template" msgstr "" #. module: account -#: code:addons/account/account.py:2358 +#: code:addons/account/account.py:2333 #, python-format msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n" "Please define partner on it!" @@ -3950,9 +3972,8 @@ msgid "Name" msgstr "" #. module: account -#: code:addons/account/installer.py:115 -#, python-format -msgid "No unconfigured company !" +#: model:ir.model,name:account.model_account_aged_trial_balance +msgid "Account Aged Trial balance Report" msgstr "" #. module: account @@ -4017,8 +4038,8 @@ msgid "Check this box if you don't want any tax related to this tax Code to appe msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1058 -#: code:addons/account/account_move_line.py:1143 +#: code:addons/account/account_move_line.py:1069 +#: code:addons/account/account_move_line.py:1154 #, python-format msgid "You cannot use an inactive account." msgstr "" @@ -4048,8 +4069,8 @@ msgid "Consolidated Children" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:573 -#: code:addons/account/wizard/account_invoice_refund.py:146 +#: code:addons/account/account_invoice.py:580 +#: code:addons/account/wizard/account_invoice_refund.py:155 #, python-format msgid "Insufficient Data!" msgstr "" @@ -4243,12 +4264,6 @@ msgstr "" msgid "Cancel the Selected Invoices" msgstr "" -#. module: account -#: code:addons/account/account_bank_statement.py:424 -#, python-format -msgid "You have to assign an analytic journal on the '%s' journal!" -msgstr "" - #. module: account #: model:process.transition,note:account.process_transition_supplieranalyticcost0 msgid "Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices." @@ -4283,7 +4298,7 @@ msgid "Month" msgstr "" #. module: account -#: code:addons/account/account.py:668 +#: code:addons/account/account.py:677 #, python-format msgid "You cannot change the code of account which contains journal items!" msgstr "" @@ -4294,8 +4309,8 @@ msgid "Supplier invoice sequence" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:610 -#: code:addons/account/account_invoice.py:625 +#: code:addons/account/account_invoice.py:617 +#: code:addons/account/account_invoice.py:632 #, python-format msgid "Cannot find a chart of account, you should create one from Settings\\Configuration\\Accounting menu." msgstr "" @@ -4334,7 +4349,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -#: code:addons/account/account.py:191 +#: code:addons/account/account.py:197 #, python-format msgid "Balance Sheet (Liability account)" msgstr "" @@ -4356,7 +4371,7 @@ msgid "Account Base Code" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:864 +#: code:addons/account/account_move_line.py:869 #, python-format msgid "You have to provide an account for the write off/exchange difference entry." msgstr "" @@ -4563,7 +4578,7 @@ msgid "Error!\n" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:658 +#: code:addons/account/account_invoice.py:665 #, python-format msgid "Cannot find any account journal of %s type for this company.\n" "\n" @@ -4577,7 +4592,7 @@ msgid "Based On" msgstr "" #. module: account -#: code:addons/account/account.py:3204 +#: code:addons/account/account.py:3212 #, python-format msgid "ECNJ" msgstr "" @@ -4630,7 +4645,7 @@ msgid "Cancelled" msgstr "" #. module: account -#: code:addons/account/account.py:1903 +#: code:addons/account/account.py:1878 #, python-format msgid " (Copy)" msgstr "" @@ -4652,7 +4667,7 @@ msgid "It adds the currency column on report if the currency differs from the co msgstr "" #. module: account -#: code:addons/account/account.py:3394 +#: code:addons/account/account.py:3397 #, python-format msgid "Purchase Tax %.2f%%" msgstr "" @@ -4728,7 +4743,7 @@ msgid "When journal period is created. The status is 'Draft'. If a report is pri msgstr "" #. module: account -#: code:addons/account/account.py:3205 +#: code:addons/account/account.py:3213 #, python-format msgid "MISC" msgstr "" @@ -4865,7 +4880,7 @@ msgid "Draft invoices are validated. " msgstr "" #. module: account -#: code:addons/account/account.py:890 +#: code:addons/account/account.py:894 #, python-format msgid "Opening Period" msgstr "" @@ -4896,13 +4911,6 @@ msgstr "" msgid "Tax Application" msgstr "" -#. module: account -#: code:addons/account/account_invoice.py:922 -#, python-format -msgid "Please verify the price of the invoice !\n" -"The encoded total does not match the computed total." -msgstr "" - #. module: account #: field:account.account,active:0 #: field:account.analytic.journal,active:0 @@ -4919,6 +4927,13 @@ msgstr "" msgid "Cash Control" msgstr "" +#. module: account +#: code:addons/account/account_move_line.py:857 +#: code:addons/account/account_move_line.py:862 +#, python-format +msgid "Error" +msgstr "" + #. module: account #: field:account.analytic.balance,date2:0 #: field:account.analytic.cost.ledger,date2:0 @@ -5031,8 +5046,8 @@ msgid "Check this if the price you use on the product and invoices includes this msgstr "" #. module: account -#: report:account.analytic.account.balance:0 -msgid "Analytic Balance -" +#: help:account.tax.template,include_base_amount:0 +msgid "Set if the amount of tax must be included in the base amount before computing the next taxes." msgstr "" #. module: account @@ -5066,7 +5081,7 @@ msgid "Target Moves" msgstr "" #. module: account -#: code:addons/account/account.py:1454 +#: code:addons/account/account.py:1430 #, python-format msgid "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)" msgstr "" @@ -5143,7 +5158,7 @@ msgid "Internal Name" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1185 +#: code:addons/account/account_move_line.py:1196 #, python-format msgid "Cannot create an automatic sequence for this piece.\n" "Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece." @@ -5180,7 +5195,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -#: code:addons/account/account.py:188 +#: code:addons/account/account.py:194 #, python-format msgid "Profit & Loss (Income account)" msgstr "" @@ -5213,7 +5228,7 @@ msgid "Compute Code (if type=code)" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:508 +#: code:addons/account/account_invoice.py:511 #, python-format msgid "Cannot find a chart of accounts for this company, you should create one." msgstr "" @@ -5293,6 +5308,12 @@ msgstr "" msgid "Coefficent for parent" msgstr "" +#. module: account +#: code:addons/account/account.py:2309 +#, python-format +msgid "You have a wrong expression \"%(...)s\" in your model!" +msgstr "" + #. module: account #: report:account.partner.balance:0 msgid "(Account/Partner) Name" @@ -5319,7 +5340,7 @@ msgid "Recompute taxes and total" msgstr "" #. module: account -#: code:addons/account/account.py:1116 +#: code:addons/account/account.py:1110 #, python-format msgid "You cannot modify/delete a journal with entries for this period." msgstr "" @@ -5345,7 +5366,7 @@ msgid "Amount Computation" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1105 +#: code:addons/account/account_move_line.py:1116 #, python-format msgid "You can not add/modify entries in a closed period %s of journal %s." msgstr "" @@ -5576,7 +5597,7 @@ msgid "This payment term will be used instead of the default one for purchase or msgstr "" #. module: account -#: code:addons/account/account_invoice.py:474 +#: code:addons/account/account_invoice.py:477 #, python-format msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it." msgstr "" @@ -5598,6 +5619,16 @@ msgstr "" msgid "Fiscal Position Template" msgstr "" +#. module: account +#: code:addons/account/account.py:2321 +#: code:addons/account/account_bank_statement.py:424 +#: code:addons/account/account_invoice.py:77 +#: code:addons/account/account_invoice.py:782 +#: code:addons/account/account_move_line.py:195 +#, python-format +msgid "No Analytic Journal!" +msgstr "" + #. module: account #: view:account.invoice:0 msgid "Draft Refund" @@ -5635,11 +5666,6 @@ msgstr "" msgid "Reconcile With Write-Off" msgstr "" -#. module: account -#: constraint:account.move.line:0 -msgid "You cannot create journal items on an account of type view." -msgstr "" - #. module: account #: selection:account.payment.term.line,value:0 #: selection:account.tax,type:0 @@ -5647,7 +5673,7 @@ msgid "Fixed Amount" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1056 +#: code:addons/account/account_move_line.py:1067 #, python-format msgid "You cannot change the tax, you should remove and recreate lines." msgstr "" @@ -5698,14 +5724,14 @@ msgid "Child Accounts" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1128 #, python-format msgid "Move name (id): %s (%s)" msgstr "" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:879 +#: code:addons/account/account_move_line.py:884 #, python-format msgid "Write-Off" msgstr "" @@ -5731,7 +5757,7 @@ msgstr "" #: view:account.config.settings:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/account_invoice.py:390 +#: code:addons/account/account_invoice.py:393 #, python-format msgid "Supplier" msgstr "" @@ -5746,7 +5772,7 @@ msgid "March" msgstr "" #. module: account -#: code:addons/account/account.py:1031 +#: code:addons/account/account.py:1033 #, python-format msgid "You can not re-open a period which belongs to closed fiscal year" msgstr "" @@ -5865,12 +5891,6 @@ msgstr "" msgid "Filter by" msgstr "" -#. module: account -#: code:addons/account/account.py:2334 -#, python-format -msgid "You have a wrong expression \"%(...)s\" in your model !" -msgstr "" - #. module: account #: view:account.tax.template:0 msgid "Compute Code for Taxes Included Prices" @@ -5909,7 +5929,7 @@ msgid "Number of Days" msgstr "" #. module: account -#: code:addons/account/account.py:1357 +#: code:addons/account/account.py:1328 #, python-format msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"." msgstr "" @@ -5963,6 +5983,12 @@ msgstr "" msgid "Multipication factor for Base code" msgstr "" +#. module: account +#: code:addons/account/account_move_line.py:1196 +#, python-format +msgid "No Piece Number!" +msgstr "" + #. module: account #: help:account.journal,company_id:0 msgid "Company related to this journal" @@ -6044,7 +6070,7 @@ msgid "Models" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1124 +#: code:addons/account/account_invoice.py:1131 #, python-format msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." msgstr "" @@ -6064,6 +6090,12 @@ msgstr "" msgid "Sales Tax(%)" msgstr "" +#. module: account +#: code:addons/account/account_invoice.py:1474 +#, python-format +msgid "No Partner Defined!" +msgstr "" + #. module: account #: view:account.tax.code:0 msgid "Reporting Configuration" @@ -6207,9 +6239,9 @@ msgid "You cannot create journal items on closed account." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:633 +#: code:addons/account/account_invoice.py:640 #, python-format -msgid "Invoice line account's company and invoice's compnay does not match." +msgid "Invoice line account's company and invoice's company does not match." msgstr "" #. module: account @@ -6276,7 +6308,7 @@ msgid "Power" msgstr "" #. module: account -#: code:addons/account/account.py:3465 +#: code:addons/account/account.py:3470 #, python-format msgid "Cannot generate an unused journal code." msgstr "" @@ -6286,6 +6318,13 @@ msgstr "" msgid "force period" msgstr "" +#. module: account +#: code:addons/account/account.py:3407 +#: code:addons/account/res_config.py:279 +#, python-format +msgid "Only administrators can change the settings" +msgstr "" + #. module: account #: view:project.account.analytic.line:0 msgid "View Account Analytic Lines" @@ -6329,7 +6368,7 @@ msgid "If you use payment terms, the due date will be computed automatically at msgstr "" #. module: account -#: code:addons/account/account.py:414 +#: code:addons/account/account.py:420 #, python-format msgid "There is no opening/closing period defined, please create one to set the initial balance." msgstr "" @@ -6340,12 +6379,12 @@ msgid "The sequence field is used to order the taxes lines from lower sequences msgstr "" #. module: account -#: code:addons/account/account.py:1448 -#: code:addons/account/account.py:1453 -#: code:addons/account/account.py:1482 -#: code:addons/account/account.py:1489 -#: code:addons/account/account_invoice.py:1015 -#: code:addons/account/account_move_line.py:1005 +#: code:addons/account/account.py:1424 +#: code:addons/account/account.py:1429 +#: code:addons/account/account.py:1458 +#: code:addons/account/account.py:1465 +#: code:addons/account/account_invoice.py:1022 +#: code:addons/account/account_move_line.py:1010 #: code:addons/account/wizard/account_automatic_reconcile.py:148 #: code:addons/account/wizard/account_fiscalyear_close.py:88 #: code:addons/account/wizard/account_fiscalyear_close.py:99 @@ -6405,7 +6444,7 @@ msgid "Optional create" msgstr "" #. module: account -#: code:addons/account/account.py:686 +#: code:addons/account/account.py:695 #, python-format msgid "You cannot change the owner company of an account that already contains journal items." msgstr "" @@ -6414,7 +6453,7 @@ msgstr "" #: report:account.invoice:0 #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/account_invoice.py:1160 +#: code:addons/account/account_invoice.py:1167 #: selection:report.invoice.created,type:0 #, python-format msgid "Supplier Refund" @@ -6454,7 +6493,7 @@ msgid "Group By..." msgstr "" #. module: account -#: code:addons/account/account.py:1024 +#: code:addons/account/account.py:1026 #, python-format msgid "There is no period defined for this date: %s.\n" "Please create one." @@ -6551,8 +6590,8 @@ msgid "Analytic Entries Statistics" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:142 -#: code:addons/account/account_move_line.py:955 +#: code:addons/account/account_analytic_line.py:148 +#: code:addons/account/account_move_line.py:960 #, python-format msgid "Entries: " msgstr "" @@ -6574,7 +6613,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -#: code:addons/account/account.py:190 +#: code:addons/account/account.py:196 #, python-format msgid "Balance Sheet (Asset account)" msgstr "" @@ -6642,7 +6681,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -#: code:addons/account/account.py:189 +#: code:addons/account/account.py:195 #, python-format msgid "Profit & Loss (Expense account)" msgstr "" @@ -6653,18 +6692,11 @@ msgid "Total Transactions" msgstr "" #. module: account -#: code:addons/account/account.py:636 +#: code:addons/account/account.py:645 #, python-format msgid "You cannot remove an account that contains journal items." msgstr "" -#. module: account -#: code:addons/account/account.py:1024 -#: code:addons/account/account_move_line.py:1105 -#, python-format -msgid "Error !" -msgstr "" - #. module: account #: field:account.financial.report,style_overwrite:0 msgid "Financial Report Style" @@ -6735,7 +6767,7 @@ msgid "Journal Entries" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:147 +#: code:addons/account/wizard/account_invoice_refund.py:156 #, python-format msgid "No period found on the invoice." msgstr "" @@ -6792,8 +6824,8 @@ msgstr "" #. module: account #: view:account.bank.statement:0 -#: code:addons/account/account.py:422 -#: code:addons/account/account.py:434 +#: code:addons/account/account.py:428 +#: code:addons/account/account.py:440 #, python-format msgid "Opening Balance" msgstr "" @@ -6834,12 +6866,6 @@ msgstr "" msgid "Complete Set of Taxes" msgstr "" -#. module: account -#: code:addons/account/wizard/account_validate_account_move.py:61 -#, python-format -msgid "Selected Entry Lines does not have any account move enties in draft state." -msgstr "" - #. module: account #: view:account.chart.template:0 msgid "Properties" @@ -6869,7 +6895,7 @@ msgid "Configuration error!\n" msgstr "" #. module: account -#: code:addons/account/account.py:2304 +#: code:addons/account/account.py:2279 #, python-format msgid "You can specify year, month and date in the name of the model using the following labels:\n" "\n" @@ -6942,7 +6968,7 @@ msgid "Done" msgstr "" #. module: account -#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1290 #, python-format msgid "You cannot validate a non-balanced entry.\n" "Make sure you have configured payment terms properly.\n" @@ -6967,7 +6993,7 @@ msgid "Source Document" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:90 +#: code:addons/account/account_analytic_line.py:96 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)." msgstr "" @@ -7208,7 +7234,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/account_move_line.py:780 +#: code:addons/account/account_move_line.py:786 #: code:addons/account/static/src/js/account_move_reconciliation.js:90 #, python-format msgid "Warning" @@ -7265,7 +7291,7 @@ msgid "Use model" msgstr "" #. module: account -#: code:addons/account/account.py:1490 +#: code:addons/account/account.py:1466 #, python-format msgid "There is no default credit account defined \n" "on journal \"%s\"." @@ -7312,7 +7338,7 @@ msgid "Root/View" msgstr "" #. module: account -#: code:addons/account/account.py:3206 +#: code:addons/account/account.py:3214 #, python-format msgid "OPEJ" msgstr "" @@ -7377,7 +7403,7 @@ msgid "Maturity Date" msgstr "" #. module: account -#: code:addons/account/account.py:3193 +#: code:addons/account/account.py:3201 #, python-format msgid "Sales Journal" msgstr "" @@ -7387,12 +7413,6 @@ msgstr "" msgid "Invoice Tax" msgstr "" -#. module: account -#: code:addons/account/account_move_line.py:1185 -#, python-format -msgid "No piece number !" -msgstr "" - #. module: account #: view:account.financial.report:0 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy @@ -7420,7 +7440,7 @@ msgid "Sales Properties" msgstr "" #. module: account -#: code:addons/account/account.py:3541 +#: code:addons/account/account.py:3546 #, python-format msgid "You have to set a code for the bank account defined on the selected chart of accounts." msgstr "" @@ -7443,7 +7463,7 @@ msgstr "" #. module: account #: selection:account.move.line,centralisation:0 -#: code:addons/account/account.py:1541 +#: code:addons/account/account.py:1517 #, python-format msgid "Currency Adjustment" msgstr "" @@ -7474,7 +7494,7 @@ msgid "May" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:820 +#: code:addons/account/account_invoice.py:827 #, python-format msgid "Global taxes defined, but they are not in invoice lines !" msgstr "" @@ -7513,7 +7533,7 @@ msgstr "" #: view:account.config.settings:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/account_invoice.py:388 +#: code:addons/account/account_invoice.py:391 #, python-format msgid "Customer" msgstr "" @@ -7529,7 +7549,7 @@ msgstr "" #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.entries.report,type:0 #: selection:account.journal,type:0 -#: code:addons/account/account.py:3092 +#: code:addons/account/account.py:3089 #, python-format msgid "Cash" msgstr "" @@ -7641,7 +7661,7 @@ msgid "Reconciliation Transactions" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:472 +#: code:addons/account/account_invoice.py:475 #, python-format msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead." msgstr "" @@ -7687,10 +7707,7 @@ msgid "Fixed" msgstr "" #. module: account -#: code:addons/account/account.py:653 -#: code:addons/account/account.py:656 -#: code:addons/account/account.py:668 -#: code:addons/account/account.py:1031 +#: code:addons/account/account.py:677 #, python-format msgid "Warning !" msgstr "" @@ -7757,12 +7774,6 @@ msgstr "" msgid "Select a currency to apply on the invoice" msgstr "" -#. module: account -#: code:addons/account/account_invoice.py:901 -#, python-format -msgid "No Invoice Lines !" -msgstr "" - #. module: account #: view:account.financial.report:0 msgid "Report Type" @@ -7801,6 +7812,11 @@ msgstr "" msgid "Automatic entry" msgstr "" +#. module: account +#: constraint:account.move.line:0 +msgid "You cannot create journal items on an account of type view or consolidation." +msgstr "" + #. module: account #: help:account.account,reconcile:0 msgid "Check this box if this account allows reconciliation of journal items." @@ -7827,12 +7843,6 @@ msgstr "" msgid "Associated Partner" msgstr "" -#. module: account -#: code:addons/account/account_invoice.py:1465 -#, python-format -msgid "You must first select a partner !" -msgstr "" - #. module: account #: field:account.invoice,comment:0 msgid "Additional Information" @@ -7900,18 +7910,18 @@ msgid "J.C. /Move name" msgstr "" #. module: account -#: help:account.tax.template,include_base_amount:0 -msgid "Set if the amount of tax must be included in the base amount before computing the next taxes." +#: model:ir.model,name:account.model_account_open_closed_fiscalyear +msgid "Choose Fiscal Year" msgstr "" #. module: account -#: code:addons/account/account.py:3196 +#: code:addons/account/account.py:3204 #, python-format msgid "Purchase Refund Journal" msgstr "" #. module: account -#: code:addons/account/account.py:1333 +#: code:addons/account/account.py:1304 #, python-format msgid "Please define a sequence on the journal." msgstr "" @@ -7978,7 +7988,7 @@ msgid "Net Total:" msgstr "" #. module: account -#: code:addons/account/wizard/account_report_common.py:158 +#: code:addons/account/wizard/account_report_common.py:163 #, python-format msgid "Select a starting and an ending period." msgstr "" @@ -8132,12 +8142,7 @@ msgid "Account Types" msgstr "" #. module: account -#: model:email.template,subject:account.email_template_edi_invoice -msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})" -msgstr "" - -#. module: account -#: code:addons/account/account_move_line.py:1210 +#: code:addons/account/account_move_line.py:1221 #, python-format msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal." msgstr "" @@ -8225,7 +8230,7 @@ msgid "The partner account used for this invoice." msgstr "" #. module: account -#: code:addons/account/account.py:3391 +#: code:addons/account/account.py:3394 #, python-format msgid "Tax %.2f%%" msgstr "" @@ -8243,7 +8248,7 @@ msgid "Payment Term Line" msgstr "" #. module: account -#: code:addons/account/account.py:3194 +#: code:addons/account/account.py:3202 #, python-format msgid "Purchase Journal" msgstr "" @@ -8408,7 +8413,7 @@ msgid "Journal Name" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:829 +#: code:addons/account/account_move_line.py:835 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "" @@ -8451,7 +8456,7 @@ msgid "The amount expressed in an optional other currency if it is a multi-curre msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1006 +#: code:addons/account/account_move_line.py:1011 #, python-format msgid "The account move (%s) for centralisation has been confirmed." msgstr "" @@ -8507,12 +8512,6 @@ msgstr "" msgid "Reconciled entries" msgstr "" -#. module: account -#: code:addons/account/account.py:2334 -#, python-format -msgid "Wrong model !" -msgstr "" - #. module: account #: view:account.tax.code.template:0 #: view:account.tax.template:0 @@ -8530,7 +8529,7 @@ msgid "Print Account Partner Balance" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1121 +#: code:addons/account/account_move_line.py:1132 #, python-format msgid "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n" "%s." @@ -8557,7 +8556,7 @@ msgstr "" #. module: account #: field:account.fiscalyear.close,journal_id:0 -#: code:addons/account/account.py:3198 +#: code:addons/account/account.py:3206 #, python-format msgid "Opening Entries Journal" msgstr "" @@ -8598,7 +8597,7 @@ msgid "Set if the tax computation is based on the computation of child taxes rat msgstr "" #. module: account -#: code:addons/account/account.py:634 +#: code:addons/account/account.py:643 #, python-format msgid "You cannot deactivate an account that contains journal items." msgstr "" @@ -8648,7 +8647,7 @@ msgid "Unit of Currency" msgstr "" #. module: account -#: code:addons/account/account.py:3195 +#: code:addons/account/account.py:3203 #, python-format msgid "Sales Refund Journal" msgstr "" @@ -8712,7 +8711,7 @@ msgid "Purchase Tax(%)" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:901 +#: code:addons/account/account_invoice.py:908 #, python-format msgid "Please create some invoice lines." msgstr "" @@ -8729,7 +8728,7 @@ msgid "Display Detail" msgstr "" #. module: account -#: code:addons/account/account.py:3203 +#: code:addons/account/account.py:3211 #, python-format msgid "SCNJ" msgstr "" @@ -8832,6 +8831,12 @@ msgstr "" msgid "Accountant validates the accounting entries coming from the invoice. " msgstr "" +#. module: account +#: code:addons/account/account.py:2309 +#, python-format +msgid "Wrong Model!" +msgstr "" + #. module: account #: field:account.subscription,period_total:0 msgid "Number of Periods" @@ -8878,8 +8883,8 @@ msgid "Receivable Account" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:771 -#: code:addons/account/account_move_line.py:824 +#: code:addons/account/account_move_line.py:777 +#: code:addons/account/account_move_line.py:830 #, python-format msgid "To reconcile the entries company should be the same for all entries." msgstr "" @@ -9072,7 +9077,7 @@ msgid "Balance :" msgstr "" #. module: account -#: code:addons/account/account.py:1587 +#: code:addons/account/account.py:1558 #, python-format msgid "Cannot create moves for different companies." msgstr "" @@ -9163,7 +9168,7 @@ msgid "Immediate Payment" msgstr "" #. module: account -#: code:addons/account/account.py:1502 +#: code:addons/account/account.py:1478 #, python-format msgid " Centralisation" msgstr "" @@ -9225,7 +9230,7 @@ msgid "It indicates that the invoice has been paid and the journal entry of the msgstr "" #. module: account -#: code:addons/account/account_move_line.py:780 +#: code:addons/account/account_move_line.py:786 #, python-format msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!" msgstr "" @@ -9257,12 +9262,6 @@ msgstr "" msgid "Unreconciled" msgstr "" -#. module: account -#: code:addons/account/account_invoice.py:922 -#, python-format -msgid "Bad total !" -msgstr "" - #. module: account #: field:account.journal,sequence_id:0 msgid "Entry Sequence" @@ -9334,7 +9333,7 @@ msgid "Comparison" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1119 +#: code:addons/account/account_move_line.py:1130 #, python-format msgid "You cannot do this modification on a confirmed entry. You can just change some non legal fields or you must unconfirm the journal entry first.\n" "%s." @@ -9415,7 +9414,7 @@ msgid "Journal Entry Model" msgstr "" #. module: account -#: code:addons/account/account.py:1073 +#: code:addons/account/account.py:1067 #, python-format msgid "Start period should precede then end period." msgstr "" @@ -9662,6 +9661,12 @@ msgstr "" msgid "States" msgstr "" +#. module: account +#: code:addons/account/account_move_line.py:857 +#, python-format +msgid "Entries are not of the same account or already reconciled ! " +msgstr "" + #. module: account #: help:product.category,property_account_income_categ:0 #: help:product.template,property_account_income:0 @@ -9686,7 +9691,7 @@ msgid "Total" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:109 +#: code:addons/account/wizard/account_invoice_refund.py:118 #, python-format msgid "Cannot %s draft/proforma/cancel invoice." msgstr "" @@ -9805,6 +9810,11 @@ msgstr "" msgid "Manual or automatic creation of payment entries according to the statements" msgstr "" +#. module: account +#: report:account.analytic.account.balance:0 +msgid "Analytic Balance -" +msgstr "" + #. module: account #: field:account.analytic.balance,empty_acc:0 msgid "Empty Accounts ? " @@ -9816,7 +9826,7 @@ msgid "If you unreconcile transactions, you must also verify all the actions tha msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1056 +#: code:addons/account/account_move_line.py:1067 #, python-format msgid "Unable to change tax!" msgstr "" @@ -9882,7 +9892,7 @@ msgstr "" #: view:account.invoice:0 #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/account_invoice.py:1158 +#: code:addons/account/account_invoice.py:1165 #: model:process.process,name:account.process_process_supplierinvoiceprocess0 #: selection:report.invoice.created,type:0 #, python-format @@ -9934,6 +9944,12 @@ msgstr "" msgid "Reconciled transactions" msgstr "" +#. module: account +#: code:addons/account/account_invoice.py:929 +#, python-format +msgid "Bad Total!" +msgstr "" + #. module: account #: model:ir.model,name:account.model_report_account_receivable msgid "Receivable accounts" @@ -9968,6 +9984,12 @@ msgstr "" msgid "With movements" msgstr "" +#. module: account +#: code:addons/account/account_cash_statement.py:256 +#, python-format +msgid "You do not have rights to open this %s journal!" +msgstr "" + #. module: account #: view:account.tax.code.template:0 msgid "Account Tax Code Template" @@ -9998,7 +10020,7 @@ msgid "Group by month of Invoice Date" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account_analytic_line.py:105 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)." msgstr "" @@ -10056,7 +10078,7 @@ msgid "Entries Sorted by" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1546 +#: code:addons/account/account_invoice.py:1555 #, python-format msgid "The selected unit of measure is not compatible with the unit of measure of the product." msgstr "" @@ -10089,6 +10111,12 @@ msgstr "" msgid "November" msgstr "" +#. module: account +#: code:addons/account/account_invoice.py:908 +#, python-format +msgid "No Invoice Lines!" +msgstr "" + #. module: account #: model:ir.actions.act_window,help:account.action_account_moves_all_a msgid "

\n" @@ -10128,7 +10156,7 @@ msgstr "" #: report:account.invoice:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/account_invoice.py:1159 +#: code:addons/account/account_invoice.py:1166 #, python-format msgid "Refund" msgstr "" @@ -10155,7 +10183,7 @@ msgid "Accounting Documents" msgstr "" #. module: account -#: code:addons/account/account.py:641 +#: code:addons/account/account.py:650 #, python-format msgid "You cannot remove/deactivate an account which is set on a customer or supplier." msgstr "" @@ -10197,7 +10225,7 @@ msgid "Manual Invoice Taxes" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:573 +#: code:addons/account/account_invoice.py:580 #, python-format msgid "The payment term of supplier does not have a payment term line." msgstr "" diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot index 55f05be77fb11..48da1f12d4204 100644 --- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot +++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgid "No order to invoice, create" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:547 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:548 #, python-format msgid "Timesheets to Invoice of %s" msgstr "" @@ -119,7 +119,7 @@ msgid "Contract expiration reminder ${user.company_id.name}" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:464 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:465 #, python-format msgid "Sales Order Lines of %s" msgstr "" diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot index 86cec308d3290..dc9be49ed4425 100644 --- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot +++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -109,6 +109,11 @@ msgstr "" msgid "Distribution Code" msgstr "" +#. module: account_analytic_plans +#: view:analytic.plan.create.model:0 +msgid "Ok" +msgstr "" + #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 #: field:account.analytic.line,percentage:0 @@ -205,11 +210,6 @@ msgstr "" msgid "Journal Items" msgstr "" -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model -msgid "analytic.plan.create.model" -msgstr "" - #. module: account_analytic_plans #: field:account.analytic.plan.instance,account1_ids:0 msgid "Account1 Id" @@ -221,8 +221,8 @@ msgid "Maximum Allowed (%)" msgstr "" #. module: account_analytic_plans -#: field:account.analytic.plan.line,root_analytic_id:0 -msgid "Root Account" +#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model +msgid "analytic.plan.create.model" msgstr "" #. module: account_analytic_plans @@ -243,8 +243,10 @@ msgid "Distribution Models" msgstr "" #. module: account_analytic_plans -#: view:analytic.plan.create.model:0 -msgid "Ok" +#: code:addons/account_analytic_plans/account_analytic_plans.py:342 +#: code:addons/account_analytic_plans/account_analytic_plans.py:481 +#, python-format +msgid "No Analytic Journal!" msgstr "" #. module: account_analytic_plans @@ -342,16 +344,14 @@ msgstr "" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:342 -#: code:addons/account_analytic_plans/account_analytic_plans.py:486 +#: code:addons/account_analytic_plans/account_analytic_plans.py:481 #, python-format msgid "You have to define an analytic journal on the '%s' journal." msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:342 -#: code:addons/account_analytic_plans/account_analytic_plans.py:486 -#, python-format -msgid "No Analytic Journal !" +#: field:account.analytic.plan.line,root_analytic_id:0 +msgid "Root Account" msgstr "" #. module: account_analytic_plans diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot index bfdc3bea3e6be..92109768e62db 100644 --- a/addons/account_budget/i18n/account_budget.pot +++ b/addons/account_budget/i18n/account_budget.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -235,7 +235,7 @@ msgid "Budget Line" msgstr "" #. module: account_budget -#: code:addons/account_budget/account_budget.py:119 +#: code:addons/account_budget/account_budget.py:120 #, python-format msgid "The Budget '%s' has no accounts!" msgstr "" @@ -330,7 +330,7 @@ msgid "Theoretical Amt" msgstr "" #. module: account_budget -#: code:addons/account_budget/account_budget.py:119 +#: code:addons/account_budget/account_budget.py:120 #, python-format msgid "Error!" msgstr "" diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot index ed4b0e69e5991..c9c37e12b0e08 100644 --- a/addons/account_payment/i18n/account_payment.pot +++ b/addons/account_payment/i18n/account_payment.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -641,7 +641,7 @@ msgid "Total" msgstr "" #. module: account_payment -#: code:addons/account_payment/wizard/account_payment_order.py:112 +#: code:addons/account_payment/wizard/account_payment_order.py:113 #, python-format msgid "Entry Lines" msgstr "" diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot index e8b85b10788aa..cf965c6542f64 100644 --- a/addons/account_voucher/i18n/account_voucher.pot +++ b/addons/account_voucher/i18n/account_voucher.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -131,7 +131,7 @@ msgid "Voucher Statistics" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1641 +#: code:addons/account_voucher/account_voucher.py:1655 #, python-format msgid "You can not change the journal as you already reconciled some statement lines!" msgstr "" @@ -226,7 +226,7 @@ msgstr "" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:558 -#: code:addons/account_voucher/account_voucher.py:1073 +#: code:addons/account_voucher/account_voucher.py:1085 #, python-format msgid "Error!" msgstr "" @@ -258,7 +258,7 @@ msgid "Cancelled" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1249 +#: code:addons/account_voucher/account_voucher.py:1261 #, python-format msgid "You have to configure account base code and account tax code on the '%s' tax!" msgstr "" @@ -297,7 +297,7 @@ msgid "Tax" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:971 +#: code:addons/account_voucher/account_voucher.py:981 #, python-format msgid "Invalid Action!" msgstr "" @@ -351,7 +351,7 @@ msgid "e.g. Invoice SAJ/0042" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1208 +#: code:addons/account_voucher/account_voucher.py:1220 #, python-format msgid "Wrong voucher line" msgstr "" @@ -370,7 +370,7 @@ msgid "Receipt" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1110 +#: code:addons/account_voucher/account_voucher.py:1122 #, python-format msgid "You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" @@ -413,12 +413,6 @@ msgstr "" msgid "Debit" msgstr "" -#. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1641 -#, python-format -msgid "Unable to change journal !" -msgstr "" - #. module: account_voucher #: view:sale.receipt.report:0 #: field:sale.receipt.report,nbr:0 @@ -524,7 +518,7 @@ msgid "Are you sure you want to unreconcile this record?" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1249 +#: code:addons/account_voucher/account_voucher.py:1261 #, python-format msgid "No Account Base Code and Account Tax Code!" msgstr "" @@ -575,15 +569,15 @@ msgid "To Review" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1120 -#: code:addons/account_voucher/account_voucher.py:1134 -#: code:addons/account_voucher/account_voucher.py:1286 +#: code:addons/account_voucher/account_voucher.py:1132 +#: code:addons/account_voucher/account_voucher.py:1146 +#: code:addons/account_voucher/account_voucher.py:1297 #, python-format msgid "change" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1106 +#: code:addons/account_voucher/account_voucher.py:1118 #, python-format msgid "You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" @@ -671,7 +665,7 @@ msgid "Cancel Receipt" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1067 +#: code:addons/account_voucher/account_voucher.py:1079 #, python-format msgid "Configuration Error !" msgstr "" @@ -732,7 +726,7 @@ msgid "October" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1068 +#: code:addons/account_voucher/account_voucher.py:1080 #, python-format msgid "Please activate the sequence of selected journal !" msgstr "" @@ -812,7 +806,7 @@ msgid "Previous Payments ?" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1208 +#: code:addons/account_voucher/account_voucher.py:1220 #, python-format msgid "The invoice you are willing to pay is not valid anymore." msgstr "" @@ -844,7 +838,7 @@ msgid "Active" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1074 +#: code:addons/account_voucher/account_voucher.py:1086 #, python-format msgid "Please define a sequence on the journal." msgstr "" @@ -1140,6 +1134,12 @@ msgstr "" msgid "April" msgstr "" +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1655 +#, python-format +msgid "Unable to Change Journal!" +msgstr "" + #. module: account_voucher #: help:account.voucher,tax_id:0 msgid "Only for tax excluded from price" @@ -1177,7 +1177,7 @@ msgid "The amount of the voucher must be the same amount as the one on the state msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:971 +#: code:addons/account_voucher/account_voucher.py:981 #, python-format msgid "Cannot delete voucher(s) which are already opened or paid." msgstr "" @@ -1235,8 +1235,8 @@ msgid "Open Balance" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1106 -#: code:addons/account_voucher/account_voucher.py:1110 +#: code:addons/account_voucher/account_voucher.py:1118 +#: code:addons/account_voucher/account_voucher.py:1122 #, python-format msgid "Insufficient Configuration!" msgstr "" diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot index 8ae8cdf3ba4b2..101d227bd8e1d 100644 --- a/addons/analytic/i18n/analytic.pot +++ b/addons/analytic/i18n/analytic.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -43,7 +43,6 @@ msgstr "" #. module: analytic #: view:account.analytic.account:0 -#: field:account.analytic.account,date:0 msgid "End Date" msgstr "" @@ -87,6 +86,13 @@ msgstr "" msgid "Followers" msgstr "" +#. module: analytic +#: code:addons/analytic/analytic.py:160 +#, python-format +msgid "If you set a company, the currency selected has to be the same as it's currency. \n" +"You can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really useful for consolidation purposes of several companies charts with different currencies, for example." +msgstr "" + #. module: analytic #: selection:account.analytic.account,state:0 msgid "Closed" @@ -171,13 +177,6 @@ msgstr "" msgid "Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)" msgstr "" -#. module: analytic -#: code:addons/analytic/analytic.py:160 -#, python-format -msgid "If you set a company, the currency selected has to be the same as it's currency. \n" -"You can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example." -msgstr "" - #. module: analytic #: field:account.analytic.account,message_is_follower:0 msgid "Is a Follower" @@ -208,6 +207,11 @@ msgstr "" msgid "Terms and Conditions" msgstr "" +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Expiration Date" +msgstr "" + #. module: analytic #: help:account.analytic.line,amount:0 msgid "Calculated by multiplying the quantity and the price given in the Product's cost price. Always expressed in the company main currency." diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot index ff52db813cc45..c554a5dc86aa7 100644 --- a/addons/analytic_user_function/i18n/analytic_user_function.pot +++ b/addons/analytic_user_function/i18n/analytic_user_function.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -52,8 +52,8 @@ msgid "Analytic Account" msgstr "" #. module: analytic_user_function -#: code:addons/analytic_user_function/analytic_user_function.py:106 -#: code:addons/analytic_user_function/analytic_user_function.py:135 +#: code:addons/analytic_user_function/analytic_user_function.py:108 +#: code:addons/analytic_user_function/analytic_user_function.py:137 #, python-format msgid "Error!" msgstr "" @@ -81,15 +81,15 @@ msgid "Unit of Measure" msgstr "" #. module: analytic_user_function -#: code:addons/analytic_user_function/analytic_user_function.py:107 -#: code:addons/analytic_user_function/analytic_user_function.py:136 -#, python-format -msgid "There is no expense account define for this product: \"%s\" (id:%d)" +#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet +msgid "Timesheet Line" msgstr "" #. module: analytic_user_function -#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet -msgid "Timesheet Line" +#: code:addons/analytic_user_function/analytic_user_function.py:109 +#: code:addons/analytic_user_function/analytic_user_function.py:138 +#, python-format +msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" #. module: analytic_user_function diff --git a/addons/audittrail/i18n/audittrail.pot b/addons/audittrail/i18n/audittrail.pot index 4ae96f0e3f460..b959ba5008f5e 100644 --- a/addons/audittrail/i18n/audittrail.pot +++ b/addons/audittrail/i18n/audittrail.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -39,8 +39,8 @@ msgstr "" #. module: audittrail #: code:addons/audittrail/audittrail.py:260 -#: code:addons/audittrail/audittrail.py:347 -#: code:addons/audittrail/audittrail.py:408 +#: code:addons/audittrail/audittrail.py:353 +#: code:addons/audittrail/audittrail.py:414 #, python-format msgid "'%s' Model does not exist..." msgstr "" diff --git a/addons/auth_oauth/i18n/auth_oauth.pot b/addons/auth_oauth/i18n/auth_oauth.pot index 429371edd9f16..a8438cb3b7d8a 100644 --- a/addons/auth_oauth/i18n/auth_oauth.pot +++ b/addons/auth_oauth/i18n/auth_oauth.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -30,6 +30,13 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: auth_oauth +#. openerp-web +#: code:addons/auth_oauth/static/src/js/auth_oauth.js:14 +#, python-format +msgid "Sign up error" +msgstr "" + #. module: auth_oauth #: field:auth.oauth.provider,name:0 msgid "Provider name" @@ -65,6 +72,14 @@ msgstr "" msgid "unknown" msgstr "" +#. module: auth_oauth +#. openerp-web +#: code:addons/auth_oauth/static/src/js/auth_oauth.js:16 +#: code:addons/auth_oauth/static/src/js/auth_oauth.js:18 +#, python-format +msgid "Authentication error" +msgstr "" + #. module: auth_oauth #: field:res.users,oauth_access_token:0 msgid "OAuth Access Token" @@ -77,6 +92,13 @@ msgstr "" msgid "Client ID" msgstr "" +#. module: auth_oauth +#. openerp-web +#: code:addons/auth_oauth/static/src/js/auth_oauth.js:16 +#, python-format +msgid "Access Denied" +msgstr "" + #. module: auth_oauth #: model:ir.ui.menu,name:auth_oauth.menu_oauth_providers msgid "OAuth Providers" @@ -132,3 +154,17 @@ msgstr "" msgid "Allowed" msgstr "" +#. module: auth_oauth +#. openerp-web +#: code:addons/auth_oauth/static/src/js/auth_oauth.js:14 +#, python-format +msgid "Sign up is not allowed on this database." +msgstr "" + +#. module: auth_oauth +#. openerp-web +#: code:addons/auth_oauth/static/src/js/auth_oauth.js:18 +#, python-format +msgid "You do not have access to this database or your invitation has expired. Please ask for an invitation and be sure to follow the link in your invitation email." +msgstr "" + diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot index 2154e13ba6e06..5b995ba873562 100644 --- a/addons/auth_signup/i18n/auth_signup.pot +++ b/addons/auth_signup/i18n/auth_signup.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -83,7 +83,7 @@ msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:121 #, python-format msgid "Please enter a password and confirm it." msgstr "" @@ -120,7 +120,7 @@ msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:115 #, python-format msgid "Please enter a name." msgstr "" @@ -166,7 +166,7 @@ msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:118 #, python-format msgid "Please enter a username." msgstr "" @@ -180,7 +180,7 @@ msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:177 +#: code:addons/auth_signup/static/src/js/auth_signup.js:178 #, python-format msgid "An email has been sent with credentials to reset your password" msgstr "" @@ -201,7 +201,7 @@ msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:173 +#: code:addons/auth_signup/static/src/js/auth_signup.js:174 #, python-format msgid "Please enter a username or email address." msgstr "" @@ -237,35 +237,35 @@ msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:111 -#: code:addons/auth_signup/static/src/js/auth_signup.js:114 -#: code:addons/auth_signup/static/src/js/auth_signup.js:117 -#: code:addons/auth_signup/static/src/js/auth_signup.js:120 -#: code:addons/auth_signup/static/src/js/auth_signup.js:123 -#: code:addons/auth_signup/static/src/js/auth_signup.js:170 -#: code:addons/auth_signup/static/src/js/auth_signup.js:173 +#: code:addons/auth_signup/static/src/js/auth_signup.js:112 +#: code:addons/auth_signup/static/src/js/auth_signup.js:115 +#: code:addons/auth_signup/static/src/js/auth_signup.js:118 +#: code:addons/auth_signup/static/src/js/auth_signup.js:121 +#: code:addons/auth_signup/static/src/js/auth_signup.js:124 +#: code:addons/auth_signup/static/src/js/auth_signup.js:171 +#: code:addons/auth_signup/static/src/js/auth_signup.js:174 #, python-format msgid "Login" msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:97 +#: code:addons/auth_signup/static/src/js/auth_signup.js:98 #, python-format msgid "Invalid signup token" msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:124 #, python-format msgid "Passwords do not match; please retype them." msgstr "" #. module: auth_signup #. openerp-web -#: code:addons/auth_signup/static/src/js/auth_signup.js:111 -#: code:addons/auth_signup/static/src/js/auth_signup.js:170 +#: code:addons/auth_signup/static/src/js/auth_signup.js:112 +#: code:addons/auth_signup/static/src/js/auth_signup.js:171 #, python-format msgid "No database selected !" msgstr "" diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot index 2b2ac7a79ad1d..166af77c86559 100644 --- a/addons/base_calendar/i18n/base_calendar.pot +++ b/addons/base_calendar/i18n/base_calendar.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -239,7 +239,7 @@ msgid "To" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:1262 +#: code:addons/base_calendar/base_calendar.py:1318 #, python-format msgid "Error!" msgstr "" @@ -348,11 +348,11 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:399 -#: code:addons/base_calendar/base_calendar.py:441 -#: code:addons/base_calendar/base_calendar.py:1015 -#: code:addons/base_calendar/base_calendar.py:1017 -#: code:addons/base_calendar/base_calendar.py:1462 +#: code:addons/base_calendar/base_calendar.py:401 +#: code:addons/base_calendar/base_calendar.py:443 +#: code:addons/base_calendar/base_calendar.py:1007 +#: code:addons/base_calendar/base_calendar.py:1009 +#: code:addons/base_calendar/base_calendar.py:1528 #, python-format msgid "Warning!" msgstr "" @@ -509,7 +509,7 @@ msgid "Event alarm information" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:1017 +#: code:addons/base_calendar/base_calendar.py:1009 #, python-format msgid "Count cannot be negative or 0." msgstr "" @@ -733,7 +733,7 @@ msgid "Declined" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:1462 +#: code:addons/base_calendar/base_calendar.py:1528 #, python-format msgid "Group by date is not supported, use the calendar view instead." msgstr "" @@ -1044,7 +1044,7 @@ msgid "Active" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:399 +#: code:addons/base_calendar/base_calendar.py:401 #, python-format msgid "You cannot duplicate a calendar attendee." msgstr "" @@ -1175,7 +1175,7 @@ msgid "Select Weekdays" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:1521 +#: code:addons/base_calendar/base_calendar.py:1587 #: selection:calendar.attendee,availability:0 #: selection:calendar.event,show_as:0 #: selection:calendar.todo,show_as:0 @@ -1421,7 +1421,7 @@ msgid "Weekday" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:1015 +#: code:addons/base_calendar/base_calendar.py:1007 #, python-format msgid "Interval cannot be negative." msgstr "" @@ -1434,7 +1434,7 @@ msgid "By day" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:441 +#: code:addons/base_calendar/base_calendar.py:443 #, python-format msgid "First you have to specify the date of the invitation." msgstr "" diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot index 934b1217b3775..28eed6ce92568 100644 --- a/addons/base_import/i18n/base_import.pot +++ b/addons/base_import/i18n/base_import.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:451 +#: code:addons/base_import/static/src/js/import.js:458 #, python-format msgid "Get all possible values" msgstr "" @@ -51,7 +51,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:331 +#: code:addons/base_import/static/src/js/import.js:337 #, python-format msgid "Relation Fields" msgstr "" @@ -182,9 +182,9 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:15 +#: code:addons/base_import/static/src/js/import.js:488 #, python-format -msgid "Validate" +msgid "No matches found" msgstr "" #. module: base_import @@ -295,7 +295,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:174 +#: code:addons/base_import/static/src/js/import.js:180 #, python-format msgid "Semicolon" msgstr "" @@ -337,7 +337,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:175 +#: code:addons/base_import/static/src/js/import.js:181 #, python-format msgid "Tab" msgstr "" @@ -456,7 +456,7 @@ msgid "base_import.tests.models.char.required" msgstr "" #. module: base_import -#: code:addons/base_import/models.py:112 +#: code:addons/base_import/models.py:113 #, python-format msgid "Database ID" msgstr "" @@ -546,7 +546,7 @@ msgid "The tags should be separated by a comma without any \n" msgstr "" #. module: base_import -#: code:addons/base_import/models.py:264 +#: code:addons/base_import/models.py:265 #, python-format msgid "You must configure at least one field to import" msgstr "" @@ -580,7 +580,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:74 +#: code:addons/base_import/static/src/js/import.js:79 #, python-format msgid "Quoting:" msgstr "" @@ -607,21 +607,19 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:438 +#: code:addons/base_import/static/src/js/import.js:445 #, python-format msgid "Here are the possible values:" msgstr "" #. module: base_import -#. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:82 -#, python-format -msgid "The" +#: field:base_import.import,res_model:0 +msgid "Model" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:248 +#: code:addons/base_import/static/src/js/import.js:254 #, python-format msgid "A single column was found in the file, this often means the file separator is incorrect" msgstr "" @@ -687,6 +685,13 @@ msgstr "" msgid "Country/External ID: base.be" msgstr "" +#. module: base_import +#. openerp-web +#: code:addons/base_import/static/src/xml/import.xml:82 +#, python-format +msgid "The" +msgstr "" + #. module: base_import #. openerp-web #: code:addons/base_import/static/src/xml/import.xml:288 @@ -701,9 +706,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:427 +#: code:addons/base_import/static/src/xml/import.xml:329 #, python-format -msgid "(%d more)" +msgid "The two files produced are ready to be imported in \n" +" OpenERP without any modifications. After having \n" +" imported these two CSV files, you will have 4 contacts \n" +" and 3 companies. (the firsts two contacts are linked \n" +" to the first company). You must first import the \n" +" companies and then the persons." msgstr "" #. module: base_import @@ -715,7 +725,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:72 +#: code:addons/base_import/static/src/js/import.js:77 #, python-format msgid "Encoding:" msgstr "" @@ -736,10 +746,9 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:295 +#: code:addons/base_import/static/src/js/import.js:489 #, python-format -msgid "We will first export all companies and their \n" -" \"External ID\". In PSQL, write the following command:" +msgid "Loading more results..." msgstr "" #. module: base_import @@ -752,7 +761,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:404 +#: code:addons/base_import/static/src/js/import.js:411 #, python-format msgid "Everything seems valid." msgstr "" @@ -769,11 +778,18 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:421 +#: code:addons/base_import/static/src/js/import.js:428 #, python-format msgid "at row %d" msgstr "" +#. module: base_import +#. openerp-web +#: code:addons/base_import/static/src/xml/import.xml:15 +#, python-format +msgid "Validate" +msgstr "" + #. module: base_import #. openerp-web #: code:addons/base_import/static/src/xml/import.xml:197 @@ -869,7 +885,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:176 +#: code:addons/base_import/static/src/js/import.js:182 #, python-format msgid "Space" msgstr "" @@ -912,6 +928,14 @@ msgstr "" msgid "base_import.tests.models.char.readonly" msgstr "" +#. module: base_import +#. openerp-web +#: code:addons/base_import/static/src/xml/import.xml:295 +#, python-format +msgid "We will first export all companies and their \n" +" \"External ID\". In PSQL, write the following command:" +msgstr "" + #. module: base_import #. openerp-web #: code:addons/base_import/static/src/xml/import.xml:169 @@ -921,7 +945,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:330 +#: code:addons/base_import/static/src/js/import.js:336 #, python-format msgid "Normal Fields" msgstr "" @@ -958,8 +982,8 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:173 -#: code:addons/base_import/static/src/js/import.js:184 +#: code:addons/base_import/static/src/js/import.js:179 +#: code:addons/base_import/static/src/js/import.js:190 #, python-format msgid "Comma" msgstr "" @@ -989,8 +1013,10 @@ msgid "person_3,Eric,False,company_2" msgstr "" #. module: base_import -#: field:base_import.import,res_model:0 -msgid "Model" +#. openerp-web +#: code:addons/base_import/static/src/js/import.js:490 +#, python-format +msgid "Searching..." msgstr "" #. module: base_import @@ -1003,14 +1029,9 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:329 +#: code:addons/base_import/static/src/js/import.js:434 #, python-format -msgid "The two files produced are ready to be imported in \n" -" OpenERP without any modifications. After having \n" -" imported these two CSV files, you will have 4 contacts \n" -" and 3 companies. (the firsts two contacts are linked \n" -" to the first company). You must first import the \n" -" companies and then the persons." +msgid "(%d more)" msgstr "" #. module: base_import @@ -1027,7 +1048,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:73 +#: code:addons/base_import/static/src/js/import.js:78 #, python-format msgid "Separator:" msgstr "" @@ -1039,8 +1060,8 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/models.py:80 -#: code:addons/base_import/models.py:111 +#: code:addons/base_import/models.py:81 +#: code:addons/base_import/models.py:112 #: code:addons/base_import/static/src/xml/import.xml:77 #: code:addons/base_import/static/src/xml/import.xml:82 #, python-format @@ -1056,7 +1077,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/js/import.js:423 +#: code:addons/base_import/static/src/js/import.js:430 #, python-format msgid "between rows %d and %d" msgstr "" diff --git a/addons/base_status/i18n/base_status.pot b/addons/base_status/i18n/base_status.pot index 49c71fe731f62..ac9fbd0a4b0af 100644 --- a/addons/base_status/i18n/base_status.pot +++ b/addons/base_status/i18n/base_status.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,12 +15,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: base_status -#: code:addons/base_status/base_state.py:107 -#, python-format -msgid "Error !" -msgstr "" - #. module: base_status #: code:addons/base_status/base_state.py:166 #, python-format @@ -34,9 +28,9 @@ msgid "%s has been renewed." msgstr "" #. module: base_status -#: code:addons/base_status/base_stage.py:210 +#: code:addons/base_status/base_state.py:193 #, python-format -msgid "Error!" +msgid "%s is now pending." msgstr "" #. module: base_status @@ -46,9 +40,10 @@ msgid "You can not escalate, you are already at the top level regarding your sal msgstr "" #. module: base_status -#: code:addons/base_status/base_state.py:193 +#: code:addons/base_status/base_stage.py:210 +#: code:addons/base_status/base_state.py:107 #, python-format -msgid "%s is now pending." +msgid "Error!" msgstr "" #. module: base_status diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot index 8957a7731d17d..537e55dc13994 100644 --- a/addons/base_vat/i18n/base_vat.pot +++ b/addons/base_vat/i18n/base_vat.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,12 +21,18 @@ msgid "Check Validity" msgstr "" #. module: base_vat -#: code:addons/base_vat/base_vat.py:152 +#: code:addons/base_vat/base_vat.py:155 #, python-format msgid "This VAT number does not seem to be valid.\n" "Note: the expected format is %s" msgstr "" +#. module: base_vat +#: code:addons/base_vat/base_vat.py:154 +#, python-format +msgid "This VAT number either failed the VIES VAT validation check or did not respect the expected format %s." +msgstr "" + #. module: base_vat #: field:res.company,vat_check_vies:0 msgid "VIES VAT Check" @@ -38,7 +44,7 @@ msgid "Companies" msgstr "" #. module: base_vat -#: code:addons/base_vat/base_vat.py:113 +#: code:addons/base_vat/base_vat.py:114 #, python-format msgid "Error!" msgstr "" diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index 024cc152effcb..72698a2dbd66e 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-07 16:56+0000\n" -"PO-Revision-Date: 2014-01-07 16:56+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgid "Rule Name" msgstr "" #. module: crm -#: code:addons/crm/crm_phonecall.py:282 +#: code:addons/crm/crm_phonecall.py:283 #, python-format msgid "It's only possible to convert one phonecall at a time." msgstr "" @@ -182,7 +182,7 @@ msgstr "" #. module: crm #: code:addons/crm/crm_lead.py:637 #: code:addons/crm/crm_lead.py:758 -#: code:addons/crm/crm_phonecall.py:282 +#: code:addons/crm/crm_phonecall.py:283 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:92 #, python-format msgid "Warning!" @@ -210,7 +210,7 @@ msgid "Schedule Other Call" msgstr "" #. module: crm -#: code:addons/crm/crm_phonecall.py:211 +#: code:addons/crm/crm_phonecall.py:212 #: view:crm.phonecall:0 #, python-format msgid "Phone Call" @@ -246,6 +246,11 @@ msgstr "" msgid "Assigned to My Team(s)" msgstr "" +#. module: crm +#: view:crm.segmentation:0 +msgid "Excluded Answers :" +msgstr "" + #. module: crm #: model:ir.model,name:crm.model_crm_merge_opportunity msgid "Merge opportunities" @@ -288,7 +293,7 @@ msgid "Prospect Partner" msgstr "" #. module: crm -#: code:addons/crm/crm_lead.py:1018 +#: code:addons/crm/crm_lead.py:1021 #, python-format msgid "No Subject" msgstr "" @@ -379,6 +384,7 @@ msgid "Unread Messages" msgstr "" #. module: crm +#: view:crm.segmentation:0 #: field:crm.segmentation.line,segmentation_id:0 #: model:ir.actions.act_window,name:crm.crm_segmentation-act msgid "Segmentation" @@ -501,7 +507,7 @@ msgid "Planned Revenue" msgstr "" #. module: crm -#: code:addons/crm/crm_lead.py:1004 +#: code:addons/crm/crm_lead.py:1007 #, python-format msgid "Customer Email" msgstr "" @@ -519,8 +525,8 @@ msgid "October" msgstr "" #. module: crm -#: view:crm.phonecall:0 -msgid "Reset to Todo" +#: view:crm.segmentation:0 +msgid "Included Answers :" msgstr "" #. module: crm @@ -561,6 +567,11 @@ msgstr "" msgid "No customer name defined. Please fill one of the following fields: Company Name, Contact Name or Email (\"Name \")" msgstr "" +#. module: crm +#: view:crm.segmentation:0 +msgid "Profiling Options" +msgstr "" + #. module: crm #: view:crm.phonecall.report:0 msgid "#Phone calls" @@ -633,7 +644,7 @@ msgid "Partner Segmentation" msgstr "" #. module: crm -#: code:addons/crm/crm_lead.py:1064 +#: code:addons/crm/crm_lead.py:1067 #, python-format msgid "Logged a call for %(date)s. %(description)s" msgstr "" @@ -1196,7 +1207,7 @@ msgid "Days to Close" msgstr "" #. module: crm -#: code:addons/crm/crm_lead.py:1075 +#: code:addons/crm/crm_lead.py:1078 #: field:crm.case.section,complete_name:0 #, python-format msgid "unknown" @@ -1264,6 +1275,11 @@ msgstr "" msgid "Phone Calls Assigned to the current user or with a team having the current user as team leader" msgstr "" +#. module: crm +#: view:crm.segmentation:0 +msgid "Segmentation Description" +msgstr "" + #. module: crm #: code:addons/crm/crm_lead.py:578 #, python-format @@ -1545,7 +1561,7 @@ msgid "Describe the lead..." msgstr "" #. module: crm -#: code:addons/crm/crm_phonecall.py:292 +#: code:addons/crm/crm_phonecall.py:293 #, python-format msgid "Partner has been created." msgstr "" @@ -1760,7 +1776,7 @@ msgid "Support Department" msgstr "" #. module: crm -#: code:addons/crm/crm_lead.py:1078 +#: code:addons/crm/crm_lead.py:1081 #, python-format msgid "Meeting scheduled at '%s'
Subject: %s
Duration: %s hour(s)" msgstr "" @@ -2740,7 +2756,6 @@ msgstr "" #. module: crm #: field:crm.case.section,note:0 #: field:crm.phonecall,description:0 -#: view:crm.segmentation:0 #: field:crm.segmentation,description:0 msgid "Description" msgstr "" @@ -2812,7 +2827,12 @@ msgid "Referred By" msgstr "" #. module: crm -#: code:addons/crm/crm_lead.py:1066 +#: view:crm.phonecall:0 +msgid "Reset to Todo" +msgstr "" + +#. module: crm +#: code:addons/crm/crm_lead.py:1069 #, python-format msgid "Scheduled a call for %(date)s. %(description)s" msgstr "" @@ -2823,7 +2843,7 @@ msgid "Working Hours" msgstr "" #. module: crm -#: code:addons/crm/crm_lead.py:1002 +#: code:addons/crm/crm_lead.py:1005 #: view:crm.lead:0 #: field:crm.lead2opportunity.partner,partner_id:0 #: field:crm.lead2opportunity.partner.mass,partner_id:0 @@ -2889,6 +2909,11 @@ msgstr "" msgid "Campaign Name" msgstr "" +#. module: crm +#: view:crm.segmentation:0 +msgid "Profiling" +msgstr "" + #. module: crm #: model:ir.model,name:crm.model_crm_phonecall_report msgid "Phone calls by user and section" diff --git a/addons/crm_claim/i18n/crm_claim.pot b/addons/crm_claim/i18n/crm_claim.pot index c5ffe0efd0e2b..981759960e826 100644 --- a/addons/crm_claim/i18n/crm_claim.pot +++ b/addons/crm_claim/i18n/crm_claim.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -191,8 +191,8 @@ msgid "Partner" msgstr "" #. module: crm_claim -#: view:crm.claim:0 -msgid "Follow Up" +#: view:crm.claim.report:0 +msgid "Month of claim" msgstr "" #. module: crm_claim @@ -259,8 +259,9 @@ msgid "Lowest" msgstr "" #. module: crm_claim -#: field:crm.claim,action_next:0 -msgid "Next Action" +#: code:addons/crm_claim/crm_claim.py:186 +#, python-format +msgid "%s (copy)" msgstr "" #. module: crm_claim @@ -333,7 +334,7 @@ msgid "Destination email for email gateway." msgstr "" #. module: crm_claim -#: code:addons/crm_claim/crm_claim.py:194 +#: code:addons/crm_claim/crm_claim.py:202 #, python-format msgid "No Subject" msgstr "" @@ -407,6 +408,11 @@ msgstr "" msgid "Update Date" msgstr "" +#. module: crm_claim +#: field:crm.claim,action_next:0 +msgid "Next Action" +msgstr "" + #. module: crm_claim #: view:crm.claim.report:0 msgid "Year of claim" @@ -751,8 +757,8 @@ msgid "# Emails" msgstr "" #. module: crm_claim -#: view:crm.claim.report:0 -msgid "Month of claim" +#: view:crm.claim:0 +msgid "Follow Up" msgstr "" #. module: crm_claim diff --git a/addons/crm_helpdesk/i18n/crm_helpdesk.pot b/addons/crm_helpdesk/i18n/crm_helpdesk.pot index 2cb1c3af7fedc..56e20de5139dc 100644 --- a/addons/crm_helpdesk/i18n/crm_helpdesk.pot +++ b/addons/crm_helpdesk/i18n/crm_helpdesk.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -263,7 +263,7 @@ msgid "Month of helpdesk requests" msgstr "" #. module: crm_helpdesk -#: code:addons/crm_helpdesk/crm_helpdesk.py:104 +#: code:addons/crm_helpdesk/crm_helpdesk.py:105 #, python-format msgid "No Subject" msgstr "" diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot index bef6379ad7174..a0e56bdcf4716 100644 --- a/addons/delivery/i18n/delivery.pot +++ b/addons/delivery/i18n/delivery.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -30,6 +30,11 @@ msgstr "" msgid " in Function of " msgstr "" +#. module: delivery +#: view:delivery.carrier:0 +msgid "Zip" +msgstr "" + #. module: delivery #: view:delivery.carrier:0 #: view:delivery.grid:0 @@ -49,6 +54,8 @@ msgstr "" #. module: delivery #: field:stock.move,weight_uom_id:0 #: field:stock.picking,weight_uom_id:0 +#: field:stock.picking.in,weight_uom_id:0 +#: field:stock.picking.out,weight_uom_id:0 msgid "Unit of Measure" msgstr "" @@ -62,13 +69,15 @@ msgstr "" #: selection:delivery.grid.line,type:0 #: selection:delivery.grid.line,variable_factor:0 #: field:stock.picking,volume:0 +#: field:stock.picking.in,volume:0 #: field:stock.picking.out,volume:0 msgid "Volume" msgstr "" #. module: delivery -#: view:delivery.carrier:0 -msgid "Zip" +#: code:addons/delivery/sale.py:54 +#, python-format +msgid "No grid matching for this carrier!" msgstr "" #. module: delivery @@ -87,7 +96,7 @@ msgid "Delivery order" msgstr "" #. module: delivery -#: code:addons/delivery/delivery.py:221 +#: code:addons/delivery/delivery.py:222 #, python-format msgid "No line matched this product or order in the chosen delivery grid." msgstr "" @@ -160,7 +169,7 @@ msgid "Delivery Method" msgstr "" #. module: delivery -#: code:addons/delivery/delivery.py:221 +#: code:addons/delivery/delivery.py:222 #, python-format msgid "No price available!" msgstr "" @@ -172,6 +181,7 @@ msgstr "" #. module: delivery #: field:stock.picking,carrier_tracking_ref:0 +#: field:stock.picking.in,carrier_tracking_ref:0 #: field:stock.picking.out,carrier_tracking_ref:0 msgid "Carrier Tracking Ref" msgstr "" @@ -303,6 +313,7 @@ msgstr "" #. module: delivery #: field:stock.picking,number_of_packages:0 +#: field:stock.picking.in,number_of_packages:0 #: field:stock.picking.out,number_of_packages:0 msgid "Number of Packages" msgstr "" @@ -330,23 +341,11 @@ msgstr "" msgid "Keep empty if the pricing depends on the advanced pricing per destination" msgstr "" -#. module: delivery -#: code:addons/delivery/sale.py:54 -#, python-format -msgid "No grid available !" -msgstr "" - #. module: delivery #: selection:delivery.grid.line,operator:0 msgid ">=" msgstr "" -#. module: delivery -#: code:addons/delivery/sale.py:57 -#, python-format -msgid "Order not in draft state !" -msgstr "" - #. module: delivery #: report:sale.shipping:0 msgid "Lot" @@ -378,6 +377,12 @@ msgstr "" msgid "Cost Price" msgstr "" +#. module: delivery +#: code:addons/delivery/sale.py:57 +#, python-format +msgid "Order not in Draft State!" +msgstr "" + #. module: delivery #: selection:delivery.grid.line,price_type:0 #: field:delivery.grid.line,type:0 @@ -425,6 +430,12 @@ msgstr "" msgid "Complete this field if you plan to invoice the shipping based on picking." msgstr "" +#. module: delivery +#: code:addons/delivery/sale.py:54 +#, python-format +msgid "No Grid Available!" +msgstr "" + #. module: delivery #: code:addons/delivery/delivery.py:136 #, python-format @@ -443,6 +454,8 @@ msgstr "" #. module: delivery #: help:stock.picking,weight_uom_id:0 +#: help:stock.picking.in,weight_uom_id:0 +#: help:stock.picking.out,weight_uom_id:0 msgid "Unit of measurement for Weight" msgstr "" @@ -469,12 +482,6 @@ msgstr "" msgid "Price" msgstr "" -#. module: delivery -#: code:addons/delivery/sale.py:54 -#, python-format -msgid "No grid matching for this carrier !" -msgstr "" - #. module: delivery #: model:ir.ui.menu,name:delivery.menu_delivery msgid "Delivery" @@ -508,6 +515,7 @@ msgstr "" #: model:ir.model,name:delivery.model_delivery_carrier #: report:sale.shipping:0 #: field:stock.picking,carrier_id:0 +#: field:stock.picking.in,carrier_id:0 #: field:stock.picking.out,carrier_id:0 msgid "Carrier" msgstr "" diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot index 1b6d987cdd336..0aca9b40b2a73 100644 --- a/addons/document/i18n/document.pot +++ b/addons/document/i18n/document.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgid "Parent Directory" msgstr "" #. module: document -#: code:addons/document/document.py:350 +#: code:addons/document/document.py:348 #, python-format msgid "Directory name contains special characters!" msgstr "" @@ -105,8 +105,8 @@ msgid "The name of the field." msgstr "" #. module: document -#: code:addons/document/document.py:340 -#: code:addons/document/document.py:345 +#: code:addons/document/document.py:338 +#: code:addons/document/document.py:343 #, python-format msgid "Directory name must be unique!" msgstr "" @@ -188,9 +188,9 @@ msgid "

\n" msgstr "" #. module: document -#: code:addons/document/document.py:340 -#: code:addons/document/document.py:345 -#: code:addons/document/document.py:350 +#: code:addons/document/document.py:338 +#: code:addons/document/document.py:343 +#: code:addons/document/document.py:348 #, python-format msgid "ValidateError" msgstr "" @@ -236,8 +236,8 @@ msgid "The filename must be unique in a directory !" msgstr "" #. module: document -#: code:addons/document/document.py:110 -#: code:addons/document/document.py:310 +#: code:addons/document/document.py:118 +#: code:addons/document/document.py:308 #, python-format msgid "%s (copy)" msgstr "" @@ -294,7 +294,7 @@ msgid "Virtual Files" msgstr "" #. module: document -#: code:addons/document/document.py:576 +#: code:addons/document/document.py:574 #, python-format msgid "Error at doc write!" msgstr "" diff --git a/addons/document_page/i18n/document_page.pot b/addons/document_page/i18n/document_page.pot index c257388aeea55..8139bba87cf8a 100644 --- a/addons/document_page/i18n/document_page.pot +++ b/addons/document_page/i18n/document_page.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -196,6 +196,12 @@ msgstr "" msgid "e.g. Once upon a time..." msgstr "" +#. module: document_page +#: code:addons/document_page/wizard/wiki_make_index.py:52 +#, python-format +msgid "There is no section in this Page." +msgstr "" + #. module: document_page #: view:document.page.history:0 msgid "Document History" @@ -239,6 +245,7 @@ msgstr "" #. module: document_page #: code:addons/document_page/document_page.py:129 #: code:addons/document_page/wizard/document_page_show_diff.py:50 +#: code:addons/document_page/wizard/wiki_make_index.py:52 #, python-format msgid "Warning!" msgstr "" diff --git a/addons/edi/i18n/edi.pot b/addons/edi/i18n/edi.pot index 494b8fbfe30c1..71fe3474d420b 100644 --- a/addons/edi/i18n/edi.pot +++ b/addons/edi/i18n/edi.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "" #. module: edi #: code:addons/edi/models/edi.py:130 #, python-format -msgid "Missing application." +msgid "Missing Application." msgstr "" #. module: edi diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot index daa654a708f70..b45ab31c41cbf 100644 --- a/addons/email_template/i18n/email_template.pot +++ b/addons/email_template/i18n/email_template.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -148,6 +148,12 @@ msgstr "" msgid "Email Templates" msgstr "" +#. module: email_template +#: help:email.template,model_id:0 +#: help:email_template.preview,model_id:0 +msgid "The kind of document with with this template can be used" +msgstr "" + #. module: email_template #: help:email.template,report_name:0 #: help:email_template.preview,report_name:0 @@ -168,9 +174,8 @@ msgid "Sidebar action" msgstr "" #. module: email_template -#: help:email.template,lang:0 -#: help:email_template.preview,lang:0 -msgid "Optional translation language (ISO code) to select when sending out an email. If not set, the english version will be used. This should usually be a placeholder expression that provides the appropriate language code, e.g. ${object.partner_id.lang.code}." +#: view:email_template.preview:0 +msgid "Preview of" msgstr "" #. module: email_template @@ -223,8 +228,9 @@ msgid "Advanced" msgstr "" #. module: email_template -#: view:email_template.preview:0 -msgid "Preview of" +#: code:addons/email_template/email_template.py:381 +#, python-format +msgid "Warning!" msgstr "" #. module: email_template @@ -329,9 +335,9 @@ msgid "Add context action" msgstr "" #. module: email_template -#: help:email.template,model_id:0 -#: help:email_template.preview,model_id:0 -msgid "The kind of document with with this template can be used" +#: help:email.template,lang:0 +#: help:email_template.preview,lang:0 +msgid "Optional translation language (ISO code) to select when sending out an email. If not set, the english version will be used. This should usually be a placeholder expression that provides the appropriate language, e.g. ${object.partner_id.lang}." msgstr "" #. module: email_template @@ -438,6 +444,12 @@ msgstr "" msgid "Suppliers" msgstr "" +#. module: email_template +#: code:addons/email_template/email_template.py:381 +#, python-format +msgid "Sender email is missing or empty after template rendering. Specify one to deliver your message" +msgstr "" + #. module: email_template #: field:email.template,user_signature:0 #: field:email_template.preview,user_signature:0 diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 1e1ef8328f501..1662c56e3894b 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -188,7 +188,7 @@ msgstr "" #. module: event #: code:addons/event/event.py:89 #: code:addons/event/event.py:100 -#: code:addons/event/event.py:355 +#: code:addons/event/event.py:357 #, python-format msgid "Error!" msgstr "" @@ -382,7 +382,7 @@ msgid "Email" msgstr "" #. module: event -#: code:addons/event/event.py:329 +#: code:addons/event/event.py:331 #, python-format msgid "New registration confirmed: %s." msgstr "" @@ -440,11 +440,6 @@ msgstr "" msgid "Confirm Anyway" msgstr "" -#. module: event -#: field:report.event.registration,nbevent:0 -msgid "Number Of Events" -msgstr "" - #. module: event #: help:event.event,main_speaker_id:0 msgid "Speaker who will be giving speech at the event." @@ -741,6 +736,11 @@ msgstr "" msgid "Extended Filters..." msgstr "" +#. module: event +#: field:report.event.registration,nbevent:0 +msgid "Number of Registrations" +msgstr "" + #. module: event #: selection:report.event.registration,month:0 msgid "October" @@ -812,7 +812,7 @@ msgid "Error ! Closing Date cannot be set before Beginning Date." msgstr "" #. module: event -#: code:addons/event/event.py:355 +#: code:addons/event/event.py:357 #, python-format msgid "You must wait for the starting day of the event to do this action." msgstr "" diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot index 3eb59e6f93643..82e4aa7437ac1 100644 --- a/addons/event_sale/i18n/event_sale.pot +++ b/addons/event_sale/i18n/event_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,7 +66,7 @@ msgid "Technical Training" msgstr "" #. module: event_sale -#: code:addons/event_sale/event_sale.py:88 +#: code:addons/event_sale/event_sale.py:92 #, python-format msgid "The registration %s has been created from the Sales Order %s." msgstr "" diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot index fedea6321a782..6c41affba3ed3 100644 --- a/addons/fleet/i18n/fleet.pot +++ b/addons/fleet/i18n/fleet.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:11+0000\n" +"PO-Revision-Date: 2014-08-14 00:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -81,7 +81,9 @@ msgstr "" #. module: fleet #: view:fleet.vehicle.cost:0 +#: view:fleet.vehicle.log.fuel:0 #: view:fleet.vehicle.model:0 +#: view:fleet.vehicle.odometer:0 msgid "Group By..." msgstr "" @@ -463,6 +465,7 @@ msgid "Vehicles Services Logs" msgstr "" #. module: fleet +#: view:fleet.vehicle.log.fuel:0 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act #: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu msgid "Vehicles Fuel Logs" @@ -577,8 +580,8 @@ msgid "Driver of the vehicle" msgstr "" #. module: fleet -#: view:fleet.vehicle:0 -msgid "other(s)" +#: view:fleet.vehicle.odometer:0 +msgid "Vehicles odometers" msgstr "" #. module: fleet @@ -1618,6 +1621,8 @@ msgstr "" #: view:fleet.vehicle:0 #: view:fleet.vehicle.cost:0 #: field:fleet.vehicle.cost,vehicle_id:0 +#: view:fleet.vehicle.log.fuel:0 +#: view:fleet.vehicle.odometer:0 #: field:fleet.vehicle.odometer,vehicle_id:0 msgid "Vehicle" msgstr "" @@ -1779,6 +1784,11 @@ msgstr "" msgid "Windshield Wiper(s) Replacement" msgstr "" +#. module: fleet +#: view:fleet.vehicle:0 +msgid "other(s)" +msgstr "" + #. module: fleet #: view:fleet.vehicle.log.contract:0 #: field:fleet.vehicle.log.contract,generated_cost_ids:0 diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index 884daf063d72b..334ea62c5945a 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -424,11 +424,6 @@ msgstr "" msgid "This installs the module hr_attendance." msgstr "" -#. module: hr -#: field:hr.employee,image_small:0 -msgid "Smal-sized photo" -msgstr "" - #. module: hr #: view:hr.employee.category:0 #: model:ir.model,name:hr.model_hr_employee_category @@ -709,7 +704,7 @@ msgid "Allow invoicing based on timesheets (the sale application will be install msgstr "" #. module: hr -#: code:addons/hr/hr.py:221 +#: code:addons/hr/hr.py:227 #, python-format msgid "Welcome to %s! Please help him/her take the first steps with OpenERP!" msgstr "" @@ -939,3 +934,8 @@ msgstr "" msgid "Apply" msgstr "" +#. module: hr +#: field:hr.employee,image_small:0 +msgid "Small-sized photo" +msgstr "" + diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot index dc5a2102dbd6a..30f8a0a7b65c5 100644 --- a/addons/hr_attendance/i18n/hr_attendance.pot +++ b/addons/hr_attendance/i18n/hr_attendance.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -319,12 +319,6 @@ msgstr "" msgid "January" msgstr "" -#. module: hr_attendance -#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49 -#, python-format -msgid "No Data Available !" -msgstr "" - #. module: hr_attendance #: selection:hr.attendance.month,month:0 msgid "April" @@ -378,6 +372,12 @@ msgstr "" msgid "Ending Date" msgstr "" +#. module: hr_attendance +#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49 +#, python-format +msgid "No Data Available!" +msgstr "" + #. module: hr_attendance #: selection:hr.attendance.month,month:0 msgid "September" diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot index 4c192e8b66d4e..aed40d9c1dab1 100644 --- a/addons/hr_expense/i18n/hr_expense.pot +++ b/addons/hr_expense/i18n/hr_expense.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Confirmed Expenses" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:349 +#: code:addons/hr_expense/hr_expense.py:351 #, python-format msgid "No purchase account found for the product %s (or for his category), please configure one." msgstr "" @@ -116,7 +116,7 @@ msgid "To Pay" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:172 +#: code:addons/hr_expense/hr_expense.py:170 #, python-format msgid "No expense journal found. Please make sure you have a journal with type 'purchase' configured." msgstr "" @@ -148,11 +148,11 @@ msgid "Messages" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:172 +#: code:addons/hr_expense/hr_expense.py:170 +#: code:addons/hr_expense/hr_expense.py:236 #: code:addons/hr_expense/hr_expense.py:238 -#: code:addons/hr_expense/hr_expense.py:240 -#: code:addons/hr_expense/hr_expense.py:349 -#: code:addons/hr_expense/hr_expense.py:353 +#: code:addons/hr_expense/hr_expense.py:351 +#: code:addons/hr_expense/hr_expense.py:355 #, python-format msgid "Error!" msgstr "" @@ -230,7 +230,7 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:453 +#: code:addons/hr_expense/hr_expense.py:455 #, python-format msgid "Warning" msgstr "" @@ -345,7 +345,7 @@ msgid "Some costs may be reinvoices to the customer" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:238 +#: code:addons/hr_expense/hr_expense.py:236 #, python-format msgid "The employee must have a home address." msgstr "" @@ -400,7 +400,7 @@ msgid "After creating invoice, reimburse expenses" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:121 +#: code:addons/hr_expense/hr_expense.py:119 #, python-format msgid "Warning!" msgstr "" @@ -417,13 +417,13 @@ msgid "Validation Date" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:378 +#: code:addons/hr_expense/hr_expense.py:380 #, python-format msgid "Expense Account Move" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:240 +#: code:addons/hr_expense/hr_expense.py:238 #, python-format msgid "The employee must have a payable account set on his home address." msgstr "" @@ -499,7 +499,7 @@ msgid "Free Notes" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:453 +#: code:addons/hr_expense/hr_expense.py:455 #, python-format msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure" msgstr "" @@ -530,7 +530,7 @@ msgid "Paid" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:353 +#: code:addons/hr_expense/hr_expense.py:355 #, python-format msgid "Please configure Default Expense account for Product purchase: `property_account_expense_categ`." msgstr "" @@ -867,7 +867,7 @@ msgid "Name" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/hr_expense.py:121 +#: code:addons/hr_expense/hr_expense.py:119 #, python-format msgid "You can only delete draft expenses!" msgstr "" diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index e82053e955ca1..bf798723fbcf6 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgid "Waiting Second Approval" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:309 +#: code:addons/hr_holidays/hr_holidays.py:314 #, python-format msgid "You cannot modify a leave request that has been approved. Contact a human resource manager." msgstr "" @@ -252,12 +252,13 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:249 -#: code:addons/hr_holidays/hr_holidays.py:260 -#: code:addons/hr_holidays/hr_holidays.py:285 -#: code:addons/hr_holidays/hr_holidays.py:309 -#: code:addons/hr_holidays/hr_holidays.py:432 -#: code:addons/hr_holidays/hr_holidays.py:482 +#: code:addons/hr_holidays/hr_holidays.py:254 +#: code:addons/hr_holidays/hr_holidays.py:265 +#: code:addons/hr_holidays/hr_holidays.py:290 +#: code:addons/hr_holidays/hr_holidays.py:314 +#: code:addons/hr_holidays/hr_holidays.py:437 +#: code:addons/hr_holidays/hr_holidays.py:487 +#: code:addons/hr_holidays/hr_holidays.py:494 #, python-format msgid "Warning!" msgstr "" @@ -272,11 +273,6 @@ msgstr "" msgid "Leave Meetings" msgstr "" -#. module: hr_holidays -#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl -msgid "Legal Leaves 2013" -msgstr "" - #. module: hr_holidays #: selection:hr.holidays.summary.dept,holiday_type:0 #: selection:hr.holidays.summary.employee,holiday_type:0 @@ -290,14 +286,8 @@ msgid "From" msgstr "" #. module: hr_holidays -#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl -msgid "Sick Leaves" -msgstr "" - -#. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:489 -#, python-format -msgid "Leave Request for %s" +#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl +msgid "Legal Leaves 2014" msgstr "" #. module: hr_holidays @@ -366,7 +356,7 @@ msgid "Wheat" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:487 +#: code:addons/hr_holidays/hr_holidays.py:492 #, python-format msgid "Allocation for %s" msgstr "" @@ -386,7 +376,7 @@ msgid "Number of Days" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:482 +#: code:addons/hr_holidays/hr_holidays.py:487 #, python-format msgid "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n" "You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \\ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field." @@ -457,6 +447,11 @@ msgstr "" msgid "Unread Messages" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "leaves." +msgstr "" + #. module: hr_holidays #: view:hr.holidays:0 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays @@ -476,7 +471,7 @@ msgid "Start Date" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:432 +#: code:addons/hr_holidays/hr_holidays.py:437 #, python-format msgid "There are not enough %s allocated for employee %s; please create an allocation request for this leave type." msgstr "" @@ -711,7 +706,7 @@ msgid "Validated" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:249 +#: code:addons/hr_holidays/hr_holidays.py:254 #, python-format msgid "You cannot delete a leave which is in %s state." msgstr "" @@ -773,7 +768,7 @@ msgid "To Submit" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:354 +#: code:addons/hr_holidays/hr_holidays.py:359 #: view:hr.holidays:0 #: selection:hr.holidays,type:0 #: field:resource.calendar.leaves,holiday_id:0 @@ -830,6 +825,11 @@ msgstr "" msgid "End Date" msgstr "" +#. module: hr_holidays +#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl +msgid "Sick Leaves" +msgstr "" + #. module: hr_holidays #: help:hr.holidays.status,leaves_taken:0 msgid "This value is given by the sum of all holidays requests with a negative value." @@ -862,7 +862,7 @@ msgid "Both Approved and Confirmed" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:451 +#: code:addons/hr_holidays/hr_holidays.py:456 #, python-format msgid "Request approved, waiting second validation." msgstr "" @@ -878,8 +878,8 @@ msgid "Messages and communication history" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:260 -#: code:addons/hr_holidays/hr_holidays.py:285 +#: code:addons/hr_holidays/hr_holidays.py:265 +#: code:addons/hr_holidays/hr_holidays.py:290 #: sql_constraint:hr.holidays:0 #, python-format msgid "The start date must be anterior to the end date." @@ -918,8 +918,9 @@ msgid "Light Pink" msgstr "" #. module: hr_holidays -#: xsl:holidays.summary:0 -msgid "leaves." +#: code:addons/hr_holidays/hr_holidays.py:494 +#, python-format +msgid "You cannot reduce validated allocation requests" msgstr "" #. module: hr_holidays diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot index 2d090a2ce29e5..22619e9cff3cf 100644 --- a/addons/hr_payroll/i18n/hr_payroll.pot +++ b/addons/hr_payroll/i18n/hr_payroll.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -192,11 +192,11 @@ msgid "Notes" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:871 -#: code:addons/hr_payroll/hr_payroll.py:876 -#: code:addons/hr_payroll/hr_payroll.py:882 -#: code:addons/hr_payroll/hr_payroll.py:899 -#: code:addons/hr_payroll/hr_payroll.py:905 +#: code:addons/hr_payroll/hr_payroll.py:873 +#: code:addons/hr_payroll/hr_payroll.py:878 +#: code:addons/hr_payroll/hr_payroll.py:884 +#: code:addons/hr_payroll/hr_payroll.py:901 +#: code:addons/hr_payroll/hr_payroll.py:907 #, python-format msgid "Error!" msgstr "" @@ -238,12 +238,6 @@ msgstr "" msgid "Contribution Register's Payslip Lines" msgstr "" -#. module: hr_payroll -#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52 -#, python-format -msgid "Warning !" -msgstr "" - #. module: hr_payroll #: report:paylip.details:0 msgid "Details by Salary Rule Category:" @@ -269,7 +263,7 @@ msgid "Draft Slip" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:432 +#: code:addons/hr_payroll/hr_payroll.py:433 #, python-format msgid "Normal Working Days paid at 100%" msgstr "" @@ -460,7 +454,7 @@ msgid "Salary Rules" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:341 +#: code:addons/hr_payroll/hr_payroll.py:342 #, python-format msgid "Refund: " msgstr "" @@ -492,7 +486,8 @@ msgid "Fixed Amount" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:370 +#: code:addons/hr_payroll/hr_payroll.py:371 +#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52 #, python-format msgid "Warning!" msgstr "" @@ -631,7 +626,7 @@ msgid "Computation" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:899 +#: code:addons/hr_payroll/hr_payroll.py:901 #, python-format msgid "Wrong range condition defined for salary rule %s (%s)." msgstr "" @@ -666,7 +661,7 @@ msgid "If its checked, indicates that all payslips generated from here are refun msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:876 +#: code:addons/hr_payroll/hr_payroll.py:878 #, python-format msgid "Wrong percentage base or quantity defined for salary rule %s (%s)." msgstr "" @@ -724,7 +719,7 @@ msgid "Percentage (%)" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:871 +#: code:addons/hr_payroll/hr_payroll.py:873 #, python-format msgid "Wrong quantity defined for salary rule %s (%s)." msgstr "" @@ -837,7 +832,7 @@ msgid "Contribution" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:351 +#: code:addons/hr_payroll/hr_payroll.py:352 #, python-format msgid "Refund Payslip" msgstr "" @@ -904,7 +899,7 @@ msgid "General" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:674 +#: code:addons/hr_payroll/hr_payroll.py:676 #, python-format msgid "Salary Slip of %s for %s" msgstr "" @@ -1047,7 +1042,7 @@ msgid "PaySlip Lines By Conribution Register" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:370 +#: code:addons/hr_payroll/hr_payroll.py:371 #, python-format msgid "You cannot delete a payslip which is not draft or cancelled!" msgstr "" @@ -1149,7 +1144,7 @@ msgid "Salary Rule Categories Hierarchy" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:882 +#: code:addons/hr_payroll/hr_payroll.py:884 #, python-format msgid "Wrong python code defined for salary rule %s (%s)." msgstr "" @@ -1180,7 +1175,7 @@ msgid "The code that can be used in the salary rules" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/hr_payroll.py:905 +#: code:addons/hr_payroll/hr_payroll.py:907 #, python-format msgid "Wrong python condition defined for salary rule %s (%s)." msgstr "" diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot index 6ad068175992a..3156c17792f72 100644 --- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot +++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,13 +21,13 @@ msgid "Credit Account" msgstr "" #. module: hr_payroll_account -#: code:addons/hr_payroll_account/hr_payroll_account.py:104 +#: code:addons/hr_payroll_account/hr_payroll_account.py:105 #, python-format msgid "Payslip of %s" msgstr "" #. module: hr_payroll_account -#: code:addons/hr_payroll_account/hr_payroll_account.py:157 +#: code:addons/hr_payroll_account/hr_payroll_account.py:158 #, python-format msgid "The Expense Journal \"%s\" has not properly configured the Credit Account!" msgstr "" @@ -38,7 +38,7 @@ msgid "Accounting Entry" msgstr "" #. module: hr_payroll_account -#: code:addons/hr_payroll_account/hr_payroll_account.py:173 +#: code:addons/hr_payroll_account/hr_payroll_account.py:174 #, python-format msgid "The Expense Journal \"%s\" has not properly configured the Debit Account!" msgstr "" @@ -85,8 +85,8 @@ msgid "Generate payslips for all selected employees" msgstr "" #. module: hr_payroll_account -#: code:addons/hr_payroll_account/hr_payroll_account.py:157 -#: code:addons/hr_payroll_account/hr_payroll_account.py:173 +#: code:addons/hr_payroll_account/hr_payroll_account.py:158 +#: code:addons/hr_payroll_account/hr_payroll_account.py:174 #, python-format msgid "Configuration Error!" msgstr "" @@ -108,8 +108,8 @@ msgid "Pay Slip" msgstr "" #. module: hr_payroll_account -#: code:addons/hr_payroll_account/hr_payroll_account.py:159 -#: code:addons/hr_payroll_account/hr_payroll_account.py:175 +#: code:addons/hr_payroll_account/hr_payroll_account.py:160 +#: code:addons/hr_payroll_account/hr_payroll_account.py:176 #, python-format msgid "Adjustment Entry" msgstr "" diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot index b06ca2b934387..cea406a5a8165 100644 --- a/addons/hr_recruitment/i18n/hr_recruitment.pot +++ b/addons/hr_recruitment/i18n/hr_recruitment.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -115,7 +115,7 @@ msgid "Sources of Applicants" msgstr "" #. module: hr_recruitment -#: code:addons/hr_recruitment/hr_recruitment.py:445 +#: code:addons/hr_recruitment/hr_recruitment.py:427 #, python-format msgid "You must define Applied Job for this applicant." msgstr "" @@ -275,7 +275,7 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire msgstr "" #. module: hr_recruitment -#: code:addons/hr_recruitment/hr_recruitment.py:445 +#: code:addons/hr_recruitment/hr_recruitment.py:427 #, python-format msgid "Warning!" msgstr "" @@ -480,7 +480,7 @@ msgid "Applicants" msgstr "" #. module: hr_recruitment -#: code:addons/hr_recruitment/hr_recruitment.py:360 +#: code:addons/hr_recruitment/hr_recruitment.py:368 #, python-format msgid "No Subject" msgstr "" @@ -501,7 +501,7 @@ msgid "Gives the sequence order when displaying a list of stages." msgstr "" #. module: hr_recruitment -#: code:addons/hr_recruitment/hr_recruitment.py:347 +#: code:addons/hr_recruitment/hr_recruitment.py:354 #: field:hr.applicant,partner_id:0 #, python-format msgid "Contact" @@ -742,7 +742,7 @@ msgid "Schedule interview with this applicant" msgstr "" #. module: hr_recruitment -#: code:addons/hr_recruitment/hr_recruitment.py:407 +#: code:addons/hr_recruitment/hr_recruitment.py:389 #, python-format msgid "Applicant created" msgstr "" @@ -908,7 +908,7 @@ msgid "The name of the Degree of Recruitment must be unique!" msgstr "" #. module: hr_recruitment -#: code:addons/hr_recruitment/hr_recruitment.py:349 +#: code:addons/hr_recruitment/hr_recruitment.py:356 #, python-format msgid "Contact Email" msgstr "" diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot index 256b33106f281..6a8121bd03638 100644 --- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot +++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -98,7 +98,7 @@ msgid "Profit" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:141 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:142 #, python-format msgid "You cannot modify an invoiced analytic line!" msgstr "" @@ -153,12 +153,6 @@ msgstr "" msgid "Invoiced Amount" msgstr "" -#. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:185 -#, python-format -msgid "Analytic Account incomplete !" -msgstr "" - #. module: hr_timesheet_invoice #: field:report_timesheet.invoice,account_id:0 msgid "Project" @@ -229,7 +223,7 @@ msgid "Deadline" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:243 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:262 #, python-format msgid "Configuration Error!" msgstr "" @@ -266,7 +260,7 @@ msgid "Costs to invoice" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:243 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:262 #, python-format msgid "Please define income account for product '%s'." msgstr "" @@ -557,6 +551,12 @@ msgstr "" msgid "User" msgstr "" +#. module: hr_timesheet_invoice +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188 +#, python-format +msgid "Analytic Account Incomplete!" +msgstr "" + #. module: hr_timesheet_invoice #: selection:report.account.analytic.line.to.invoice,month:0 #: selection:report.timesheet.line,month:0 @@ -723,7 +723,7 @@ msgid "Timesheets to invoice" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:186 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189 #, python-format msgid "Contract incomplete. Please fill in the Customer and Pricelist fields." msgstr "" @@ -838,12 +838,6 @@ msgstr "" msgid "April" msgstr "" -#. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:230 -#, python-format -msgid "There is no product defined. Please select one or force the product through the wizard." -msgstr "" - #. module: hr_timesheet_invoice #: help:hr_timesheet_invoice.factor,factor:0 msgid "Discount in percentage" @@ -872,8 +866,7 @@ msgid "Units" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:140 -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:230 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:141 #, python-format msgid "Error!" msgstr "" diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot index a1c104582805a..820a7dc5250ad 100644 --- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot +++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -24,8 +24,9 @@ msgid "Sheet" msgstr "" #. module: hr_timesheet_sheet -#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0 -msgid "Service" +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:101 +#, python-format +msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" msgstr "" #. module: hr_timesheet_sheet @@ -66,8 +67,8 @@ msgid "Task timesheet" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:73 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:86 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:76 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:92 #, python-format msgid "In order to create a timesheet for this employee, you must assign an analytic journal to the employee, like 'Timesheet Journal'." msgstr "" @@ -78,6 +79,11 @@ msgstr "" msgid "March" msgstr "" +#. module: hr_timesheet_sheet +#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0 +msgid "Service" +msgstr "" + #. module: hr_timesheet_sheet #: view:timesheet.report:0 #: field:timesheet.report,cost:0 @@ -136,8 +142,7 @@ msgid "Based on the timesheet" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:327 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:398 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:358 #, python-format msgid "You cannot modify an entry in a confirmed timesheet." msgstr "" @@ -192,14 +197,13 @@ msgid "Please create an employee and associate it with this user." msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:402 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:422 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:493 #, python-format msgid "You cannot enter an attendance date outside the current timesheet dates." msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:236 #, python-format msgid "Week " msgstr "" @@ -222,15 +226,15 @@ msgid " * The 'Draft' status is used when a user is encoding a new and unconfirm msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:69 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:327 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:398 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:429 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:67 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:72 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:74 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:86 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:88 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:90 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:358 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:472 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:500 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38 #, python-format msgid "Error!" @@ -242,7 +246,7 @@ msgid "Allow a difference of time between timesheets and attendances of (in hour msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:130 #, python-format msgid "Please verify that the total difference of the sheet is lower than %.2f." msgstr "" @@ -263,14 +267,20 @@ msgstr "" msgid "Validation" msgstr "" +#. module: hr_timesheet_sheet +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:101 +#, python-format +msgid "Warning !" +msgstr "" + #. module: hr_timesheet_sheet #: help:hr_timesheet_sheet.sheet,message_unread:0 msgid "If checked new messages require your attention." msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:69 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:72 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:86 #, python-format msgid "In order to create a timesheet for this employee, you must assign it to a user." msgstr "" @@ -281,8 +291,8 @@ msgid "Employee's timesheet entry" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:213 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:244 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246 #, python-format msgid "Invalid Action!" msgstr "" @@ -409,8 +419,8 @@ msgid "Validate timesheets every" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:73 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:86 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:76 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:92 #, python-format msgid "Configuration Error!" msgstr "" @@ -466,7 +476,7 @@ msgid "hr.timesheet.current.open" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:74 #, python-format msgid "In order to create a timesheet for this employee, you must link the employee to a product, like 'Consultant'." msgstr "" @@ -515,7 +525,7 @@ msgid "Sign in/out" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:90 #, python-format msgid "In order to create a timesheet for this employee, you must link the employee to a product." msgstr "" @@ -685,7 +695,7 @@ msgid "October" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:60 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:63 #, python-format msgid "The timesheet cannot be validated as it does not contain an equal number of sign ins and sign outs." msgstr "" @@ -713,7 +723,7 @@ msgid "Summary" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246 #, python-format msgid "You cannot delete a timesheet which have attendance entries." msgstr "" @@ -724,7 +734,7 @@ msgid "Unvalidated Timesheets" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:88 #, python-format msgid "You cannot have 2 timesheets that overlap!\n" "You should use the menu 'My Timesheet' to avoid this problem." @@ -735,6 +745,12 @@ msgstr "" msgid "Submit to Manager" msgstr "" +#. module: hr_timesheet_sheet +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:472 +#, python-format +msgid "You can not enter an attendance in a submitted timesheet. Ask your manager to reset it before adding attendance." +msgstr "" + #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 #: field:hr.timesheet.report,general_account_id:0 @@ -755,7 +771,7 @@ msgid "Search Account" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:429 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:500 #, python-format msgid "You cannot modify an entry in a confirmed timesheet" msgstr "" @@ -883,7 +899,13 @@ msgid "Timesheet Line" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:213 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:474 +#, python-format +msgid "You can not enter an attendance date outside the current timesheet dates." +msgstr "" + +#. module: hr_timesheet_sheet +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:244 #, python-format msgid "You cannot delete a timesheet which is already confirmed." msgstr "" @@ -954,7 +976,7 @@ msgid "Difference" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:67 #, python-format msgid "You cannot duplicate a timesheet." msgstr "" @@ -1008,7 +1030,7 @@ msgid "Confirmation" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:130 #, python-format msgid "Warning!" msgstr "" @@ -1019,8 +1041,8 @@ msgid "Invoice rate" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:402 -#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:422 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:474 +#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:493 #, python-format msgid "User Error!" msgstr "" diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot index 28a52bac97976..eefde9959b862 100644 --- a/addons/idea/i18n/idea.pot +++ b/addons/idea/i18n/idea.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,7 +17,6 @@ msgstr "" #. module: idea #: view:idea.category:0 -#: view:idea.idea:0 msgid "Category" msgstr "" @@ -36,11 +35,6 @@ msgstr "" msgid "The name of the category must be unique" msgstr "" -#. module: idea -#: view:idea.idea:0 -msgid "By Idea Category" -msgstr "" - #. module: idea #: model:ir.model,name:idea.model_idea_category msgid "Idea Category" diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot index a045ac4b31121..b194a68c3e978 100644 --- a/addons/lunch/i18n/lunch.pot +++ b/addons/lunch/i18n/lunch.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -188,7 +188,7 @@ msgid "Lunch Alert" msgstr "" #. module: lunch -#: code:addons/lunch/lunch.py:183 +#: code:addons/lunch/lunch.py:193 #, python-format msgid "Select a product and put your order comments on the note." msgstr "" @@ -245,7 +245,7 @@ msgid "New" msgstr "" #. module: lunch -#: code:addons/lunch/lunch.py:180 +#: code:addons/lunch/lunch.py:190 #, python-format msgid "This is the first time you order a meal" msgstr "" @@ -426,7 +426,7 @@ msgid "Note" msgstr "" #. module: lunch -#: code:addons/lunch/lunch.py:257 +#: code:addons/lunch/lunch.py:267 #, python-format msgid "Add" msgstr "" @@ -657,7 +657,7 @@ msgid "

\n" msgstr "" #. module: lunch -#: code:addons/lunch/lunch.py:186 +#: code:addons/lunch/lunch.py:196 #, python-format msgid "Your favorite meals will be created based on your last orders." msgstr "" @@ -686,7 +686,7 @@ msgid "Recurrency" msgstr "" #. module: lunch -#: code:addons/lunch/lunch.py:189 +#: code:addons/lunch/lunch.py:199 #, python-format msgid "Don't forget the alerts displayed in the reddish area" msgstr "" @@ -807,9 +807,11 @@ msgid "Order" msgstr "" #. module: lunch +#: code:addons/lunch/lunch.py:43 #: model:ir.actions.report.xml,name:lunch.report_lunch_order #: model:ir.model,name:lunch.model_lunch_order #: report:lunch.order.line:0 +#, python-format msgid "Lunch Order" msgstr "" diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index ce858d3f3c042..6b39cf89a6730 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgid "Followers Form" msgstr "" #. module: mail -#: code:addons/mail/mail_thread.py:246 +#: code:addons/mail/mail_thread.py:259 #, python-format msgid "%s created" msgstr "" @@ -48,6 +48,12 @@ msgstr "" msgid "Activated by default when subscribing." msgstr "" +#. module: mail +#: field:mail.compose.message,vote_user_ids:0 +#: field:mail.message,vote_user_ids:0 +msgid "Votes" +msgstr "" + #. module: mail #: view:mail.message:0 msgid "Comments" @@ -55,7 +61,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:313 +#: code:addons/mail/static/src/xml/mail.xml:314 #, python-format msgid "more messages" msgstr "" @@ -100,7 +106,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:277 +#: code:addons/mail/static/src/xml/mail.xml:278 #, python-format msgid "to" msgstr "" @@ -128,7 +134,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:268 +#: code:addons/mail/static/src/xml/mail.xml:269 #, python-format msgid "updated document" msgstr "" @@ -163,7 +169,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:313 +#: code:addons/mail/static/src/xml/mail.xml:314 #, python-format msgid "show" msgstr "" @@ -173,9 +179,15 @@ msgstr "" msgid "Members of those groups will automatically added as followers. Note that they will be able to manage their subscription manually if necessary." msgstr "" +#. module: mail +#: code:addons/mail/wizard/invite.py:76 +#, python-format +msgid "Invitation to follow %s" +msgstr "" + #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/mail.js:1029 +#: code:addons/mail/static/src/js/mail.js:1032 #, python-format msgid "Do you really want to delete this message?" msgstr "" @@ -208,7 +220,7 @@ msgid "Related Document ID" msgstr "" #. module: mail -#: code:addons/mail/mail_message.py:737 +#: code:addons/mail/mail_message.py:739 #, python-format msgid "Access Denied" msgstr "" @@ -220,7 +232,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:212 +#: code:addons/mail/static/src/xml/mail.xml:213 #, python-format msgid "Uploading error" msgstr "" @@ -231,7 +243,7 @@ msgid "Support" msgstr "" #. module: mail -#: code:addons/mail/mail_message.py:738 +#: code:addons/mail/mail_message.py:740 #, python-format msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n" "\n" @@ -246,7 +258,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:71 +#: code:addons/mail/static/src/xml/mail.xml:72 #, python-format msgid "Attach a File" msgstr "" @@ -298,8 +310,8 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:96 -#: code:addons/mail/static/src/xml/mail.xml:108 +#: code:addons/mail/static/src/xml/mail.xml:97 +#: code:addons/mail/static/src/xml/mail.xml:109 #, python-format msgid "uploading" msgstr "" @@ -340,7 +352,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:53 +#: code:addons/mail/static/src/xml/mail.xml:54 #, python-format msgid "Send a message" msgstr "" @@ -375,14 +387,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:294 +#: code:addons/mail/static/src/xml/mail.xml:295 #, python-format msgid "notified" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:274 +#: code:addons/mail/static/src/xml/mail.xml:275 #, python-format msgid "logged a note" msgstr "" @@ -397,13 +409,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:312 +#: code:addons/mail/static/src/xml/mail.xml:313 #, python-format msgid "show one more message" msgstr "" #. module: mail -#: code:addons/mail/mail_mail.py:75 +#: code:addons/mail/mail_mail.py:76 #: code:addons/mail/res_users.py:69 #, python-format msgid "Invalid Action!" @@ -577,14 +589,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:95 -#: code:addons/mail/static/src/xml/mail.xml:107 +#: code:addons/mail/static/src/xml/mail.xml:96 +#: code:addons/mail/static/src/xml/mail.xml:108 #, python-format msgid "Delete this attachment" msgstr "" #. module: mail -#: code:addons/mail/mail_thread.py:112 +#: code:addons/mail/mail_thread.py:114 #, python-format msgid "New" msgstr "" @@ -596,14 +608,6 @@ msgstr "" msgid "One follower" msgstr "" -#. module: mail -#: field:mail.compose.message,model:0 -#: field:mail.followers,res_model:0 -#: field:mail.message,model:0 -#: field:mail.wizard.invite,res_model:0 -msgid "Related Document Model" -msgstr "" - #. module: mail #: field:mail.compose.message,type:0 #: field:mail.message,type:0 @@ -651,7 +655,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:140 +#: code:addons/mail/static/src/xml/mail.xml:141 #, python-format msgid "<<<" msgstr "" @@ -673,7 +677,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/mail.js:978 +#: code:addons/mail/static/src/js/mail.js:981 #, python-format msgid "read more" msgstr "" @@ -730,13 +734,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:244 +#: code:addons/mail/static/src/xml/mail.xml:245 #, python-format msgid "Move to Inbox" msgstr "" #. module: mail -#: code:addons/mail/wizard/mail_compose_message.py:193 +#: code:addons/mail/wizard/mail_compose_message.py:194 #, python-format msgid "Re:" msgstr "" @@ -753,6 +757,13 @@ msgstr "" msgid "You may not create a user. To create new users, you should use the \"Settings > Users\" menu." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/mail.xml:338 +#, python-format +msgid "like" +msgstr "" + #. module: mail #: help:mail.followers,res_model:0 #: help:mail.wizard.invite,res_model:0 @@ -761,16 +772,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/mail.js:979 +#: code:addons/mail/static/src/js/mail.js:982 #, python-format msgid "read less" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:337 +#: code:addons/mail/static/src/xml/mail.xml:54 #, python-format -msgid "like" +msgid "Send a message to all followers of the document" msgstr "" #. module: mail @@ -813,7 +824,7 @@ msgid "on" msgstr "" #. module: mail -#: code:addons/mail/mail_message.py:926 +#: code:addons/mail/mail_message.py:930 #, python-format msgid "The following partners chosen as recipients for the email have no email address linked :" msgstr "" @@ -831,7 +842,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail.xml:37 -#: code:addons/mail/static/src/xml/mail.xml:55 +#: code:addons/mail/static/src/xml/mail.xml:56 #, python-format msgid "Log a note" msgstr "" @@ -862,7 +873,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:188 +#: code:addons/mail/static/src/xml/mail.xml:189 #, python-format msgid "Compose a new message" msgstr "" @@ -873,7 +884,7 @@ msgid "Send Now" msgstr "" #. module: mail -#: code:addons/mail/mail_mail.py:75 +#: code:addons/mail/mail_mail.py:76 #, python-format msgid "Unable to send email, please configure the sender's email address or alias." msgstr "" @@ -959,9 +970,10 @@ msgid "Description that will be added in the message posted for this subtype. If msgstr "" #. module: mail -#: field:mail.compose.message,vote_user_ids:0 -#: field:mail.message,vote_user_ids:0 -msgid "Votes" +#. openerp-web +#: code:addons/mail/static/src/xml/mail.xml:56 +#, python-format +msgid "Log a note for this document. No notification will be sent" msgstr "" #. module: mail @@ -987,13 +999,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/mail.js:654 +#: code:addons/mail/static/src/js/mail.js:655 #, python-format msgid "Please complete partner's informations" msgstr "" #. module: mail -#: code:addons/mail/mail_mail.py:190 +#: code:addons/mail/mail_mail.py:191 #, python-format msgid "

Access this document directly in OpenERP

" msgstr "" @@ -1043,8 +1055,8 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:54 -#: code:addons/mail/static/src/xml/mail.xml:191 +#: code:addons/mail/static/src/xml/mail.xml:55 +#: code:addons/mail/static/src/xml/mail.xml:192 #: view:mail.compose.message:0 #: view:mail.wizard.invite:0 #, python-format @@ -1052,7 +1064,7 @@ msgid "or" msgstr "" #. module: mail -#: code:addons/mail/mail_thread.py:111 +#: code:addons/mail/mail_thread.py:113 #, python-format msgid "You have one unread message" msgstr "" @@ -1086,7 +1098,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:311 +#: code:addons/mail/static/src/xml/mail.xml:312 #, python-format msgid "show more message" msgstr "" @@ -1145,6 +1157,12 @@ msgstr "" msgid "Extended Filters..." msgstr "" +#. module: mail +#: code:addons/mail/mail_group.py:180 +#, python-format +msgid "Warning!" +msgstr "" + #. module: mail #: selection:res.partner,notification_email_send:0 msgid "Incoming Emails only" @@ -1152,21 +1170,21 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:292 +#: code:addons/mail/static/src/xml/mail.xml:293 #, python-format msgid "more" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:120 +#: code:addons/mail/static/src/xml/mail.xml:121 #, python-format msgid "To:" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:193 +#: code:addons/mail/static/src/xml/mail.xml:194 #, python-format msgid "Write to my followers" msgstr "" @@ -1188,7 +1206,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:246 +#: code:addons/mail/static/src/xml/mail.xml:247 #, python-format msgid "Mark as Todo" msgstr "" @@ -1206,10 +1224,8 @@ msgid "Summary" msgstr "" #. module: mail -#: code:addons/mail/mail_mail.py:222 -#: code:addons/mail/mail_mail.py:244 -#, python-format -msgid "\"Followers of %s\" <%s>" +#: help:mail.message.subtype,res_model:0 +msgid "Model the subtype applies to. If False, this subtype applies to all models." msgstr "" #. module: mail @@ -1253,6 +1269,12 @@ msgstr "" msgid "Unfortunately this email alias is already used, please choose a unique one" msgstr "" +#. module: mail +#: code:addons/mail/mail_group.py:180 +#, python-format +msgid "You cannot delete those groups, as the Whole Company group is required by other modules." +msgstr "" + #. module: mail #: help:mail.alias,alias_user_id:0 msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address." @@ -1266,7 +1288,7 @@ msgid "And" msgstr "" #. module: mail -#: code:addons/mail/mail_thread.py:111 +#: code:addons/mail/mail_thread.py:113 #, python-format msgid "You have %d unread messages" msgstr "" @@ -1312,7 +1334,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:123 +#: code:addons/mail/static/src/xml/mail.xml:124 #: view:mail.compose.message:0 #, python-format msgid "Followers of" @@ -1330,7 +1352,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:242 +#: code:addons/mail/static/src/xml/mail.xml:243 #, python-format msgid "Done" msgstr "" @@ -1354,8 +1376,8 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:129 -#: code:addons/mail/static/src/xml/mail.xml:292 +#: code:addons/mail/static/src/xml/mail.xml:130 +#: code:addons/mail/static/src/xml/mail.xml:293 #: view:mail.compose.message:0 #, python-format msgid "and" @@ -1394,7 +1416,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:245 +#: code:addons/mail/static/src/xml/mail.xml:246 #: view:mail.mail:0 #, python-format msgid "Reply" @@ -1408,7 +1430,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:126 +#: code:addons/mail/static/src/xml/mail.xml:127 #, python-format msgid "this document" msgstr "" @@ -1463,7 +1485,7 @@ msgid "Outgoing mail server" msgstr "" #. module: mail -#: code:addons/mail/mail_message.py:930 +#: code:addons/mail/mail_message.py:934 #, python-format msgid "Partners email addresses not found" msgstr "" @@ -1506,7 +1528,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:213 +#: code:addons/mail/static/src/xml/mail.xml:214 #, python-format msgid "Please, wait while the file is uploading." msgstr "" @@ -1520,21 +1542,21 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:243 +#: code:addons/mail/static/src/xml/mail.xml:244 #, python-format msgid "Set back to Todo" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:154 +#: code:addons/mail/static/src/xml/mail.xml:155 #, python-format msgid "Attach a note that will not be sent to the followers" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:279 +#: code:addons/mail/static/src/xml/mail.xml:280 #, python-format msgid "nobody" msgstr "" @@ -1569,9 +1591,16 @@ msgstr "" msgid "Messages" msgstr "" +#. module: mail +#: code:addons/mail/mail_mail.py:222 +#: code:addons/mail/mail_mail.py:243 +#, python-format +msgid "Followers of %s" +msgstr "" + #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:139 +#: code:addons/mail/static/src/xml/mail.xml:140 #, python-format msgid "others..." msgstr "" @@ -1603,7 +1632,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:149 +#: code:addons/mail/static/src/xml/mail.xml:150 #, python-format msgid "(no email address)" msgstr "" @@ -1622,7 +1651,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:206 +#: code:addons/mail/static/src/xml/mail.xml:207 #, python-format msgid "No messages." msgstr "" @@ -1650,13 +1679,16 @@ msgid "Composition mode" msgstr "" #. module: mail -#: help:mail.message.subtype,res_model:0 -msgid "Model the subtype applies to. If False, this subtype applies to all models." +#: field:mail.compose.message,model:0 +#: field:mail.followers,res_model:0 +#: field:mail.message,model:0 +#: field:mail.wizard.invite,res_model:0 +msgid "Related Document Model" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:338 +#: code:addons/mail/static/src/xml/mail.xml:339 #, python-format msgid "unlike" msgstr "" @@ -1721,7 +1753,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/mail.xml:323 +#: code:addons/mail/static/src/xml/mail.xml:324 #, python-format msgid "Compose new Message" msgstr "" diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot index aaa4498873122..b3210daa56468 100644 --- a/addons/marketing_campaign/i18n/marketing_campaign.pot +++ b/addons/marketing_campaign/i18n/marketing_campaign.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgid "Previous Activity" msgstr "" #. module: marketing_campaign -#: code:addons/marketing_campaign/marketing_campaign.py:819 +#: code:addons/marketing_campaign/marketing_campaign.py:817 #, python-format msgid "The current step for this item has no email or report to preview." msgstr "" @@ -722,7 +722,7 @@ msgid "Action" msgstr "" #. module: marketing_campaign -#: code:addons/marketing_campaign/marketing_campaign.py:528 +#: code:addons/marketing_campaign/marketing_campaign.py:526 #, python-format msgid "Automatic transition" msgstr "" @@ -733,7 +733,7 @@ msgid "Start" msgstr "" #. module: marketing_campaign -#: code:addons/marketing_campaign/marketing_campaign.py:819 +#: code:addons/marketing_campaign/marketing_campaign.py:817 #, python-format msgid "No preview" msgstr "" @@ -749,7 +749,7 @@ msgid "Process" msgstr "" #. module: marketing_campaign -#: code:addons/marketing_campaign/marketing_campaign.py:530 +#: code:addons/marketing_campaign/marketing_campaign.py:528 #: selection:marketing.campaign.transition,trigger:0 #, python-format msgid "Cosmetic" @@ -869,7 +869,7 @@ msgid "If set, this field will help segments that work in \"no duplicates\" mode msgstr "" #. module: marketing_campaign -#: code:addons/marketing_campaign/marketing_campaign.py:529 +#: code:addons/marketing_campaign/marketing_campaign.py:527 #, python-format msgid "After %(interval_nbr)d %(interval_type)s" msgstr "" @@ -912,7 +912,7 @@ msgid "Sync mode: only records updated after last sync" msgstr "" #. module: marketing_campaign -#: code:addons/marketing_campaign/marketing_campaign.py:793 +#: code:addons/marketing_campaign/marketing_campaign.py:791 #, python-format msgid "Email Preview" msgstr "" diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot index edcacb66b0555..66d9979646596 100644 --- a/addons/mrp/i18n/mrp.pot +++ b/addons/mrp/i18n/mrp.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgid "The 'Minimum stock rule' allows the system to create procurement orders a msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:130 +#: code:addons/mrp/report/price.py:132 #, python-format msgid "Hourly Cost" msgstr "" @@ -184,12 +184,12 @@ msgid "Order Planning" msgstr "" #. module: mrp -#: field:mrp.config.settings,module_mrp_operations:0 -msgid "Allow detailed planning of work order" +#: field:mrp.config.settings,group_mrp_properties:0 +msgid "Allow several bill of materials per product using properties" msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:633 +#: code:addons/mrp/mrp.py:666 #, python-format msgid "Cannot cancel manufacturing order!" msgstr "" @@ -200,7 +200,7 @@ msgid "Cycle Account" msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:130 +#: code:addons/mrp/report/price.py:132 #, python-format msgid "Work Cost" msgstr "" @@ -216,6 +216,8 @@ msgid "Capacity Information" msgstr "" #. module: mrp +#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action +#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp #: field:mrp.routing,workcenter_lines:0 msgid "Work Centers" msgstr "" @@ -342,7 +344,7 @@ msgid "Reference must be unique per Company!" msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:139 +#: code:addons/mrp/report/price.py:141 #: report:bom.structure:0 #: view:mrp.bom:0 #: field:mrp.product_price,number:0 @@ -433,7 +435,7 @@ msgid "Scheduled Date" msgstr "" #. module: mrp -#: code:addons/mrp/procurement.py:129 +#: code:addons/mrp/procurement.py:121 #, python-format msgid "Manufacturing Order %s created." msgstr "" @@ -600,7 +602,7 @@ msgid "Work Center Load" msgstr "" #. module: mrp -#: code:addons/mrp/procurement.py:55 +#: code:addons/mrp/procurement.py:50 #, python-format msgid "No BoM defined for this product !" msgstr "" @@ -725,8 +727,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process." msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:737 -#: code:addons/mrp/mrp.py:765 +#: code:addons/mrp/mrp.py:779 +#: code:addons/mrp/mrp.py:807 #, python-format msgid "Warning!" msgstr "" @@ -784,7 +786,7 @@ msgid "Manufacturing Orders which are waiting for raw materials." msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:285 +#: code:addons/mrp/mrp.py:287 #, python-format msgid "The Product Unit of Measure you chose has a different category than in the product form." msgstr "" @@ -854,7 +856,7 @@ msgid "BoM Type" msgstr "" #. module: mrp -#: code:addons/mrp/procurement.py:57 +#: code:addons/mrp/procurement.py:52 #, python-format msgid "Procurement '%s' has an exception: 'No BoM defined for this product !'" msgstr "" @@ -875,7 +877,7 @@ msgid "Companies" msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:634 +#: code:addons/mrp/mrp.py:667 #, python-format msgid "You must first cancel related internal picking attached to this manufacturing order." msgstr "" @@ -887,8 +889,8 @@ msgid "Minimum Stock" msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:160 -#: code:addons/mrp/report/price.py:211 +#: code:addons/mrp/report/price.py:162 +#: code:addons/mrp/report/price.py:213 #, python-format msgid "Total Cost of %s %s" msgstr "" @@ -901,7 +903,7 @@ msgid "Stockable Product" msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:130 +#: code:addons/mrp/report/price.py:132 #, python-format msgid "Work Center name" msgstr "" @@ -1065,7 +1067,7 @@ msgid "Group By..." msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:130 +#: code:addons/mrp/report/price.py:132 #, python-format msgid "Cycles Cost" msgstr "" @@ -1092,6 +1094,11 @@ msgstr "" msgid "Resources" msgstr "" +#. module: mrp +#: field:mrp.config.settings,module_mrp_operations:0 +msgid "Allow detailed planning of work orders" +msgstr "" + #. module: mrp #: help:mrp.routing.workcenter,hour_nbr:0 msgid "Time in hours for this Work Center to achieve the operation of the specified routing." @@ -1103,7 +1110,7 @@ msgid "Analytic Journal" msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:139 +#: code:addons/mrp/report/price.py:141 #, python-format msgid "Supplier Price per Unit of Measure" msgstr "" @@ -1177,7 +1184,7 @@ msgid "Routing indicates all the Work Centers used, for how long and/or cycles.I msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:505 +#: code:addons/mrp/mrp.py:519 #, python-format msgid "Invalid Action!" msgstr "" @@ -1188,7 +1195,7 @@ msgid "The Minimum Stock Rule is an automatic procurement rule based on a mini a msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:187 +#: code:addons/mrp/report/price.py:189 #, python-format msgid "Components Cost of %s %s" msgstr "" @@ -1215,7 +1222,7 @@ msgid "Bill of Materials allow you to define the list of required raw materials msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:375 +#: code:addons/mrp/mrp.py:379 #, python-format msgid "%s (copy)" msgstr "" @@ -1226,7 +1233,7 @@ msgid "Production Scheduled Product" msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:204 +#: code:addons/mrp/report/price.py:206 #, python-format msgid "Work Cost of %s %s" msgstr "" @@ -1270,7 +1277,7 @@ msgid "Product Cost Structure" msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:139 +#: code:addons/mrp/report/price.py:141 #, python-format msgid "Components suppliers" msgstr "" @@ -1391,7 +1398,7 @@ msgid "SO Number" msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:505 +#: code:addons/mrp/mrp.py:519 #, python-format msgid "Cannot delete a manufacturing order in state '%s'." msgstr "" @@ -1428,9 +1435,7 @@ msgid "Manufacturing Orders To Start" msgstr "" #. module: mrp -#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action #: model:ir.model,name:mrp.model_mrp_workcenter -#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp #: field:mrp.production.workcenter.line,workcenter_id:0 #: field:mrp.routing.workcenter,workcenter_id:0 #: view:mrp.workcenter:0 @@ -1625,7 +1630,7 @@ msgid "This allows to add state, date_start,date_stop in production order operat msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:737 +#: code:addons/mrp/mrp.py:779 #, python-format msgid "You are going to consume total %s quantities of \"%s\".\n" "But you can only consume up to total %s quantities." @@ -1686,7 +1691,7 @@ msgid "Compute Data" msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:610 +#: code:addons/mrp/mrp.py:630 #: code:addons/mrp/wizard/change_production_qty.py:83 #: code:addons/mrp/wizard/change_production_qty.py:88 #, python-format @@ -1694,8 +1699,9 @@ msgid "Error!" msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:139 +#: code:addons/mrp/report/price.py:141 #: view:mrp.bom:0 +#: view:product.product:0 #, python-format msgid "Components" msgstr "" @@ -1732,7 +1738,7 @@ msgid "Manufacturing Lead Time" msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:285 +#: code:addons/mrp/mrp.py:287 #, python-format msgid "Warning" msgstr "" @@ -1747,6 +1753,11 @@ msgstr "" msgid "Product Move" msgstr "" +#. module: mrp +#: view:mrp.routing:0 +msgid "Operation" +msgstr "" + #. module: mrp #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree msgid "Weekly Stock Value Variation enables you to track the stock value evolution linked to manufacturing activities, receptions of products and delivery orders." @@ -1907,7 +1918,7 @@ msgid "Assignment from stock." msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:139 +#: code:addons/mrp/report/price.py:141 #, python-format msgid "Cost Price per Unit of Measure" msgstr "" @@ -1935,7 +1946,7 @@ msgid "Manufacturing Steps." msgstr "" #. module: mrp -#: code:addons/mrp/report/price.py:146 +#: code:addons/mrp/report/price.py:148 #: model:ir.actions.report.xml,name:mrp.report_cost_structure #, python-format msgid "Cost Structure" @@ -1962,7 +1973,7 @@ msgid "BOM Ref" msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:765 +#: code:addons/mrp/mrp.py:807 #, python-format msgid "You are going to produce total %s quantities of \"%s\".\n" "But you can only produce up to total %s quantities." @@ -1999,7 +2010,7 @@ msgid "Bill of Materials" msgstr "" #. module: mrp -#: code:addons/mrp/mrp.py:610 +#: code:addons/mrp/mrp.py:630 #, python-format msgid "Cannot find a bill of material for this product." msgstr "" @@ -2016,7 +2027,6 @@ msgid "Manage manual picking to fulfill manufacturing orders " msgstr "" #. module: mrp -#: view:mrp.routing.workcenter:0 #: view:mrp.workcenter:0 msgid "General Information" msgstr "" @@ -2118,11 +2128,6 @@ msgid "a manufacturing\n" " order" msgstr "" -#. module: mrp -#: field:mrp.config.settings,group_mrp_properties:0 -msgid "Allow several bill of materials per products using properties" -msgstr "" - #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_property_group_action #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot index 05044f9900025..62e9dcb21cd2a 100644 --- a/addons/mrp_operations/i18n/mrp_operations.pot +++ b/addons/mrp_operations/i18n/mrp_operations.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -102,6 +102,12 @@ msgstr "" msgid "Mrp Operations" msgstr "" +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:134 +#, python-format +msgid "Manufacturing order cannot be started in state \"%s\"!" +msgstr "" + #. module: mrp_operations #: view:mrp.workorder:0 #: field:mrp.workorder,day:0 @@ -197,6 +203,15 @@ msgstr "" msgid "Actual Production Date" msgstr "" +#. module: mrp_operations +#: help:mrp.production.workcenter.line,state:0 +msgid "* When a work order is created it is set in 'Draft' status.\n" +"* When user sets work order in start mode that time it will be set in 'In Progress' status.\n" +"* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' status.\n" +"* When the user cancels the work order it will be set in 'Canceled' status.\n" +"* When order is completely processed that time it is set in 'Finished' status." +msgstr "" + #. module: mrp_operations #: view:mrp.production.workcenter.line:0 msgid "Production Workcenter" @@ -246,12 +261,6 @@ msgstr "" msgid "Product Qty" msgstr "" -#. module: mrp_operations -#: code:addons/mrp_operations/mrp_operations.py:134 -#, python-format -msgid "Manufacturing order cannot start in state \"%s\"!" -msgstr "" - #. module: mrp_operations #: selection:mrp.workorder,month:0 msgid "July" @@ -516,12 +525,6 @@ msgstr "" msgid "Finish the operation." msgstr "" -#. module: mrp_operations -#: code:addons/mrp_operations/mrp_operations.py:454 -#, python-format -msgid "Operation is not started yet !" -msgstr "" - #. module: mrp_operations #: model:process.node,note:mrp_operations.process_node_productionorder0 msgid "Information from the production order." @@ -585,12 +588,9 @@ msgid "Cancel" msgstr "" #. module: mrp_operations -#: help:mrp.production.workcenter.line,state:0 -msgid "* When a work order is created it is set in 'Draft' status.\n" -"* When user sets work order in start mode that time it will be set in 'In Progress' status.\n" -"* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' status.\n" -"* When the user cancels the work order it will be set in 'Canceled' status.\n" -"* When order is completely processed that time it is set in 'Finished' status." +#: code:addons/mrp_operations/mrp_operations.py:454 +#, python-format +msgid "Operation is not started yet!" msgstr "" #. module: mrp_operations diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot index df2a1d4fb3ae2..951208a9f1432 100644 --- a/addons/mrp_repair/i18n/mrp_repair.pot +++ b/addons/mrp_repair/i18n/mrp_repair.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -30,12 +30,6 @@ msgstr "" msgid "Recreate Invoice" msgstr "" -#. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:371 -#, python-format -msgid "You have to select a Partner Invoice Address in the repair form !" -msgstr "" - #. module: mrp_repair #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair #: view:mrp.repair.cancel:0 @@ -69,7 +63,7 @@ msgid "Unread Messages" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:435 +#: code:addons/mrp_repair/mrp_repair.py:441 #, python-format msgid "No product defined on Fees!" msgstr "" @@ -144,9 +138,9 @@ msgid "Taxes" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:385 -#: code:addons/mrp_repair/mrp_repair.py:413 -#: code:addons/mrp_repair/mrp_repair.py:442 +#: code:addons/mrp_repair/mrp_repair.py:391 +#: code:addons/mrp_repair/mrp_repair.py:419 +#: code:addons/mrp_repair/mrp_repair.py:448 #, python-format msgid "Error!" msgstr "" @@ -228,9 +222,9 @@ msgid "Extra Info" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:336 -#: code:addons/mrp_repair/mrp_repair.py:349 -#: code:addons/mrp_repair/mrp_repair.py:435 +#: code:addons/mrp_repair/mrp_repair.py:341 +#: code:addons/mrp_repair/mrp_repair.py:354 +#: code:addons/mrp_repair/mrp_repair.py:441 #: code:addons/mrp_repair/wizard/cancel_repair.py:49 #, python-format msgid "Warning!" @@ -248,7 +242,7 @@ msgid "Partner" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:385 +#: code:addons/mrp_repair/mrp_repair.py:391 #, python-format msgid "No account defined for partner \"%s\"." msgstr "" @@ -276,7 +270,7 @@ msgid "Repairs order" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:336 +#: code:addons/mrp_repair/mrp_repair.py:341 #, python-format msgid "Serial number is required for operation line with product '%s'" msgstr "" @@ -526,6 +520,12 @@ msgstr "" msgid "Date" msgstr "" +#. module: mrp_repair +#: code:addons/mrp_repair/mrp_repair.py:377 +#, python-format +msgid "No partner!" +msgstr "" + #. module: mrp_repair #: model:ir.model,name:mrp_repair.model_mrp_repair_fee msgid "Repair Fees Line" @@ -557,8 +557,8 @@ msgid "End Repair" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:413 -#: code:addons/mrp_repair/mrp_repair.py:442 +#: code:addons/mrp_repair/mrp_repair.py:419 +#: code:addons/mrp_repair/mrp_repair.py:448 #, python-format msgid "No account defined for product \"%s\"." msgstr "" @@ -582,9 +582,7 @@ msgid "Product Information" msgstr "" #. module: mrp_repair -#: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice #: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice -#: view:mrp.repair:0 msgid "Make Invoice" msgstr "" @@ -593,6 +591,12 @@ msgstr "" msgid "Start Repair" msgstr "" +#. module: mrp_repair +#: code:addons/mrp_repair/mrp_repair.py:377 +#, python-format +msgid "You have to select a Partner Invoice Address in the repair form!" +msgstr "" + #. module: mrp_repair #: field:mrp.repair.fee,price_unit:0 #: field:mrp.repair.line,price_unit:0 @@ -652,6 +656,8 @@ msgid "The warranty expiration limit is computed as: last move date + warranty d msgstr "" #. module: mrp_repair +#: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice +#: view:mrp.repair:0 #: view:mrp.repair.make_invoice:0 msgid "Create Invoice" msgstr "" @@ -711,7 +717,7 @@ msgid "Do you really want to create the invoice(s)?" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:349 +#: code:addons/mrp_repair/mrp_repair.py:354 #, python-format msgid "Repair order is already invoiced." msgstr "" @@ -789,9 +795,3 @@ msgstr "" msgid "Ready to Repair" msgstr "" -#. module: mrp_repair -#: code:addons/mrp_repair/mrp_repair.py:371 -#, python-format -msgid "No partner !" -msgstr "" - diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot index 027f33d7dc1fa..215677e508039 100644 --- a/addons/pad/i18n/pad.pot +++ b/addons/pad/i18n/pad.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -29,6 +29,13 @@ msgstr "" msgid "You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company." msgstr "" +#. module: pad +#. openerp-web +#: code:addons/pad/static/src/js/pad.js:47 +#, python-format +msgid "This pad will be initialized on first edit" +msgstr "" + #. module: pad #: help:res.company,pad_key:0 msgid "Etherpad lite api key." @@ -39,6 +46,12 @@ msgstr "" msgid "e.g. beta.primarypad.com" msgstr "" +#. module: pad +#: code:addons/pad/pad.py:49 +#, python-format +msgid "Pad creation fail, either there is a problem with your pad server URL or with your connection." +msgstr "" + #. module: pad #: model:ir.model,name:pad.model_res_company msgid "Companies" @@ -59,6 +72,12 @@ msgstr "" msgid "Pad Server" msgstr "" +#. module: pad +#: code:addons/pad/pad.py:49 +#, python-format +msgid "Error" +msgstr "" + #. module: pad #: field:res.company,pad_key:0 msgid "Pad Api Key" @@ -69,3 +88,10 @@ msgstr "" msgid "Etherpad lite server. Example: beta.primarypad.com" msgstr "" +#. module: pad +#. openerp-web +#: code:addons/pad/static/src/js/pad.js:44 +#, python-format +msgid "Unable to load pad" +msgstr "" + diff --git a/addons/plugin/i18n/plugin.pot b/addons/plugin/i18n/plugin.pot index e7b31f5290f2d..bbd88709619ed 100644 --- a/addons/plugin/i18n/plugin.pot +++ b/addons/plugin/i18n/plugin.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,13 +16,13 @@ msgstr "" "Plural-Forms: \n" #. module: plugin -#: code:addons/plugin/plugin_handler.py:105 +#: code:addons/plugin/plugin_handler.py:106 #, python-format msgid "Use the Partner button to create a new partner" msgstr "" #. module: plugin -#: code:addons/plugin/plugin_handler.py:116 +#: code:addons/plugin/plugin_handler.py:127 #, python-format msgid "Mail successfully pushed" msgstr "" @@ -33,13 +33,13 @@ msgid "plugin.handler" msgstr "" #. module: plugin -#: code:addons/plugin/plugin_handler.py:108 +#: code:addons/plugin/plugin_handler.py:109 #, python-format msgid "Mail successfully pushed, a new %s has been created." msgstr "" #. module: plugin -#: code:addons/plugin/plugin_handler.py:102 +#: code:addons/plugin/plugin_handler.py:103 #, python-format msgid "Email already pushed" msgstr "" diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot index 71bc65e098568..489eb23105fd7 100644 --- a/addons/point_of_sale/i18n/point_of_sale.pot +++ b/addons/point_of_sale/i18n/point_of_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgid "Red grapefruit" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:1373 +#: code:addons/point_of_sale/point_of_sale.py:1392 #, python-format msgid "Assign a Custom EAN" msgstr "" @@ -179,8 +179,8 @@ msgid "Reference" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:1066 -#: code:addons/point_of_sale/point_of_sale.py:1083 +#: code:addons/point_of_sale/point_of_sale.py:1085 +#: code:addons/point_of_sale/point_of_sale.py:1102 #: report:pos.invoice:0 #: report:pos.lines:0 #, python-format @@ -217,7 +217,7 @@ msgid "Help needed" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:760 +#: code:addons/point_of_sale/point_of_sale.py:772 #, python-format msgid "Configuration Error!" msgstr "" @@ -284,7 +284,7 @@ msgstr "" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:241 -#: code:addons/point_of_sale/static/src/xml/pos.xml:613 +#: code:addons/point_of_sale/static/src/xml/pos.xml:618 #, python-format msgid "Change:" msgstr "" @@ -317,7 +317,7 @@ msgid "Disc.(%)" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:1031 +#: code:addons/point_of_sale/point_of_sale.py:1050 #, python-format msgid "Please define income account for this product: \"%s\" (id:%d)." msgstr "" @@ -370,6 +370,11 @@ msgstr "" msgid "Parent Category" msgstr "" +#. module: point_of_sale +#: field:pos.details,user_ids:0 +msgid "Salespeople" +msgstr "" + #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:482 @@ -378,7 +383,7 @@ msgid "Open Cashbox" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:536 +#: code:addons/point_of_sale/point_of_sale.py:551 #, python-format msgid "You cannot change the partner of a POS order for which an invoice has already been issued." msgstr "" @@ -425,7 +430,7 @@ msgid "Hardware Events" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:301 +#: code:addons/point_of_sale/point_of_sale.py:302 #, python-format msgid "You should assign a Point of Sale to your session." msgstr "" @@ -438,9 +443,9 @@ msgstr "" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/screens.js:458 -#: code:addons/point_of_sale/static/src/js/screens.js:487 -#: code:addons/point_of_sale/static/src/js/screens.js:678 -#: code:addons/point_of_sale/static/src/js/screens.js:874 +#: code:addons/point_of_sale/static/src/js/screens.js:486 +#: code:addons/point_of_sale/static/src/js/screens.js:677 +#: code:addons/point_of_sale/static/src/js/screens.js:873 #, python-format msgid "Back" msgstr "" @@ -451,14 +456,14 @@ msgid "Fanta Orange 33cl" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:423 +#: code:addons/point_of_sale/point_of_sale.py:424 #, python-format msgid "Please set your profit and loss accounts on your payment method '%s'. This will allow OpenERP to post the difference of %.2f in your ending balance. To close this session, you can update the 'Closing Cash Control' to avoid any difference." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:315 -#: code:addons/point_of_sale/point_of_sale.py:514 +#: code:addons/point_of_sale/point_of_sale.py:316 +#: code:addons/point_of_sale/point_of_sale.py:526 #, python-format msgid "error!" msgstr "" @@ -611,7 +616,7 @@ msgid "

\n" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:888 +#: code:addons/point_of_sale/point_of_sale.py:909 #, python-format msgid "Customer Invoice" msgstr "" @@ -759,6 +764,11 @@ msgstr "" msgid "Pizza" msgstr "" +#. module: point_of_sale +#: field:pos.order,pos_reference:0 +msgid "Receipt Ref" +msgstr "" + #. module: point_of_sale #: view:pos.session:0 msgid "= Theoretical Balance" @@ -793,7 +803,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/widgets.js:981 +#: code:addons/point_of_sale/static/src/js/widgets.js:995 #, python-format msgid "Self-Checkout" msgstr "" @@ -973,13 +983,13 @@ msgid "User's Product" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:1007 +#: code:addons/point_of_sale/point_of_sale.py:1023 #, python-format msgid "The POS order must have lines when calling this method" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:1173 +#: code:addons/point_of_sale/point_of_sale.py:1192 #, python-format msgid "You have to select a pricelist in the sale form !\n" "Please set one before choosing a product." @@ -1028,9 +1038,9 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/point_of_sale.py:520 -#: code:addons/point_of_sale/static/src/xml/pos.xml:689 -#: code:addons/point_of_sale/static/src/xml/pos.xml:744 +#: code:addons/point_of_sale/point_of_sale.py:532 +#: code:addons/point_of_sale/static/src/xml/pos.xml:694 +#: code:addons/point_of_sale/static/src/xml/pos.xml:749 #, python-format msgid "return" msgstr "" @@ -1076,6 +1086,12 @@ msgstr "" msgid "Oven Baked Lays Natural 150g" msgstr "" +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:477 +#, python-format +msgid "You cannot use the session of another users. This session is owned by %s. Please first close this one to use this point of sale." +msgstr "" + #. module: point_of_sale #: sql_constraint:pos.session:0 msgid "The name of this POS Session must be unique !" @@ -1153,8 +1169,8 @@ msgid "2L Evian" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:373 -#: code:addons/point_of_sale/point_of_sale.py:474 +#: code:addons/point_of_sale/point_of_sale.py:374 +#: code:addons/point_of_sale/point_of_sale.py:481 #: code:addons/point_of_sale/wizard/pos_session_opening.py:33 #, python-format msgid "Start Point Of Sale" @@ -1182,14 +1198,14 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:741 +#: code:addons/point_of_sale/static/src/xml/pos.xml:746 #, python-format msgid "ABC" msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:812 +#: code:addons/point_of_sale/static/src/js/screens.js:811 #, python-format msgid "Print" msgstr "" @@ -1200,8 +1216,9 @@ msgid "IJsboerke 2.5L White Lady" msgstr "" #. module: point_of_sale -#: field:pos.order,lines:0 -msgid "Order Lines" +#: code:addons/point_of_sale/wizard/pos_open_statement.py:49 +#, python-format +msgid "No Cash Register Defined!" msgstr "" #. module: point_of_sale @@ -1360,7 +1377,7 @@ msgid "Today's Closed Cashbox" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:920 +#: code:addons/point_of_sale/point_of_sale.py:936 #, python-format msgid "Selected orders do not have the same session!" msgstr "" @@ -1400,7 +1417,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:663 +#: code:addons/point_of_sale/static/src/xml/pos.xml:668 #, python-format msgid "tab" msgstr "" @@ -1498,7 +1515,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:590 +#: code:addons/point_of_sale/static/src/xml/pos.xml:595 #, python-format msgid "Tax:" msgstr "" @@ -1532,7 +1549,7 @@ msgid "User" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:413 +#: code:addons/point_of_sale/point_of_sale.py:414 #, python-format msgid "The type of the journal for your payment method should be bank or cash " msgstr "" @@ -1625,12 +1642,6 @@ msgstr "" msgid "Timmermans Faro 37.5cl" msgstr "" -#. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:410 -#, python-format -msgid "Your ending balance is too different from the theorical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it." -msgstr "" - #. module: point_of_sale #: view:pos.session:0 msgid "Validate Closing & Post Entries" @@ -1642,7 +1653,7 @@ msgid "Number of Transaction" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:759 +#: code:addons/point_of_sale/point_of_sale.py:771 #, python-format msgid "There is no receivable account defined to make payment for the partner: \"%s\" (id:%d)." msgstr "" @@ -1689,7 +1700,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:772 +#: code:addons/point_of_sale/static/src/js/screens.js:768 #, python-format msgid "Pay" msgstr "" @@ -1721,8 +1732,8 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:704 -#: code:addons/point_of_sale/static/src/xml/pos.xml:746 +#: code:addons/point_of_sale/static/src/xml/pos.xml:709 +#: code:addons/point_of_sale/static/src/xml/pos.xml:751 #, python-format msgid "close" msgstr "" @@ -1802,7 +1813,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:587 +#: code:addons/point_of_sale/static/src/xml/pos.xml:592 #, python-format msgid "Subtotal:" msgstr "" @@ -1824,12 +1835,6 @@ msgstr "" msgid "Difference" msgstr "" -#. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:549 -#, python-format -msgid "Unable to Delete !" -msgstr "" - #. module: point_of_sale #: model:pos.category,name:point_of_sale.autres_agrumes msgid "Other Citrus" @@ -1907,7 +1912,7 @@ msgid "User:" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:316 +#: code:addons/point_of_sale/point_of_sale.py:317 #, python-format msgid "Unable to open the session. You have to assign a sale journal to your point of sale." msgstr "" @@ -1917,11 +1922,6 @@ msgstr "" msgid "POS ordered created during current year" msgstr "" -#. module: point_of_sale -#: model:product.template,name:point_of_sale.peche_product_template -msgid "Fishing" -msgstr "" - #. module: point_of_sale #: report:pos.details:0 #: report:pos.details_summary:0 @@ -1974,24 +1974,19 @@ msgid "All Closed CashBox" msgstr "" #. module: point_of_sale -#: field:pos.details,user_ids:0 -msgid "Salespeople" +#: code:addons/point_of_sale/point_of_sale.py:1191 +#, python-format +msgid "No Pricelist!" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:777 +#: code:addons/point_of_sale/point_of_sale.py:789 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118 #: code:addons/point_of_sale/wizard/pos_box_out.py:91 #, python-format msgid "You have to open at least one cashbox." msgstr "" -#. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:1172 -#, python-format -msgid "No Pricelist !" -msgstr "" - #. module: point_of_sale #: model:product.template,name:point_of_sale.poivron_rouges_product_template msgid "Red Pepper" @@ -1999,7 +1994,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:677 +#: code:addons/point_of_sale/static/src/xml/pos.xml:682 #, python-format msgid "caps lock" msgstr "" @@ -2016,8 +2011,8 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:702 -#: code:addons/point_of_sale/static/src/xml/pos.xml:742 +#: code:addons/point_of_sale/static/src/xml/pos.xml:707 +#: code:addons/point_of_sale/static/src/xml/pos.xml:747 #, python-format msgid " " msgstr "" @@ -2029,8 +2024,8 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:495 -#: code:addons/point_of_sale/static/src/js/screens.js:882 +#: code:addons/point_of_sale/static/src/js/screens.js:494 +#: code:addons/point_of_sale/static/src/js/screens.js:881 #, python-format msgid "Validate" msgstr "" @@ -2041,13 +2036,7 @@ msgid "Other fresh vegetables" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/wizard/pos_open_statement.py:49 -#, python-format -msgid "No Cash Register Defined !" -msgstr "" - -#. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:515 +#: code:addons/point_of_sale/point_of_sale.py:527 #, python-format msgid "No cash statement found for this session. Unable to record returned cash." msgstr "" @@ -2088,7 +2077,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:741 +#: code:addons/point_of_sale/static/src/xml/pos.xml:746 #, python-format msgid "123" msgstr "" @@ -2141,7 +2130,7 @@ msgstr "" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/screens.js:268 -#: code:addons/point_of_sale/static/src/js/screens.js:718 +#: code:addons/point_of_sale/static/src/js/screens.js:717 #, python-format msgid "Help" msgstr "" @@ -2295,6 +2284,12 @@ msgstr "" msgid "Golden Apples Perlim" msgstr "" +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:411 +#, python-format +msgid "Your ending balance is too different from the theoretical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it." +msgstr "" + #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:100 #: selection:pos.session,state:0 @@ -2535,7 +2530,7 @@ msgstr "" #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:220 #: code:addons/point_of_sale/static/src/xml/pos.xml:426 -#: code:addons/point_of_sale/static/src/xml/pos.xml:596 +#: code:addons/point_of_sale/static/src/xml/pos.xml:601 #: report:all.closed.cashbox.of.the.day:0 #: report:pos.invoice:0 #: report:pos.lines:0 @@ -2551,7 +2546,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:573 +#: code:addons/point_of_sale/static/src/xml/pos.xml:578 #, python-format msgid "% discount" msgstr "" @@ -2626,8 +2621,8 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:690 -#: code:addons/point_of_sale/static/src/xml/pos.xml:701 +#: code:addons/point_of_sale/static/src/xml/pos.xml:695 +#: code:addons/point_of_sale/static/src/xml/pos.xml:706 #, python-format msgid "shift" msgstr "" @@ -2652,7 +2647,7 @@ msgstr "" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:513 -#: code:addons/point_of_sale/static/src/xml/pos.xml:572 +#: code:addons/point_of_sale/static/src/xml/pos.xml:577 #, python-format msgid "With a" msgstr "" @@ -2780,7 +2775,7 @@ msgid "Pos Lines" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:416 +#: code:addons/point_of_sale/point_of_sale.py:417 #, python-format msgid "Point of Sale Profit" msgstr "" @@ -2936,6 +2931,12 @@ msgstr "" msgid "Open Cash Register" msgstr "" +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:564 +#, python-format +msgid "Unable to Delete!" +msgstr "" + #. module: point_of_sale #: field:account.journal,amount_authorized_diff:0 msgid "Amount Authorized Difference" @@ -3000,6 +3001,12 @@ msgstr "" msgid "Fanta Orange 25cl" msgstr "" +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:813 +#, python-format +msgid "To return product(s), you need to open a session that will be used to register the refund." +msgstr "" + #. module: point_of_sale #: view:pos.confirm:0 msgid "Generate Journal Entries" @@ -3100,17 +3107,19 @@ msgid "Boni Oranges" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:300 -#: code:addons/point_of_sale/point_of_sale.py:409 -#: code:addons/point_of_sale/point_of_sale.py:412 -#: code:addons/point_of_sale/point_of_sale.py:422 -#: code:addons/point_of_sale/point_of_sale.py:459 -#: code:addons/point_of_sale/point_of_sale.py:536 -#: code:addons/point_of_sale/point_of_sale.py:733 -#: code:addons/point_of_sale/point_of_sale.py:777 -#: code:addons/point_of_sale/point_of_sale.py:839 -#: code:addons/point_of_sale/point_of_sale.py:920 -#: code:addons/point_of_sale/point_of_sale.py:1031 +#: code:addons/point_of_sale/point_of_sale.py:301 +#: code:addons/point_of_sale/point_of_sale.py:410 +#: code:addons/point_of_sale/point_of_sale.py:413 +#: code:addons/point_of_sale/point_of_sale.py:423 +#: code:addons/point_of_sale/point_of_sale.py:461 +#: code:addons/point_of_sale/point_of_sale.py:476 +#: code:addons/point_of_sale/point_of_sale.py:551 +#: code:addons/point_of_sale/point_of_sale.py:745 +#: code:addons/point_of_sale/point_of_sale.py:789 +#: code:addons/point_of_sale/point_of_sale.py:813 +#: code:addons/point_of_sale/point_of_sale.py:860 +#: code:addons/point_of_sale/point_of_sale.py:936 +#: code:addons/point_of_sale/point_of_sale.py:1050 #: code:addons/point_of_sale/report/pos_invoice.py:46 #: code:addons/point_of_sale/wizard/pos_box.py:22 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46 @@ -3204,13 +3213,13 @@ msgid "Chaudfontaine 1.5l" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:1096 +#: code:addons/point_of_sale/point_of_sale.py:1115 #, python-format msgid "Trade Receivables" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:549 +#: code:addons/point_of_sale/point_of_sale.py:564 #, python-format msgid "In order to delete a sale, it must be new or cancelled." msgstr "" @@ -3243,7 +3252,7 @@ msgid "Journal Entry" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:757 +#: code:addons/point_of_sale/point_of_sale.py:769 #, python-format msgid "There is no receivable account defined to make payment." msgstr "" @@ -3274,7 +3283,7 @@ msgid "Supplier Invoice" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:460 +#: code:addons/point_of_sale/point_of_sale.py:462 #, python-format msgid "You cannot confirm all orders of this session, because they have not the 'paid' status" msgstr "" @@ -3351,7 +3360,7 @@ msgid "Coca-Cola Regular 1L" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:733 +#: code:addons/point_of_sale/point_of_sale.py:745 #, python-format msgid "Unable to cancel the picking." msgstr "" @@ -3392,7 +3401,7 @@ msgid "Spa Barisart 1.5l" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:810 +#: code:addons/point_of_sale/point_of_sale.py:831 #: view:pos.order:0 #, python-format msgid "Return Products" @@ -3411,8 +3420,8 @@ msgid "Print Invoice" msgstr "" #. module: point_of_sale -#: field:pos.order,pos_reference:0 -msgid "Receipt Ref" +#: model:product.template,name:point_of_sale.peche_product_template +msgid "Peaches" msgstr "" #. module: point_of_sale @@ -3549,7 +3558,7 @@ msgid "PRO-FORMA" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:839 +#: code:addons/point_of_sale/point_of_sale.py:860 #, python-format msgid "Please provide a partner for the sale." msgstr "" @@ -3601,7 +3610,7 @@ msgid "Print Receipt" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/point_of_sale.py:420 +#: code:addons/point_of_sale/point_of_sale.py:421 #, python-format msgid "Point of Sale Loss" msgstr "" @@ -3702,7 +3711,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/widgets.js:975 +#: code:addons/point_of_sale/static/src/js/widgets.js:989 #, python-format msgid "Close" msgstr "" @@ -3724,8 +3733,8 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:662 -#: code:addons/point_of_sale/static/src/xml/pos.xml:739 +#: code:addons/point_of_sale/static/src/xml/pos.xml:667 +#: code:addons/point_of_sale/static/src/xml/pos.xml:744 #, python-format msgid "delete" msgstr "" @@ -3777,8 +3786,8 @@ msgid "Today's Sales By User" msgstr "" #. module: point_of_sale -#: help:account.journal,amount_authorized_diff:0 -msgid "This field depicts the maximum difference allowed between the ending balance and the theorical cash when closing a session, for non-POS managers. If this maximum is reached, the user will have an error message at the closing of his session saying that he needs to contact his manager." +#: field:pos.order,lines:0 +msgid "Order Lines" msgstr "" #. module: point_of_sale @@ -3792,6 +3801,11 @@ msgstr "" msgid "Description" msgstr "" +#. module: point_of_sale +#: help:account.journal,amount_authorized_diff:0 +msgid "This field depicts the maximum difference allowed between the ending balance and the theorical cash when closing a session, for non-POS managers. If this maximum is reached, the user will have an error message at the closing of his session saying that he needs to contact his manager." +msgstr "" + #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.act_pos_config_sessions #: field:pos.config,session_ids:0 @@ -3901,7 +3915,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/xml/pos.xml:593 +#: code:addons/point_of_sale/static/src/xml/pos.xml:598 #, python-format msgid "Discount:" msgstr "" @@ -3957,7 +3971,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:818 +#: code:addons/point_of_sale/static/src/js/screens.js:817 #, python-format msgid "Next Order" msgstr "" diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot index 1eb3f501ed752..fb1705f7eac04 100644 --- a/addons/portal/i18n/portal.pot +++ b/addons/portal/i18n/portal.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -115,19 +115,19 @@ msgid "Share Wizard" msgstr "" #. module: portal -#: view:portal.payment.acquirer:0 -msgid ", so it may use Mako expressions.\n" -" The Mako evaluation context provides:" -msgstr "" - -#. module: portal -#: model:ir.actions.client,help:portal.action_news +#: model:ir.actions.client,help:portal.action_jobs msgid "

\n" -" Youd don't have unread company's news.\n" +" You don't have unread job offers.\n" "

\n" " " msgstr "" +#. module: portal +#: view:portal.payment.acquirer:0 +msgid ", so it may use Mako expressions.\n" +" The Mako evaluation context provides:" +msgstr "" + #. module: portal #: field:portal.wizard.user,email:0 msgid "Email" @@ -157,6 +157,7 @@ msgid "Jobs" msgstr "" #. module: portal +#: model:ir.model,name:portal.model_res_users #: field:portal.wizard,user_ids:0 msgid "Users" msgstr "" @@ -174,7 +175,7 @@ msgid "No online payment acquirers configured" msgstr "" #. module: portal -#: code:addons/portal/mail_message.py:54 +#: code:addons/portal/mail_message.py:60 #, python-format msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n" "\n" @@ -193,11 +194,8 @@ msgid "Users you already shared with" msgstr "" #. module: portal -#: model:ir.actions.client,help:portal.action_jobs -msgid "

\n" -" Youd don't have unread job offers.\n" -"

\n" -" " +#: view:portal.payment.acquirer:0 +msgid "object: the document on which the payment form is rendered (usually an invoice or sales order record)" msgstr "" #. module: portal @@ -242,8 +240,15 @@ msgid "News" msgstr "" #. module: portal -#: model:ir.ui.menu,name:portal.portal_after_sales -msgid "After Sale Services" +#: code:addons/portal/mail_message.py:59 +#, python-format +msgid "Access Denied" +msgstr "" + +#. module: portal +#: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal +#: model:ir.ui.menu,name:portal.portal_inbox +msgid "Inbox" msgstr "" #. module: portal @@ -264,9 +269,9 @@ msgid "Projects" msgstr "" #. module: portal -#: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal -#: model:ir.ui.menu,name:portal.portal_inbox -msgid "Inbox" +#: code:addons/portal/wizard/share_wizard.py:39 +#, python-format +msgid "Existing Groups (e.g Portal Groups)" msgstr "" #. module: portal @@ -291,8 +296,8 @@ msgid "Access Groups" msgstr "" #. module: portal -#: view:portal.payment.acquirer:0 -msgid "uid: the current user id" +#: model:ir.model,name:portal.model_mail_message +msgid "Message" msgstr "" #. module: portal @@ -316,11 +321,6 @@ msgstr "" msgid "

Access your messages and personal documents through our Customer Portal

" msgstr "" -#. module: portal -#: field:portal.payment.acquirer,form_template:0 -msgid "Payment form template (HTML)" -msgstr "" - #. module: portal #: field:portal.wizard.user,partner_id:0 msgid "Contact" @@ -332,9 +332,8 @@ msgid "Outgoing Mails" msgstr "" #. module: portal -#: code:addons/portal/wizard/portal_wizard.py:193 -#, python-format -msgid "Email required" +#: field:portal.payment.acquirer,form_template:0 +msgid "Payment form template (HTML)" msgstr "" #. module: portal @@ -342,6 +341,11 @@ msgstr "" msgid "Messaging" msgstr "" +#. module: portal +#: view:portal.payment.acquirer:0 +msgid "uid: the current user id" +msgstr "" + #. module: portal #: model:res.groups,comment:portal.group_anonymous msgid "Anonymous users have specific access rights (such as record rules and restricted menus).\n" @@ -354,9 +358,8 @@ msgid "Online Payment Acquirer" msgstr "" #. module: portal -#: code:addons/portal/mail_message.py:53 -#, python-format -msgid "Access Denied" +#: model:ir.ui.menu,name:portal.portal_after_sales +msgid "After Sale Services" msgstr "" #. module: portal @@ -387,11 +390,6 @@ msgid "

\n" " " msgstr "" -#. module: portal -#: view:portal.payment.acquirer:0 -msgid "object: the document on which the payment form is rendered (usually an invoice or sales order record)" -msgstr "" - #. module: portal #: help:portal.wizard,welcome_message:0 msgid "This text is included in the email sent to new users of the portal." @@ -471,9 +469,9 @@ msgid "Visible" msgstr "" #. module: portal -#: code:addons/portal/wizard/share_wizard.py:39 +#: code:addons/portal/wizard/portal_wizard.py:193 #, python-format -msgid "Existing Groups (e.g Portal Groups)" +msgid "Email Required" msgstr "" #. module: portal @@ -487,8 +485,11 @@ msgid "Apply" msgstr "" #. module: portal -#: model:ir.model,name:portal.model_mail_message -msgid "Message" +#: model:ir.actions.client,help:portal.action_news +msgid "

\n" +" You don't have unread company's news.\n" +"

\n" +" " msgstr "" #. module: portal diff --git a/addons/portal_claim/i18n/portal_claim.pot b/addons/portal_claim/i18n/portal_claim.pot index bfc3d6f1d2967..4498f2855d0d7 100644 --- a/addons/portal_claim/i18n/portal_claim.pot +++ b/addons/portal_claim/i18n/portal_claim.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,6 +26,11 @@ msgid "

\n" " " msgstr "" +#. module: portal_claim +#: model:ir.model,name:portal_claim.model_crm_claim +msgid "Claim" +msgstr "" + #. module: portal_claim #: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0 #: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims diff --git a/addons/portal_crm/i18n/portal_crm.pot b/addons/portal_crm/i18n/portal_crm.pot index 9bf13ab2c24a6..17e79022ee820 100644 --- a/addons/portal_crm/i18n/portal_crm.pot +++ b/addons/portal_crm/i18n/portal_crm.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -61,8 +61,8 @@ msgid "Company" msgstr "" #. module: portal_crm -#: field:portal_crm.crm_contact_us,user_id:0 -msgid "Salesperson" +#: field:portal_crm.crm_contact_us,day_open:0 +msgid "Days to Open" msgstr "" #. module: portal_crm @@ -95,6 +95,11 @@ msgstr "" msgid "Color Index" msgstr "" +#. module: portal_crm +#: field:portal_crm.crm_contact_us,partner_latitude:0 +msgid "Geo Latitude" +msgstr "" + #. module: portal_crm #: field:portal_crm.crm_contact_us,partner_name:0 msgid "Customer Name" @@ -201,6 +206,11 @@ msgstr "" msgid "Channel" msgstr "" +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Name" +msgstr "" + #. module: portal_crm #: selection:portal_crm.crm_contact_us,priority:0 msgid "Lowest" @@ -221,6 +231,16 @@ msgstr "" msgid "If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. Filter 'Available for Mass Mailing' allows users to filter the leads when performing mass mailing." msgstr "" +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Close" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,state:0 +msgid "Pending" +msgstr "" + #. module: portal_crm #: help:portal_crm.crm_contact_us,type:0 msgid "Type is used to separate Leads and Opportunities" @@ -348,8 +368,8 @@ msgid "Closed" msgstr "" #. module: portal_crm -#: selection:portal_crm.crm_contact_us,state:0 -msgid "Pending" +#: field:portal_crm.crm_contact_us,date_assign:0 +msgid "Assignation Date" msgstr "" #. module: portal_crm @@ -393,8 +413,8 @@ msgid "Active" msgstr "" #. module: portal_crm -#: field:portal_crm.crm_contact_us,day_open:0 -msgid "Days to Open" +#: field:portal_crm.crm_contact_us,user_id:0 +msgid "Salesperson" msgstr "" #. module: portal_crm @@ -427,14 +447,19 @@ msgstr "" msgid "Partner Contact Name" msgstr "" +#. module: portal_crm +#: field:portal_crm.crm_contact_us,partner_longitude:0 +msgid "Geo Longitude" +msgstr "" + #. module: portal_crm #: view:portal_crm.crm_contact_us:0 msgid "Your phone number..." msgstr "" #. module: portal_crm -#: view:portal_crm.crm_contact_us:0 -msgid "Close" +#: help:portal_crm.crm_contact_us,date_assign:0 +msgid "Last date this case was forwarded/assigned to a partner" msgstr "" #. module: portal_crm @@ -462,14 +487,19 @@ msgstr "" msgid "Referred By" msgstr "" +#. module: portal_crm +#: field:portal_crm.crm_contact_us,partner_assigned_id:0 +msgid "Assigned Partner" +msgstr "" + #. module: portal_crm #: selection:portal_crm.crm_contact_us,type:0 msgid "Opportunity" msgstr "" #. module: portal_crm -#: view:portal_crm.crm_contact_us:0 -msgid "Name" +#: help:portal_crm.crm_contact_us,partner_assigned_id:0 +msgid "Partner this case has been forwarded/assigned to." msgstr "" #. module: portal_crm diff --git a/addons/portal_sale/i18n/portal_sale.pot b/addons/portal_sale/i18n/portal_sale.pot index f32525db593f4..c538e4de787e5 100644 --- a/addons/portal_sale/i18n/portal_sale.pot +++ b/addons/portal_sale/i18n/portal_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,6 +20,11 @@ msgstr "" msgid "account.config.settings" msgstr "" +#. module: portal_sale +#: model:email.template,subject:portal_sale.email_template_edi_invoice +msgid "${object.company_id.name|safe} Invoice (Ref ${object.number or 'n/a' })" +msgstr "" + #. module: portal_sale #: view:account.invoice:0 msgid "[('share','=', False)]" @@ -45,11 +50,6 @@ msgstr "" msgid "Show payment buttons to employees too" msgstr "" -#. module: portal_sale -#: model:email.template,subject:portal_sale.email_template_edi_sale -msgid "${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" -msgstr "" - #. module: portal_sale #: model:ir.actions.act_window,help:portal_sale.action_quotations_portal msgid "We haven't sent you any quotation." @@ -155,8 +155,8 @@ msgid "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draf msgstr "" #. module: portal_sale -#: model:email.template,subject:portal_sale.email_template_edi_invoice -msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })" +#: model:email.template,subject:portal_sale.email_template_edi_sale +msgid "${object.company_id.name|safe} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" msgstr "" #. module: portal_sale @@ -171,8 +171,8 @@ msgid "Quotations" msgstr "" #. module: portal_sale -#: model:ir.model,name:portal_sale.model_sale_order -msgid "Sales Order" +#: model:ir.actions.act_window,name:portal_sale.action_orders_portal +msgid "Sale Orders" msgstr "" #. module: portal_sale @@ -287,7 +287,7 @@ msgid "Invoice" msgstr "" #. module: portal_sale -#: model:ir.actions.act_window,name:portal_sale.action_orders_portal -msgid "Sale Orders" +#: model:ir.model,name:portal_sale.model_sale_order +msgid "Sales Order" msgstr "" diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot index 9abdffc0d2a90..dc7e5de3a3684 100644 --- a/addons/procurement/i18n/procurement.pot +++ b/addons/procurement/i18n/procurement.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -46,9 +46,11 @@ msgid "Draft procurement of the product and location of that orderpoint" msgstr "" #. module: procurement -#: view:product.product:0 -msgid "required quantities are always\n" -" available" +#: view:make.procurement:0 +msgid "Use this assistant to generate a procurement request for this\n" +" product. According to the product configuration, this may\n" +" trigger a draft purchase order, a manufacturing order or\n" +" a new task." msgstr "" #. module: procurement @@ -184,7 +186,7 @@ msgid "Stockable products" msgstr "" #. module: procurement -#: code:addons/procurement/procurement.py:138 +#: code:addons/procurement/procurement.py:154 #, python-format msgid "Invalid Action!" msgstr "" @@ -255,7 +257,7 @@ msgid "Minimum Inventory Rule" msgstr "" #. module: procurement -#: code:addons/procurement/procurement.py:370 +#: code:addons/procurement/procurement.py:388 #, python-format msgid "Procurement '%s' is in exception: " msgstr "" @@ -304,12 +306,6 @@ msgstr "" msgid "Best price (not yet active!)" msgstr "" -#. module: procurement -#: code:addons/procurement/schedulers.py:110 -#, python-format -msgid "PROC %d: from stock - %3.2f %-5s - %s" -msgstr "" - #. module: procurement #: model:ir.model,name:procurement.model_procurement_order_compute msgid "Compute Procurement" @@ -342,7 +338,7 @@ msgid "Quantity" msgstr "" #. module: procurement -#: code:addons/procurement/procurement.py:365 +#: code:addons/procurement/procurement.py:383 #, python-format msgid "Not enough stock and no minimum orderpoint rule defined." msgstr "" @@ -567,7 +563,7 @@ msgid "Is a Follower" msgstr "" #. module: procurement -#: code:addons/procurement/procurement.py:367 +#: code:addons/procurement/procurement.py:385 #, python-format msgid "Not enough stock." msgstr "" @@ -583,7 +579,7 @@ msgid "Procure Products" msgstr "" #. module: procurement -#: code:addons/procurement/procurement.py:312 +#: code:addons/procurement/procurement.py:330 #, python-format msgid "Please check the quantity in procurement order(s) for the product \"%s\", it should not be 0 or less!" msgstr "" @@ -605,7 +601,7 @@ msgid "When you sell this product, a delivery order will be created.\n" msgstr "" #. module: procurement -#: code:addons/procurement/schedulers.py:133 +#: code:addons/procurement/schedulers.py:125 #, python-format msgid "Automatic OP: %s" msgstr "" @@ -678,12 +674,6 @@ msgstr "" msgid "Properties composition" msgstr "" -#. module: procurement -#: code:addons/procurement/procurement.py:311 -#, python-format -msgid "Data Insufficient !" -msgstr "" - #. module: procurement #: model:ir.model,name:procurement.model_mrp_property_group #: field:mrp.property,group_id:0 @@ -719,6 +709,12 @@ msgstr "" msgid "Cancel" msgstr "" +#. module: procurement +#: code:addons/procurement/procurement.py:329 +#, python-format +msgid "Data Insufficient!" +msgstr "" + #. module: procurement #: field:stock.warehouse.orderpoint,logic:0 msgid "Reordering Mode" @@ -774,14 +770,6 @@ msgstr "" msgid "Minimum Stock Rules" msgstr "" -#. module: procurement -#: view:make.procurement:0 -msgid "Use this assistant to generate a procurement request for this\n" -" product. According to the product configuration, this may\n" -" trigger a draft purchase order, a manufacturing order or\n" -" a new task." -msgstr "" - #. module: procurement #: field:procurement.order,close_move:0 msgid "Close Move at end" @@ -850,6 +838,12 @@ msgstr "" msgid "When you sell this product, OpenERP will" msgstr "" +#. module: procurement +#: view:product.product:0 +msgid "required quantities are always\n" +" available" +msgstr "" + #. module: procurement #: view:procurement.order:0 msgid "Temporary Procurement Exceptions" @@ -876,7 +870,7 @@ msgid "Reordering Rules" msgstr "" #. module: procurement -#: code:addons/procurement/procurement.py:139 +#: code:addons/procurement/procurement.py:155 #, python-format msgid "Cannot delete Procurement Order(s) which are in %s state." msgstr "" @@ -940,7 +934,7 @@ msgid "or" msgstr "" #. module: procurement -#: code:addons/procurement/schedulers.py:134 +#: code:addons/procurement/schedulers.py:126 #, python-format msgid "SCHEDULER" msgstr "" @@ -951,13 +945,7 @@ msgid "Request Procurement" msgstr "" #. module: procurement -#: code:addons/procurement/schedulers.py:87 -#, python-format -msgid "PROC %d: on order - %3.2f %-5s - %s" -msgstr "" - -#. module: procurement -#: code:addons/procurement/procurement.py:339 +#: code:addons/procurement/procurement.py:357 #, python-format msgid "Products reserved from stock." msgstr "" diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index 619f20bd36b8f..8fd8976b34626 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -37,6 +37,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_34_product_template +#: model:product.template,name:product.product_template_34 msgid "Webcam" msgstr "" @@ -72,6 +73,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_10_product_template +#: model:product.template,name:product.product_template_10 msgid "Mouse, Optical" msgstr "" @@ -92,6 +94,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_3_product_template +#: model:product.template,name:product.product_template_3 msgid "PC Assemble SC234" msgstr "" @@ -101,7 +104,7 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire msgstr "" #. module: product -#: code:addons/product/pricelist.py:179 +#: code:addons/product/pricelist.py:198 #: code:addons/product/product.py:208 #, python-format msgid "Warning!" @@ -140,6 +143,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_4_product_template +#: model:product.template,name:product.product_template_4 msgid "PC Assemble SC349" msgstr "" @@ -188,6 +192,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_33_product_template +#: model:product.template,description:product.product_template_33 msgid "Headset for laptop PC with USB connector." msgstr "" @@ -217,6 +222,7 @@ msgstr "" #. module: product #: model:product.template,description_sale:product.product_product_42_product_template +#: model:product.template,description_sale:product.product_template_42 msgid "Office Editing Software with word processing, spreadsheets, presentations, graphics, and databases..." msgstr "" @@ -249,6 +255,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_25_product_template +#: model:product.template,name:product.product_template_25 msgid "Laptop E5023" msgstr "" @@ -264,6 +271,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_30_product_template +#: model:product.template,name:product.product_template_30 msgid "Pen drive, SP-4" msgstr "" @@ -274,6 +282,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_29_product_template +#: model:product.template,name:product.product_template_29 msgid "Pen drive, SP-2" msgstr "" @@ -324,6 +333,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_7_product_template +#: model:product.template,name:product.product_template_7 msgid "17” LCD Monitor" msgstr "" @@ -441,6 +451,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_44_product_template +#: model:product.template,name:product.product_template_44 msgid "GrapWorks Software" msgstr "" @@ -451,6 +462,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_42_product_template +#: model:product.template,name:product.product_template_42 msgid "Office Suite" msgstr "" @@ -461,6 +473,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_32_product_template +#: model:product.template,name:product.product_template_32 msgid "Headset standard" msgstr "" @@ -515,11 +528,13 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_5_product_template +#: model:product.template,name:product.product_template_5 msgid "PC Assemble + Custom (PC on Demand)" msgstr "" #. module: product #: model:product.template,description:product.product_product_27_product_template +#: model:product.template,description:product.product_template_27 msgid "Custom Laptop based on customer's requirement." msgstr "" @@ -536,6 +551,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_36_product_template +#: model:product.template,name:product.product_template_36 msgid "Blank DVD-RW" msgstr "" @@ -581,11 +597,13 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_12_product_template +#: model:product.template,name:product.product_template_12 msgid "Mouse, Wireless" msgstr "" #. module: product #: model:product.template,name:product.product_product_22_product_template +#: model:product.template,name:product.product_template_22 msgid "Processor Core i5 2.70 Ghz" msgstr "" @@ -616,11 +634,13 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_18_product_template +#: model:product.template,name:product.product_template_18 msgid "HDD SH-2" msgstr "" #. module: product #: model:product.template,name:product.product_product_17_product_template +#: model:product.template,name:product.product_template_17 msgid "HDD SH-1" msgstr "" @@ -677,6 +697,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_33_product_template +#: model:product.template,name:product.product_template_33 msgid "Headset USB" msgstr "" @@ -707,6 +728,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_28_product_template +#: model:product.template,name:product.product_template_28 msgid "External Hard disk" msgstr "" @@ -800,6 +822,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_1_product_template +#: model:product.template,name:product.product_template_1 msgid "On Site Monitoring" msgstr "" @@ -824,6 +847,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_46_product_template +#: model:product.template,name:product.product_template_46 msgid "Datacard" msgstr "" @@ -847,6 +871,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_20_product_template +#: model:product.template,name:product.product_template_20 msgid "Motherboard I9P57" msgstr "" @@ -914,6 +939,7 @@ msgstr "" #. module: product #: model:product.template,description_sale:product.product_product_3_product_template +#: model:product.template,description_sale:product.product_template_3 msgid "17\" LCD Monitor\n" "Processor AMD 8-Core\n" "512MB RAM\n" @@ -932,6 +958,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_27_product_template +#: model:product.template,name:product.product_template_27 msgid "Laptop Customized" msgstr "" @@ -942,6 +969,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_35_product_template +#: model:product.template,name:product.product_template_35 msgid "Blank CD" msgstr "" @@ -973,6 +1001,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_37_product_template +#: model:product.template,description:product.product_template_37 msgid "All in one hi-speed printer with fax and scanner." msgstr "" @@ -1023,13 +1052,14 @@ msgid "Price Surcharge" msgstr "" #. module: product -#: code:addons/product/pricelist.py:380 +#: code:addons/product/pricelist.py:401 #, python-format msgid "Supplier Prices on the product form" msgstr "" #. module: product #: model:product.template,name:product.product_product_8_product_template +#: model:product.template,name:product.product_template_8 msgid "USB Keyboard, QWERTY" msgstr "" @@ -1184,6 +1214,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_32_product_template +#: model:product.template,description:product.product_template_32 msgid "Hands free headset for laptop PC with in-line microphone and headphone plug." msgstr "" @@ -1239,18 +1270,20 @@ msgid "Supplier Info" msgstr "" #. module: product -#: code:addons/product/product.py:732 +#: code:addons/product/product.py:733 #, python-format msgid "%s (copy)" msgstr "" #. module: product #: model:product.template,name:product.product_product_2_product_template +#: model:product.template,name:product.product_template_2 msgid "On Site Assistance" msgstr "" #. module: product #: model:product.template,name:product.product_product_39_product_template +#: model:product.template,name:product.product_template_39 msgid "Toner Cartridge" msgstr "" @@ -1279,6 +1312,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_43_product_template +#: model:product.template,name:product.product_template_43 msgid "Zed+ Antivirus" msgstr "" @@ -1310,6 +1344,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_37_product_template +#: model:product.template,name:product.product_template_37 msgid "Printer, All-in-one" msgstr "" @@ -1320,6 +1355,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_23_product_template +#: model:product.template,name:product.product_template_23 msgid "Processor AMD 8-Core" msgstr "" @@ -1367,6 +1403,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_38_product_template +#: model:product.template,name:product.product_template_38 msgid "Ink Cartridge" msgstr "" @@ -1405,6 +1442,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_26_product_template +#: model:product.template,description:product.product_template_26 msgid "17\" Monitor\n" "6GB RAM\n" "Hi-Speed 234Q Processor\n" @@ -1423,12 +1461,15 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_21_product_template +#: model:product.template,name:product.product_template_21 msgid "Motherboard A20Z7" msgstr "" #. module: product #: model:product.template,description:product.product_product_1_product_template +#: model:product.template,description:product.product_template_1 #: model:product.template,description_sale:product.product_product_1_product_template +#: model:product.template,description_sale:product.product_template_1 msgid "This type of service include basic monitoring of products." msgstr "" @@ -1439,6 +1480,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_19_product_template +#: model:product.template,name:product.product_template_19 msgid "HDD on Demand" msgstr "" @@ -1473,6 +1515,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_24_product_template +#: model:product.template,name:product.product_template_24 msgid "Graphics Card" msgstr "" @@ -1493,6 +1536,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_41_product_template +#: model:product.template,name:product.product_template_41 msgid "Windows Home Server 2011" msgstr "" @@ -1503,6 +1547,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_5_product_template +#: model:product.template,description:product.product_template_5 msgid "Custom computer assembled on order based on customer's requirement." msgstr "" @@ -1615,11 +1660,13 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_16_product_template +#: model:product.template,name:product.product_template_16 msgid "Computer Case" msgstr "" #. module: product #: model:product.template,name:product.product_product_9_product_template +#: model:product.template,name:product.product_template_9 msgid "USB Keyboard, AZERTY" msgstr "" @@ -1660,6 +1707,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_47_product_template +#: model:product.template,name:product.product_template_47 msgid "Switch, 24 ports" msgstr "" @@ -1681,6 +1729,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_48_product_template +#: model:product.template,name:product.product_template_48 msgid "USB Adapter" msgstr "" @@ -1717,6 +1766,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_26_product_template +#: model:product.template,name:product.product_template_26 msgid "Laptop S3450" msgstr "" @@ -1737,6 +1787,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_9_product_template +#: model:product.template,description:product.product_template_9 msgid "This product is configured with example of push/pull flows" msgstr "" @@ -1831,11 +1882,13 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_13_product_template +#: model:product.template,name:product.product_template_13 msgid "RAM SR5" msgstr "" #. module: product #: model:product.template,name:product.product_product_14_product_template +#: model:product.template,name:product.product_template_14 msgid "RAM SR2" msgstr "" @@ -1857,6 +1910,7 @@ msgstr "" #. module: product #: model:product.template,description_sale:product.product_product_44_product_template +#: model:product.template,description_sale:product.product_template_44 msgid "Full featured image editing software." msgstr "" @@ -1874,6 +1928,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_31_product_template +#: model:product.template,name:product.product_template_31 msgid "Multimedia Speakers" msgstr "" @@ -1996,6 +2051,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_2_product_template +#: model:product.template,description:product.product_template_2 msgid "This type of service include assistance for security questions, system configuration requirements, implementation or special needs." msgstr "" @@ -2011,6 +2067,7 @@ msgstr "" #. module: product #: model:product.template,description_sale:product.product_product_4_product_template +#: model:product.template,description_sale:product.product_template_4 msgid "19\" LCD Monitor\n" "Processor Core i5 2.70 Ghz\n" "2GB RAM\n" @@ -2034,6 +2091,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_45_product_template +#: model:product.template,name:product.product_template_45 msgid "Router R430" msgstr "" @@ -2049,7 +2107,7 @@ msgid "Normal" msgstr "" #. module: product -#: code:addons/product/pricelist.py:179 +#: code:addons/product/pricelist.py:198 #, python-format msgid "At least one pricelist has no active version !\n" "Please create or activate one." @@ -2124,6 +2182,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_25_product_template +#: model:product.template,description:product.product_template_25 msgid "17\" Monitor\n" "4GB RAM\n" "Standard-1294P Processor\n" @@ -2166,6 +2225,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_11_product_template +#: model:product.template,name:product.product_template_11 msgid "Mouse, Laser" msgstr "" @@ -2216,6 +2276,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_40_product_template +#: model:product.template,name:product.product_template_40 msgid "Windows 7 Professional" msgstr "" @@ -2241,11 +2302,12 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_6_product_template +#: model:product.template,name:product.product_template_6 msgid "15” LCD Monitor" msgstr "" #. module: product -#: code:addons/product/pricelist.py:379 +#: code:addons/product/pricelist.py:400 #: field:product.pricelist.item,base_pricelist_id:0 #, python-format msgid "Other Pricelist" @@ -2289,6 +2351,7 @@ msgstr "" #. module: product #: model:product.template,description:product.product_product_19_product_template +#: model:product.template,description:product.product_template_19 msgid "On demand hard-disk having capacity based on requirement." msgstr "" @@ -2299,6 +2362,7 @@ msgstr "" #. module: product #: model:product.template,name:product.product_product_15_product_template +#: model:product.template,name:product.product_template_15 msgid "RAM SR3" msgstr "" diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot index b9eeea74ce9a2..47e94cde84e07 100644 --- a/addons/product_visible_discount/i18n/product_visible_discount.pot +++ b/addons/product_visible_discount/i18n/product_visible_discount.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,37 +15,14 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: product_visible_discount -#: code:addons/product_visible_discount/product_visible_discount.py:149 -#, python-format -msgid "No Sale Pricelist Found!" -msgstr "" - -#. module: product_visible_discount -#: field:product.pricelist,visible_discount:0 -msgid "Visible Discount" -msgstr "" - -#. module: product_visible_discount -#: code:addons/product_visible_discount/product_visible_discount.py:141 -#, python-format -msgid "No Purchase Pricelist Found!" -msgstr "" - -#. module: product_visible_discount -#: model:ir.model,name:product_visible_discount.model_account_invoice_line -msgid "Invoice Line" -msgstr "" - #. module: product_visible_discount #: model:ir.model,name:product_visible_discount.model_product_pricelist msgid "Pricelist" msgstr "" #. module: product_visible_discount -#: code:addons/product_visible_discount/product_visible_discount.py:141 -#, python-format -msgid "You must first define a pricelist on the supplier form!" +#: field:product.pricelist,visible_discount:0 +msgid "Visible Discount" msgstr "" #. module: product_visible_discount @@ -53,9 +30,3 @@ msgstr "" msgid "Sales Order Line" msgstr "" -#. module: product_visible_discount -#: code:addons/product_visible_discount/product_visible_discount.py:149 -#, python-format -msgid "You must first define a pricelist on the customer form!" -msgstr "" - diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index c549e960777cf..bbab089262a6f 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -78,12 +78,6 @@ msgstr "" msgid "Start Task" msgstr "" -#. module: project -#: code:addons/project/project.py:944 -#, python-format -msgid "Warning !" -msgstr "" - #. module: project #: help:project.project,message_unread:0 #: help:project.task,message_unread:0 @@ -127,8 +121,9 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire msgstr "" #. module: project -#: code:addons/project/project.py:444 -#: code:addons/project/project.py:1332 +#: code:addons/project/project.py:458 +#: code:addons/project/project.py:969 +#: code:addons/project/project.py:1348 #, python-format msgid "Warning!" msgstr "" @@ -384,7 +379,7 @@ msgid "Assigned to" msgstr "" #. module: project -#: code:addons/project/project.py:1033 +#: code:addons/project/project.py:1058 #, python-format msgid "Delegated User should be specified" msgstr "" @@ -1117,7 +1112,7 @@ msgid "Done by" msgstr "" #. module: project -#: code:addons/project/project.py:181 +#: code:addons/project/project.py:188 #, python-format msgid "Invalid Action!" msgstr "" @@ -1183,9 +1178,9 @@ msgid "Computed as: Time Spent + Remaining Time." msgstr "" #. module: project -#: code:addons/project/project.py:368 -#: code:addons/project/project.py:389 -#: code:addons/project/project.py:721 +#: code:addons/project/project.py:382 +#: code:addons/project/project.py:403 +#: code:addons/project/project.py:733 #, python-format msgid "%s (copy)" msgstr "" @@ -1232,6 +1227,12 @@ msgstr "" msgid "Team" msgstr "" +#. module: project +#: code:addons/project/project.py:458 +#, python-format +msgid "You must assign members on the project '%s'!" +msgstr "" + #. module: project #: help:project.config.settings,time_unit:0 msgid "This will set the unit of measure used in projects and tasks." @@ -1382,7 +1383,7 @@ msgid "Estimated time to do the task, usually set by the project manager when th msgstr "" #. module: project -#: code:addons/project/project.py:230 +#: code:addons/project/project.py:237 #, python-format msgid "Attachments" msgstr "" @@ -1393,7 +1394,7 @@ msgid "Issue Version" msgstr "" #. module: project -#: code:addons/project/project.py:182 +#: code:addons/project/project.py:189 #, python-format msgid "You cannot delete a project containing tasks. You can either delete all the project's tasks and then delete the project or simply deactivate the project." msgstr "" @@ -1493,7 +1494,7 @@ msgid "Overpassed Tasks" msgstr "" #. module: project -#: code:addons/project/project.py:944 +#: code:addons/project/project.py:969 #, python-format msgid "Child task still open.\n" "Please cancel or complete child task first." @@ -1548,12 +1549,6 @@ msgstr "" msgid "CHECK: " msgstr "" -#. module: project -#: code:addons/project/project.py:444 -#, python-format -msgid "You must assign members on the project '%s' !" -msgstr "" - #. module: project #: view:project.project:0 msgid "Pending Projects" @@ -1605,6 +1600,11 @@ msgstr "" msgid "Define the Requirements and Set Planned Hours." msgstr "" +#. module: project +#: field:project.task,write_date:0 +msgid "Last Modification Date" +msgstr "" + #. module: project #: field:project.project,message_ids:0 #: field:project.task,message_ids:0 @@ -1768,7 +1768,7 @@ msgid "Starting Date" msgstr "" #. module: project -#: code:addons/project/project.py:410 +#: code:addons/project/project.py:424 #: model:ir.actions.act_window,name:project.open_view_project_all #: model:ir.ui.menu,name:project.menu_projects #: view:project.project:0 @@ -1923,7 +1923,7 @@ msgid "Reevaluation Task" msgstr "" #. module: project -#: code:addons/project/project.py:1332 +#: code:addons/project/project.py:1348 #, python-format msgid "Please delete the project linked with this account first." msgstr "" diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot index 6ee4452bbbb03..d105e0a9cd0f9 100644 --- a/addons/project_gtd/i18n/project_gtd.pot +++ b/addons/project_gtd/i18n/project_gtd.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -50,15 +50,20 @@ msgstr "" msgid "Timebox Empty Process Completed Successfully." msgstr "" +#. module: project_gtd +#: code:addons/project_gtd/wizard/project_gtd_empty.py:52 +#, python-format +msgid "No timebox child of this one!" +msgstr "" + #. module: project_gtd #: view:project.task:0 msgid "Pending Tasks" msgstr "" #. module: project_gtd -#: code:addons/project_gtd/wizard/project_gtd_empty.py:52 -#, python-format -msgid "No timebox child of this one !" +#: field:project.timebox.fill.plan,task_ids:0 +msgid "Tasks selection" msgstr "" #. module: project_gtd @@ -209,11 +214,6 @@ msgstr "" msgid "Context" msgstr "" -#. module: project_gtd -#: field:project.timebox.fill.plan,task_ids:0 -msgid "Tasks selection" -msgstr "" - #. module: project_gtd #: view:project.task:0 msgid "Display" diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot index d1705ef6f117b..3dc0c98615f6b 100644 --- a/addons/project_issue/i18n/project_issue.pot +++ b/addons/project_issue/i18n/project_issue.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -108,7 +108,7 @@ msgid "Days to Open" msgstr "" #. module: project_issue -#: code:addons/project_issue/project_issue.py:479 +#: code:addons/project_issue/project_issue.py:493 #, python-format msgid "You cannot escalate this issue.\n" "The relevant Project has not configured the Escalation Project!" @@ -236,7 +236,7 @@ msgid "Extra Info" msgstr "" #. module: project_issue -#: code:addons/project_issue/project_issue.py:479 +#: code:addons/project_issue/project_issue.py:493 #, python-format msgid "Warning!" msgstr "" @@ -268,7 +268,7 @@ msgid "Kanban State" msgstr "" #. module: project_issue -#: code:addons/project_issue/project_issue.py:366 +#: code:addons/project_issue/project_issue.py:378 #, python-format msgid "Project issue converted to task." msgstr "" @@ -324,7 +324,7 @@ msgid "Lowest" msgstr "" #. module: project_issue -#: code:addons/project_issue/project_issue.py:388 +#: code:addons/project_issue/project_issue.py:400 #, python-format msgid "%s (copy)" msgstr "" @@ -395,7 +395,7 @@ msgid "Issues Analysis" msgstr "" #. module: project_issue -#: code:addons/project_issue/project_issue.py:516 +#: code:addons/project_issue/project_issue.py:532 #, python-format msgid "No Subject" msgstr "" @@ -419,7 +419,7 @@ msgid "Delete" msgstr "" #. module: project_issue -#: code:addons/project_issue/project_issue.py:371 +#: code:addons/project_issue/project_issue.py:383 #, python-format msgid "Tasks" msgstr "" @@ -605,7 +605,7 @@ msgid "November" msgstr "" #. module: project_issue -#: code:addons/project_issue/project_issue.py:499 +#: code:addons/project_issue/project_issue.py:513 #, python-format msgid "Customer Email" msgstr "" @@ -816,7 +816,7 @@ msgid "Issue Created" msgstr "" #. module: project_issue -#: code:addons/project_issue/project_issue.py:497 +#: code:addons/project_issue/project_issue.py:511 #, python-format msgid "Customer" msgstr "" diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot index 86a25b4465cac..3264e4ae6602b 100644 --- a/addons/project_mrp/i18n/project_mrp.pot +++ b/addons/project_mrp/i18n/project_mrp.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -98,6 +98,7 @@ msgstr "" #. module: project_mrp #: model:ir.model,name:project_mrp.model_procurement_order +#: model:process.node,name:project_mrp.process_node_saleprocurement0 #: field:project.task,procurement_id:0 msgid "Procurement" msgstr "" diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot index 9c1732d45100a..8a55db399e304 100644 --- a/addons/project_timesheet/i18n/project_timesheet.pot +++ b/addons/project_timesheet/i18n/project_timesheet.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,11 +20,22 @@ msgstr "" msgid "Tasks by User" msgstr "" +#. module: project_timesheet +#: model:process.node,name:project_timesheet.process_node_timesheettask0 +msgid "Timesheet task" +msgstr "" + #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by year of date" msgstr "" +#. module: project_timesheet +#: code:addons/project_timesheet/project_timesheet.py:295 +#, python-format +msgid "You cannot select a Analytic Account which is in Close or Cancelled state." +msgstr "" + #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "June" @@ -36,7 +47,7 @@ msgid "Related Timeline Id" msgstr "" #. module: project_timesheet -#: code:addons/project_timesheet/project_timesheet.py:266 +#: code:addons/project_timesheet/project_timesheet.py:267 #, python-format msgid "You cannot delete a partner which is assigned to project, but you can uncheck the active box." msgstr "" @@ -47,9 +58,9 @@ msgid "Project Task Work" msgstr "" #. module: project_timesheet -#: code:addons/project_timesheet/project_timesheet.py:294 +#: code:addons/project_timesheet/project_timesheet.py:295 #, python-format -msgid "You cannot select a Analytic Account which is in Close or Cancelled state." +msgid "Invalid Analytic Account!" msgstr "" #. module: project_timesheet @@ -211,8 +222,8 @@ msgid "

\n" msgstr "" #. module: project_timesheet -#: model:process.node,name:project_timesheet.process_node_timesheettask0 -msgid "Timesheet task" +#: field:report.timesheet.task.user,timesheet_hrs:0 +msgid "Timesheet Hours" msgstr "" #. module: project_timesheet @@ -236,13 +247,8 @@ msgid "Trigger Invoice" msgstr "" #. module: project_timesheet -#: selection:report.timesheet.task.user,month:0 -msgid "November" -msgstr "" - -#. module: project_timesheet -#: selection:report.timesheet.task.user,month:0 -msgid "March" +#: view:report.timesheet.task.user:0 +msgid "Timesheet/Task hours Report Per Month" msgstr "" #. module: project_timesheet @@ -277,23 +283,13 @@ msgid "Partner" msgstr "" #. module: project_timesheet -#: code:addons/project_timesheet/project_timesheet.py:294 -#, python-format -msgid "Invalid Analytic Account !" -msgstr "" - -#. module: project_timesheet -#: view:report.timesheet.task.user:0 -msgid "Timesheet/Task hours Report Per Month" +#: selection:report.timesheet.task.user,month:0 +msgid "March" msgstr "" #. module: project_timesheet -#: code:addons/project_timesheet/project_timesheet.py:84 -#: code:addons/project_timesheet/project_timesheet.py:88 -#: code:addons/project_timesheet/project_timesheet.py:92 -#: code:addons/project_timesheet/project_timesheet.py:99 -#, python-format -msgid "Bad Configuration !" +#: selection:report.timesheet.task.user,month:0 +msgid "November" msgstr "" #. module: project_timesheet @@ -353,7 +349,7 @@ msgid "After task is completed, Create its invoice." msgstr "" #. module: project_timesheet -#: code:addons/project_timesheet/project_timesheet.py:266 +#: code:addons/project_timesheet/project_timesheet.py:267 #, python-format msgid "Invalid Action!" msgstr "" @@ -371,8 +367,12 @@ msgid "

Record your timesheets for the proj msgstr "" #. module: project_timesheet -#: field:report.timesheet.task.user,timesheet_hrs:0 -msgid "Timesheet Hours" +#: code:addons/project_timesheet/project_timesheet.py:84 +#: code:addons/project_timesheet/project_timesheet.py:88 +#: code:addons/project_timesheet/project_timesheet.py:92 +#: code:addons/project_timesheet/project_timesheet.py:99 +#, python-format +msgid "Bad Configuration!" msgstr "" #. module: project_timesheet diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 6c8bb2eb87770..3a1fb73a3c913 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -96,13 +96,13 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:1050 +#: code:addons/purchase/purchase.py:1087 #, python-format msgid "Configuration Error!" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:589 +#: code:addons/purchase/purchase.py:598 #, python-format msgid "You must first cancel all receptions related to this purchase order." msgstr "" @@ -119,7 +119,7 @@ msgid "Purchase-Standard Price" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:1037 +#: code:addons/purchase/purchase.py:1074 #, python-format msgid "No supplier defined for this product !" msgstr "" @@ -202,7 +202,7 @@ msgid "This is computed as the minimum scheduled date of all purchase order line msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:262 +#: code:addons/purchase/purchase.py:259 #, python-format msgid "In order to delete a purchase order, you must cancel it first." msgstr "" @@ -217,11 +217,6 @@ msgstr "" msgid "Approved purchase orders" msgstr "" -#. module: purchase -#: model:email.template,subject:purchase.email_template_edi_purchase -msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" -msgstr "" - #. module: purchase #: view:purchase.order:0 msgid "Total Untaxed amount" @@ -294,7 +289,7 @@ msgid "October" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:1050 +#: code:addons/purchase/purchase.py:1087 #, python-format msgid "The product \"%s\" has been defined with your company as reseller which seems to be a configuration error!" msgstr "" @@ -339,6 +334,12 @@ msgstr "" msgid "Default invoicing control method" msgstr "" +#. module: purchase +#: code:addons/purchase/purchase.py:909 +#, python-format +msgid "Cannot delete a purchase order line which is in state '%s'." +msgstr "" + #. module: purchase #: model:ir.model,name:purchase.model_stock_picking_in #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4 @@ -511,7 +512,7 @@ msgid "Supplier" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:527 +#: code:addons/purchase/purchase.py:473 #, python-format msgid "Define expense account for this company: \"%s\" (id:%d)." msgstr "" @@ -582,12 +583,6 @@ msgstr "" msgid "# of Lines" msgstr "" -#. module: purchase -#: code:addons/purchase/wizard/purchase_line_invoice.py:106 -#, python-format -msgid "Define expense account for this product: \"%s\" (id:%d)." -msgstr "" - #. module: purchase #: view:purchase.order:0 msgid "(update)" @@ -604,8 +599,8 @@ msgid "It indicates that a picking has been done" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:581 -#: code:addons/purchase/purchase.py:588 +#: code:addons/purchase/purchase.py:590 +#: code:addons/purchase/purchase.py:597 #, python-format msgid "Unable to cancel this purchase order." msgstr "" @@ -664,9 +659,9 @@ msgid "Draft PO" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:967 -#: code:addons/purchase/purchase.py:982 -#: code:addons/purchase/purchase.py:986 +#: code:addons/purchase/purchase.py:1001 +#: code:addons/purchase/purchase.py:1016 +#: code:addons/purchase/purchase.py:1020 #: code:addons/purchase/wizard/purchase_order_group.py:47 #, python-format msgid "Warning!" @@ -745,7 +740,7 @@ msgid "Stock Moves" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:1182 +#: code:addons/purchase/purchase.py:1240 #, python-format msgid "Draft Purchase Order created" msgstr "" @@ -755,11 +750,6 @@ msgstr "" msgid "Product Categories" msgstr "" -#. module: purchase -#: help:purchase.order,invoiced:0 -msgid "It indicates that an invoice has been paid" -msgstr "" - #. module: purchase #: field:purchase.order,notes:0 msgid "Terms and Conditions" @@ -928,7 +918,7 @@ msgid "Outgoing Mails" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:458 +#: code:addons/purchase/purchase.py:455 #, python-format msgid "You cannot confirm a purchase order without any purchase order line." msgstr "" @@ -945,7 +935,7 @@ msgid "Destination Warehouse" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:967 +#: code:addons/purchase/purchase.py:1001 #, python-format msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure." msgstr "" @@ -972,7 +962,7 @@ msgid "Purchase Dashboard" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:582 +#: code:addons/purchase/purchase.py:591 #, python-format msgid "First cancel all receptions related to this purchase order." msgstr "" @@ -1060,7 +1050,8 @@ msgid "Stock Move" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:262 +#: code:addons/purchase/purchase.py:259 +#: code:addons/purchase/purchase.py:909 #, python-format msgid "Invalid Action!" msgstr "" @@ -1153,7 +1144,7 @@ msgid "a draft\n" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:322 +#: code:addons/purchase/purchase.py:319 #, python-format msgid "Please create Invoices." msgstr "" @@ -1214,6 +1205,14 @@ msgstr "" msgid "purchase.config.settings" msgstr "" +#. module: purchase +#: field:purchase.order,company_id:0 +#: field:purchase.order.line,company_id:0 +#: view:purchase.report:0 +#: field:purchase.report,company_id:0 +msgid "Company" +msgstr "" + #. module: purchase #: model:process.node,note:purchase.process_node_approvepurchaseorder0 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0 @@ -1249,7 +1248,7 @@ msgid "Purchase Order Line Make Invoice" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:1167 +#: code:addons/purchase/purchase.py:1225 #, python-format msgid "PO: %s" msgstr "" @@ -1260,7 +1259,7 @@ msgid "Outgoing products to invoice" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:517 +#: code:addons/purchase/purchase.py:536 #, python-format msgid "Define purchase journal for this company: \"%s\" (id:%d)." msgstr "" @@ -1337,6 +1336,7 @@ msgid "Done" msgstr "" #. module: purchase +#: model:ir.model,name:purchase.model_account_invoice #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0 msgid "Invoice" @@ -1422,8 +1422,8 @@ msgid "Compute product cost price based on average cost" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:352 -#: code:addons/purchase/wizard/purchase_line_invoice.py:137 +#: code:addons/purchase/purchase.py:349 +#: code:addons/purchase/wizard/purchase_line_invoice.py:115 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices #: view:res.partner:0 #, python-format @@ -1528,17 +1528,74 @@ msgid "Open Purchase Menu" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:1054 +#: code:addons/purchase/purchase.py:1078 #, python-format msgid "No address defined for the supplier" msgstr "" #. module: purchase -#: field:purchase.order,company_id:0 -#: field:purchase.order.line,company_id:0 -#: view:purchase.report:0 -#: field:purchase.report,company_id:0 -msgid "Company" +#: model:email.template,body_html:purchase.email_template_edi_purchase +msgid "\n" +"

\n" +"\n" +"

Hello ${object.partner_id.name},

\n" +" \n" +"

Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}:

\n" +" \n" +"

\n" +"   REFERENCES
\n" +"   Order number: ${object.name}
\n" +"   Order total: ${object.amount_total} ${object.currency_id.name}
\n" +"   Order date: ${object.date_order}
\n" +" % if object.origin:\n" +"   Order reference: ${object.origin}
\n" +" % endif\n" +" % if object.partner_ref:\n" +"   Your reference: ${object.partner_ref}
\n" +" % endif\n" +" % if object.validator:\n" +"   Your contact: ${object.validator.name}\n" +" % endif\n" +"

\n" +"\n" +"
\n" +"

If you have any question, do not hesitate to contact us.

\n" +"

Thank you!

\n" +"
\n" +"
\n" +"
\n" +"

\n" +" ${object.company_id.name}

\n" +"
\n" +"
\n" +" \n" +" % if object.company_id.street:\n" +" ${object.company_id.street}
\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} ${object.company_id.city}
\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" +" \n" +" % if object.company_id.phone:\n" +"
\n" +" Phone:  ${object.company_id.phone}\n" +"
\n" +" % endif\n" +" % if object.company_id.website:\n" +"
\n" +" Web : ${object.company_id.website}\n" +"
\n" +" %endif\n" +"

\n" +"
\n" +"
\n" +" " msgstr "" #. module: purchase @@ -1599,11 +1656,10 @@ msgid "Purchase Order" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:322 -#: code:addons/purchase/purchase.py:458 -#: code:addons/purchase/purchase.py:516 -#: code:addons/purchase/purchase.py:527 -#: code:addons/purchase/wizard/purchase_line_invoice.py:105 +#: code:addons/purchase/purchase.py:319 +#: code:addons/purchase/purchase.py:455 +#: code:addons/purchase/purchase.py:473 +#: code:addons/purchase/purchase.py:535 #, python-format msgid "Error!" msgstr "" @@ -1651,9 +1707,10 @@ msgid "Net Price" msgstr "" #. module: purchase -#: model:process.node,name:purchase.process_node_confirmpurchaseorder0 -#: selection:purchase.order.line,state:0 -msgid "Confirmed" +#: model:ir.model,name:purchase.model_purchase_order_line +#: view:purchase.order.line:0 +#: field:stock.move,purchase_line_id:0 +msgid "Purchase Order Line" msgstr "" #. module: purchase @@ -1705,7 +1762,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:982 +#: code:addons/purchase/purchase.py:1016 #, python-format msgid "The selected supplier only sells this product by %s" msgstr "" @@ -1720,6 +1777,11 @@ msgstr "" msgid "Reservation Destination" msgstr "" +#. module: purchase +#: model:email.template,subject:purchase.email_template_edi_purchase +msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })" +msgstr "" + #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase msgid "Configuration" @@ -1738,7 +1800,6 @@ msgid "EDI Pricelist (%s)" msgstr "" #. module: purchase -#: view:purchase.report:0 #: field:purchase.report,product_uom:0 msgid "Reference Unit of Measure" msgstr "" @@ -1808,10 +1869,9 @@ msgid "Invoiced" msgstr "" #. module: purchase -#: model:ir.model,name:purchase.model_purchase_order_line -#: view:purchase.order.line:0 -#: field:stock.move,purchase_line_id:0 -msgid "Purchase Order Line" +#: model:process.node,name:purchase.process_node_confirmpurchaseorder0 +#: selection:purchase.order.line,state:0 +msgid "Confirmed" msgstr "" #. module: purchase @@ -1892,7 +1952,7 @@ msgid "Based on incoming shipments" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:1044 +#: code:addons/purchase/purchase.py:1076 #, python-format msgid "No default supplier defined for this product" msgstr "" @@ -1904,7 +1964,7 @@ msgid "Warehouse" msgstr "" #. module: purchase -#: code:addons/purchase/purchase.py:986 +#: code:addons/purchase/purchase.py:1020 #, python-format msgid "The selected supplier has a minimal quantity set to %s %s, you should not purchase less." msgstr "" @@ -1921,71 +1981,6 @@ msgstr "" msgid "Expected Delivery address:" msgstr "" -#. module: purchase -#: model:email.template,body_html:purchase.email_template_edi_purchase -msgid "\n" -"
\n" -"\n" -"

Hello ${object.partner_id.name},

\n" -" \n" -"

Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}:

\n" -" \n" -"

\n" -"   REFERENCES
\n" -"   Order number: ${object.name}
\n" -"   Order total: ${object.amount_total} ${object.pricelist_id.currency_id.name}
\n" -"   Order date: ${object.date_order}
\n" -" % if object.origin:\n" -"   Order reference: ${object.origin}
\n" -" % endif\n" -" % if object.partner_ref:\n" -"   Your reference: ${object.partner_ref}
\n" -" % endif\n" -" % if object.validator:\n" -"   Your contact: ${object.validator.name}\n" -" % endif\n" -"

\n" -"\n" -"
\n" -"

If you have any question, do not hesitate to contact us.

\n" -"

Thank you!

\n" -"
\n" -"
\n" -"
\n" -"

\n" -" ${object.company_id.name}

\n" -"
\n" -"
\n" -" \n" -" % if object.company_id.street:\n" -" ${object.company_id.street}
\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} ${object.company_id.city}
\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" -" \n" -" % if object.company_id.phone:\n" -"
\n" -" Phone:  ${object.company_id.phone}\n" -"
\n" -" % endif\n" -" % if object.company_id.website:\n" -"
\n" -" Web : ${object.company_id.website}\n" -"
\n" -" %endif\n" -"

\n" -"
\n" -"
\n" -" " -msgstr "" - #. module: purchase #: selection:purchase.report,month:0 msgid "February" @@ -2053,6 +2048,11 @@ msgstr "" msgid "Payment Term" msgstr "" +#. module: purchase +#: help:purchase.order,invoiced:0 +msgid "It indicates that an invoice has been validated" +msgstr "" + #. module: purchase #: view:purchase.order:0 msgid "Purchase orders which are in draft state" diff --git a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot index e09279a17e4a9..7797f1ebfe1ce 100644 --- a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot +++ b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -30,3 +30,8 @@ msgstr "" msgid "Purchase Order" msgstr "" +#. module: purchase_analytic_plans +#: model:ir.model,name:purchase_analytic_plans.model_stock_picking +msgid "Picking List" +msgstr "" + diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index 9b47e3d8a9acf..7d1745512e118 100644 --- a/addons/purchase_requisition/i18n/purchase_requisition.pot +++ b/addons/purchase_requisition/i18n/purchase_requisition.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:11+0000\n" +"PO-Revision-Date: 2014-08-14 00:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -242,7 +242,7 @@ msgid "Quotation Detail" msgstr "" #. module: purchase_requisition -#: code:addons/purchase_requisition/purchase_requisition.py:134 +#: code:addons/purchase_requisition/purchase_requisition.py:138 #, python-format msgid "You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation." msgstr "" @@ -420,7 +420,7 @@ msgid "Product UoM" msgstr "" #. module: purchase_requisition -#: code:addons/purchase_requisition/purchase_requisition.py:134 +#: code:addons/purchase_requisition/purchase_requisition.py:138 #, python-format msgid "Warning!" msgstr "" diff --git a/addons/report_webkit/i18n/report_webkit.pot b/addons/report_webkit/i18n/report_webkit.pot index f4d1e8b3082ee..681b279bf64a8 100644 --- a/addons/report_webkit/i18n/report_webkit.pot +++ b/addons/report_webkit/i18n/report_webkit.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:11+0000\n" +"PO-Revision-Date: 2014-08-14 00:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgid "Ledger 28 431.8 x 279.4 mm" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:235 +#: code:addons/report_webkit/webkit_report.py:231 #, python-format msgid "No header defined for this Webkit report!" msgstr "" @@ -58,7 +58,7 @@ msgid "Company" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:236 +#: code:addons/report_webkit/webkit_report.py:232 #, python-format msgid "Please set a header in company settings." msgstr "" @@ -105,7 +105,7 @@ msgid "A4 0 210 x 297 mm, 8.26 x 11.69 inches" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:176 +#: code:addons/report_webkit/webkit_report.py:167 #, python-format msgid "Webkit error" msgstr "" @@ -116,11 +116,11 @@ msgid "B2 17 500 x 707 mm" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:262 -#: code:addons/report_webkit/webkit_report.py:273 -#: code:addons/report_webkit/webkit_report.py:282 -#: code:addons/report_webkit/webkit_report.py:295 -#: code:addons/report_webkit/webkit_report.py:306 +#: code:addons/report_webkit/webkit_report.py:259 +#: code:addons/report_webkit/webkit_report.py:270 +#: code:addons/report_webkit/webkit_report.py:279 +#: code:addons/report_webkit/webkit_report.py:292 +#: code:addons/report_webkit/webkit_report.py:303 #, python-format msgid "Webkit render!" msgstr "" @@ -136,7 +136,7 @@ msgid "Precise Mode" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:96 +#: code:addons/report_webkit/webkit_report.py:97 #, python-format msgid "Please install executable on your system (sudo apt-get install wkhtmltopdf) or download it from here: http://code.google.com/p/wkhtmltopdf/downloads/list and set the path in the ir.config_parameter with the webkit_path key.Minimal version is 0.9.9" msgstr "" @@ -188,7 +188,7 @@ msgid "The header linked to the report" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:95 +#: code:addons/report_webkit/webkit_report.py:96 #, python-format msgid "Wkhtmltopdf library path is not set" msgstr "" @@ -305,7 +305,7 @@ msgid "B8 22 62 x 88 mm" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:177 +#: code:addons/report_webkit/webkit_report.py:168 #, python-format msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s" msgstr "" @@ -351,7 +351,7 @@ msgid "Right Margin (mm)" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:230 +#: code:addons/report_webkit/webkit_report.py:226 #, python-format msgid "Webkit report template not found!" msgstr "" @@ -403,7 +403,7 @@ msgid "Webkit Logos" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:172 +#: code:addons/report_webkit/webkit_report.py:163 #, python-format msgid "No diagnosis message was provided" msgstr "" @@ -471,7 +471,7 @@ msgid "Left Margin (mm)" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:230 +#: code:addons/report_webkit/webkit_report.py:226 #, python-format msgid "Error!" msgstr "" @@ -492,7 +492,7 @@ msgid "ir.actions.report.xml" msgstr "" #. module: report_webkit -#: code:addons/report_webkit/webkit_report.py:174 +#: code:addons/report_webkit/webkit_report.py:165 #, python-format msgid "The following diagnosis message was provided:\n" "" diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index bde1432d8cfcd..24368225ad9eb 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-07 19:36+0000\n" +"POT-Creation-Date: 2014-08-14 00:10+0000\n" +"PO-Revision-Date: 2014-08-14 00:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -54,13 +54,13 @@ msgid "Cancel Order" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:101 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:102 #, python-format msgid "Incorrect Data" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:102 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:103 #, python-format msgid "The value of Advance Amount must be positive." msgstr "" @@ -75,6 +75,11 @@ msgstr "" msgid "If checked new messages require your attention." msgstr "" +#. module: sale +#: report:sale.order:0 +msgid "VAT" +msgstr "" + #. module: sale #: view:res.partner:0 msgid "False" @@ -110,12 +115,6 @@ msgstr "" msgid "# of Qty" msgstr "" -#. module: sale -#: code:addons/sale/sale.py:444 -#, python-format -msgid "Customer Invoices" -msgstr "" - #. module: sale #: model:ir.model,name:sale.model_res_partner #: view:sale.report:0 @@ -155,7 +154,7 @@ msgid "Disc.(%)" msgstr "" #. module: sale -#: code:addons/sale/sale.py:764 +#: code:addons/sale/sale.py:770 #, python-format msgid "Please define income account for this product: \"%s\" (id:%d)." msgstr "" @@ -200,9 +199,9 @@ msgid "Other Information" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_line_invoice.py:107 -#: code:addons/sale/wizard/sale_make_invoice.py:42 -#: code:addons/sale/wizard/sale_make_invoice.py:55 +#: code:addons/sale/wizard/sale_line_invoice.py:106 +#: code:addons/sale/wizard/sale_make_invoice.py:43 +#: code:addons/sale/wizard/sale_make_invoice.py:57 #, python-format msgid "Warning!" msgstr "" @@ -234,7 +233,7 @@ msgid "Sales Make Invoice" msgstr "" #. module: sale -#: code:addons/sale/sale.py:307 +#: code:addons/sale/sale.py:309 #, python-format msgid "Pricelist Warning!" msgstr "" @@ -266,7 +265,7 @@ msgid "Shop Name" msgstr "" #. module: sale -#: code:addons/sale/sale.py:598 +#: code:addons/sale/sale.py:604 #, python-format msgid "You cannot confirm a sales order which has no line." msgstr "" @@ -288,7 +287,7 @@ msgid "Quotation " msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:106 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:107 #, python-format msgid "Advance of %s %%" msgstr "" @@ -366,8 +365,8 @@ msgid "View Invoice" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:113 -#: code:addons/sale/wizard/sale_make_invoice_advance.py:115 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:114 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:116 #, python-format msgid "Advance of %s %s" msgstr "" @@ -436,7 +435,7 @@ msgid "Sales Order Lines ready to be invoiced" msgstr "" #. module: sale -#: code:addons/sale/sale.py:308 +#: code:addons/sale/sale.py:310 #, python-format msgid "If you change the pricelist of this order (and eventually the currency), prices of existing order lines will not be updated." msgstr "" @@ -446,6 +445,11 @@ msgstr "" msgid "Tel. :" msgstr "" +#. module: sale +#: model:email.template,subject:sale.email_template_edi_sale +msgid "${object.company_id.name|safe} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" +msgstr "" + #. module: sale #: help:sale.order,partner_invoice_id:0 msgid "Invoice address for current sales order." @@ -462,7 +466,7 @@ msgid "Before Delivery" msgstr "" #. module: sale -#: code:addons/sale/sale.py:781 +#: code:addons/sale/sale.py:787 #, python-format msgid "There is no Fiscal Position defined or Income category account defined for default properties of Product categories." msgstr "" @@ -478,7 +482,7 @@ msgid "Ordered month of the sales order" msgstr "" #. module: sale -#: code:addons/sale/sale.py:505 +#: code:addons/sale/sale.py:507 #, python-format msgid "You cannot group sales having different currencies for the same partner." msgstr "" @@ -503,7 +507,7 @@ msgid "Invoiced" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:202 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:203 #, python-format msgid "Advance Invoice" msgstr "" @@ -664,15 +668,15 @@ msgid "* The 'Draft' status is set when the related sales order in draft status. msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:92 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:93 #, python-format msgid "There is no income account defined as global property." msgstr "" #. module: sale -#: code:addons/sale/sale.py:960 -#: code:addons/sale/wizard/sale_make_invoice_advance.py:91 -#: code:addons/sale/wizard/sale_make_invoice_advance.py:95 +#: code:addons/sale/sale.py:966 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:92 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:96 #, python-format msgid "Configuration Error!" msgstr "" @@ -688,7 +692,7 @@ msgid "Send by Email" msgstr "" #. module: sale -#: code:addons/sale/res_config.py:97 +#: code:addons/sale/res_config.py:98 #, python-format msgid "Hour" msgstr "" @@ -719,7 +723,7 @@ msgid "Currency" msgstr "" #. module: sale -#: code:addons/sale/sale.py:942 +#: code:addons/sale/sale.py:948 #, python-format msgid "You have to select a pricelist or a customer in the sales form !\n" "Please set one before choosing a product." @@ -732,7 +736,7 @@ msgid "Category of Product" msgstr "" #. module: sale -#: code:addons/sale/sale.py:564 +#: code:addons/sale/sale.py:570 #, python-format msgid "Cannot cancel this sales order!" msgstr "" @@ -747,6 +751,12 @@ msgstr "" msgid "Taxes :" msgstr "" +#. module: sale +#: code:addons/sale/sale.py:279 +#, python-format +msgid "In order to delete a confirmed sales order, you must cancel it before!" +msgstr "" + #. module: sale #: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order msgid "

\n" @@ -827,7 +837,7 @@ msgid "Allow to configure notification on products and trigger them when a user msgstr "" #. module: sale -#: code:addons/sale/sale.py:955 +#: code:addons/sale/sale.py:961 #, python-format msgid "No valid pricelist line found ! :" msgstr "" @@ -871,7 +881,7 @@ msgid "Order Reference must be unique per Company!" msgstr "" #. module: sale -#: code:addons/sale/sale.py:952 +#: code:addons/sale/sale.py:958 #, python-format msgid "Cannot find a pricelist line matching this product and quantity.\n" "You have to change either the product, the quantity or the pricelist." @@ -898,11 +908,6 @@ msgid "Allows you to Make Quotation, Sale Order using different Order policy and " This installs the module sale_stock." msgstr "" -#. module: sale -#: model:email.template,subject:sale.email_template_edi_sale -msgid "${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" -msgstr "" - #. module: sale #: report:sale.order:0 msgid "Price" @@ -960,7 +965,7 @@ msgid "# of Sales Order" msgstr "" #. module: sale -#: code:addons/sale/sale.py:983 +#: code:addons/sale/sale.py:989 #, python-format msgid "Cannot delete a sales order line which is in state '%s'." msgstr "" @@ -971,7 +976,7 @@ msgid "Properties on lines" msgstr "" #. module: sale -#: code:addons/sale/sale.py:865 +#: code:addons/sale/sale.py:871 #, python-format msgid "Before choosing a product,\n" " select a customer in the sales form." @@ -983,7 +988,7 @@ msgid "Total Tax Included" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice.py:42 +#: code:addons/sale/wizard/sale_make_invoice.py:43 #, python-format msgid "You cannot create invoice when sales order is not confirmed." msgstr "" @@ -993,6 +998,12 @@ msgstr "" msgid "Ordered date of the sales order" msgstr "" +#. module: sale +#: code:addons/sale/sale.py:871 +#, python-format +msgid "No Customer Defined!" +msgstr "" + #. module: sale #: model:process.transition,name:sale.process_transition_confirmquotation0 msgid "Confirm Quotation" @@ -1085,9 +1096,9 @@ msgid "Create Invoices" msgstr "" #. module: sale -#: code:addons/sale/sale.py:277 -#: code:addons/sale/sale.py:820 -#: code:addons/sale/sale.py:983 +#: code:addons/sale/sale.py:279 +#: code:addons/sale/sale.py:826 +#: code:addons/sale/sale.py:989 #, python-format msgid "Invalid Action!" msgstr "" @@ -1242,15 +1253,15 @@ msgid "Use pricelists to adapt your price per customers" msgstr "" #. module: sale -#: code:addons/sale/sale.py:185 +#: code:addons/sale/sale.py:187 #, python-format msgid "There is no default shop for the current user's company!" msgstr "" #. module: sale -#: code:addons/sale/sale.py:277 +#: code:addons/sale/sale.py:446 #, python-format -msgid "In order to delete a confirmed sales order, you must cancel it before !" +msgid "Customer Invoices" msgstr "" #. module: sale @@ -1286,7 +1297,7 @@ msgid "Done" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_line_invoice.py:121 +#: code:addons/sale/wizard/sale_line_invoice.py:120 #: model:ir.model,name:sale.model_account_invoice #: model:process.node,name:sale.process_node_invoice0 #: view:sale.order:0 @@ -1527,7 +1538,7 @@ msgid "Date on which sales order is confirmed." msgstr "" #. module: sale -#: code:addons/sale/sale.py:565 +#: code:addons/sale/sale.py:571 #, python-format msgid "First cancel all invoices attached to this sales order." msgstr "" @@ -1557,12 +1568,6 @@ msgstr "" msgid "Invoice Exception" msgstr "" -#. module: sale -#: code:addons/sale/sale.py:865 -#, python-format -msgid "No Customer Defined !" -msgstr "" - #. module: sale #: field:sale.order,partner_shipping_id:0 msgid "Delivery Address" @@ -1594,12 +1599,12 @@ msgid "Project" msgstr "" #. module: sale -#: code:addons/sale/sale.py:185 -#: code:addons/sale/sale.py:363 -#: code:addons/sale/sale.py:504 -#: code:addons/sale/sale.py:598 -#: code:addons/sale/sale.py:763 -#: code:addons/sale/sale.py:780 +#: code:addons/sale/sale.py:187 +#: code:addons/sale/sale.py:365 +#: code:addons/sale/sale.py:506 +#: code:addons/sale/sale.py:604 +#: code:addons/sale/sale.py:769 +#: code:addons/sale/sale.py:786 #, python-format msgid "Error!" msgstr "" @@ -1651,7 +1656,7 @@ msgid "Date Confirm" msgstr "" #. module: sale -#: code:addons/sale/sale.py:364 +#: code:addons/sale/sale.py:366 #, python-format msgid "Please define sales journal for this company: \"%s\" (id:%d)." msgstr "" @@ -1662,8 +1667,8 @@ msgid "Contract Features" msgstr "" #. module: sale -#: code:addons/sale/sale.py:287 -#: code:addons/sale/sale.py:584 +#: code:addons/sale/sale.py:289 +#: code:addons/sale/sale.py:590 #: model:ir.model,name:sale.model_sale_order #: model:process.node,name:sale.process_node_order0 #: model:process.node,name:sale.process_node_saleorder0 @@ -1696,7 +1701,7 @@ msgid "Confirm" msgstr "" #. module: sale -#: code:addons/sale/sale.py:820 +#: code:addons/sale/sale.py:826 #, python-format msgid "You cannot cancel a sales order line that has already been invoiced." msgstr "" @@ -1755,7 +1760,7 @@ msgid "Sales order lines done" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_line_invoice.py:107 +#: code:addons/sale/wizard/sale_line_invoice.py:106 #, python-format msgid "Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n" "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n" @@ -1778,7 +1783,7 @@ msgid "December" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:96 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:97 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)." msgstr "" @@ -1814,7 +1819,7 @@ msgid "June" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice.py:55 +#: code:addons/sale/wizard/sale_make_invoice.py:57 #, python-format msgid "You shouldn't manually invoice the following sale order %s" msgstr "" @@ -1916,7 +1921,7 @@ msgid "from stock" msgstr "" #. module: sale -#: code:addons/sale/sale.py:944 +#: code:addons/sale/sale.py:950 #, python-format msgid "No Pricelist ! : " msgstr "" diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot index 22f40d691a5a4..8cbde7185ce5c 100644 --- a/addons/sale_crm/i18n/sale_crm.pot +++ b/addons/sale_crm/i18n/sale_crm.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:11+0000\n" +"PO-Revision-Date: 2014-08-14 00:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,12 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: sale_crm +#: code:addons/sale_crm/wizard/crm_make_sale.py:92 +#, python-format +msgid "No address(es) defined for this customer." +msgstr "" + #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:92 #, python-format @@ -116,12 +122,6 @@ msgstr "" msgid "Shop" msgstr "" -#. module: sale_crm -#: code:addons/sale_crm/wizard/crm_make_sale.py:92 -#, python-format -msgid "No addresse(s) defined for this customer." -msgstr "" - #. module: sale_crm #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed msgid "Sales Order Confirmed" diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot index 0fd8644fe8ade..725f86ff1e6da 100644 --- a/addons/sale_mrp/i18n/sale_mrp.pot +++ b/addons/sale_mrp/i18n/sale_mrp.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:11+0000\n" +"PO-Revision-Date: 2014-08-14 00:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,18 +16,23 @@ msgstr "" "Plural-Forms: \n" #. module: sale_mrp -#: model:ir.model,name:sale_mrp.model_mrp_production -msgid "Manufacturing Order" +#: model:ir.model,name:sale_mrp.model_sale_order +msgid "Sales Order" msgstr "" #. module: sale_mrp -#: help:mrp.production,sale_name:0 -msgid "Indicate the name of sales order." +#: help:mrp.production,sale_ref:0 +msgid "Indicate the Customer Reference from sales order." msgstr "" #. module: sale_mrp -#: help:mrp.production,sale_ref:0 -msgid "Indicate the Customer Reference from sales order." +#: field:mrp.production,sale_name:0 +msgid "Sale Name" +msgstr "" + +#. module: sale_mrp +#: model:ir.model,name:sale_mrp.model_mrp_production +msgid "Manufacturing Order" msgstr "" #. module: sale_mrp @@ -36,7 +41,7 @@ msgid "Sale Reference" msgstr "" #. module: sale_mrp -#: field:mrp.production,sale_name:0 -msgid "Sale Name" +#: help:mrp.production,sale_name:0 +msgid "Indicate the name of sales order." msgstr "" diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot index dc90a67503842..f68629e1fcefe 100644 --- a/addons/sale_stock/i18n/sale_stock.pot +++ b/addons/sale_stock/i18n/sale_stock.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-07 19:37+0000\n" +"POT-Creation-Date: 2014-08-14 00:11+0000\n" +"PO-Revision-Date: 2014-08-14 00:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgid "Deliveries to Invoice" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:570 +#: code:addons/sale_stock/sale_stock.py:579 #, python-format msgid "Picking Information ! : " msgstr "" @@ -43,7 +43,12 @@ msgid "Pick List" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:565 +#: field:sale.order.line,product_packaging:0 +msgid "Packaging" +msgstr "" + +#. module: sale_stock +#: code:addons/sale_stock/sale_stock.py:574 #, python-format msgid "You selected a quantity of %d Units.\n" "But it's not compatible with the selected packaging.\n" @@ -72,7 +77,7 @@ msgid "Cancel Order" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:209 +#: code:addons/sale_stock/sale_stock.py:210 #, python-format msgid "You must first cancel all delivery order(s) attached to this sales order." msgstr "" @@ -113,7 +118,7 @@ msgid "Stock Move" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:163 +#: code:addons/sale_stock/sale_stock.py:164 #, python-format msgid "Invalid Action!" msgstr "" @@ -129,8 +134,8 @@ msgid "Allow a different address for delivery and invoicing " msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:572 -#: code:addons/sale_stock/sale_stock.py:623 +#: code:addons/sale_stock/sale_stock.py:581 +#: code:addons/sale_stock/sale_stock.py:634 #, python-format msgid "Configuration Error!" msgstr "" @@ -222,6 +227,11 @@ msgstr "" msgid "Project MRP" msgstr "" +#. module: sale_stock +#: view:sale.order:0 +msgid "{\"shipping_except\":\"red\",\"invoice_except\":\"red\",\"waiting_date\":\"blue\"}" +msgstr "" + #. module: sale_stock #: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0 msgid "If the sale order was set to create the invoice 'On Delivery Order', then an invoice is automatically created based on what you delivered. If you rather want to create your invoice based on your sale order, you can set the sale order to create invoice 'On Demand', then track and process the sales order that have been fully delivered and invoice them from there." @@ -240,16 +250,11 @@ msgid "Shipped" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:265 +#: code:addons/sale_stock/sale_stock.py:266 #, python-format msgid "invalid mode for test_state" msgstr "" -#. module: sale_stock -#: model:process.transition,note:sale_stock.process_transition_saleprocurement0 -msgid "A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. " -msgstr "" - #. module: sale_stock #: help:sale.config.settings,group_mrp_properties:0 msgid "Allows you to tag sales order lines with properties." @@ -271,8 +276,8 @@ msgid "days" msgstr "" #. module: sale_stock -#: field:sale.order.line,product_packaging:0 -msgid "Packaging" +#: model:process.transition,note:sale_stock.process_transition_saleprocurement0 +msgid "A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. " msgstr "" #. module: sale_stock @@ -313,7 +318,7 @@ msgid "Pick 'Deliver each product when available' if you allow partial delivery. msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:208 +#: code:addons/sale_stock/sale_stock.py:209 #, python-format msgid "Cannot cancel sales order!" msgstr "" @@ -382,7 +387,7 @@ msgid "Assign" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:618 +#: code:addons/sale_stock/sale_stock.py:629 #, python-format msgid "Not enough stock ! : " msgstr "" @@ -414,7 +419,7 @@ msgid "Cancel" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:163 +#: code:addons/sale_stock/sale_stock.py:164 #, python-format msgid "In order to delete a confirmed sales order, you must cancel it.\n" "To do so, you must first cancel related picking for delivery orders." @@ -446,13 +451,13 @@ msgid "Sales Advance Payment Invoice" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:523 +#: code:addons/sale_stock/sale_stock.py:532 #, python-format msgid "You must first cancel stock moves attached to this sales order line." msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:561 +#: code:addons/sale_stock/sale_stock.py:570 #, python-format msgid "(n/a)" msgstr "" @@ -463,11 +468,17 @@ msgid "Incoterm" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:522 +#: code:addons/sale_stock/sale_stock.py:531 #, python-format msgid "Cannot cancel sales order line!" msgstr "" +#. module: sale_stock +#: code:addons/sale_stock/res_config.py:81 +#, python-format +msgid "Only administrators can change the settings" +msgstr "" + #. module: sale_stock #: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0 msgid "Cancel Assignation" @@ -514,7 +525,7 @@ msgid "Ignore Exception" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/sale_stock.py:614 +#: code:addons/sale_stock/sale_stock.py:625 #, python-format msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n" "The real stock is %.2f %s. (without reservations)" diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml index 4e4c7477a7bc8..0b7249fbbeff1 100644 --- a/addons/sale_stock/sale_stock_view.xml +++ b/addons/sale_stock/sale_stock_view.xml @@ -46,7 +46,7 @@