Unifield Server

Merge lp:~jr.allen/unifield-server/us-3365 into lp:unifield-server

  1. us-3365
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4492
Proposed branch: lp:~jr.allen/unifield-server/us-3365
Merge into: lp:unifield-server
Diff against target: 78 lines (+10/-19)
2 files modified
bin/addons/msf_profile/i18n/es_MF.po (+5/-10)
bin/addons/msf_profile/i18n/fr_MF.po (+5/-9)
To merge this branch: bzr merge lp:~jr.allen/unifield-server/us-3365
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+330428@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
2--- bin/addons/msf_profile/i18n/es_MF.po 2017-07-19 13:04:36 +0000
3+++ bin/addons/msf_profile/i18n/es_MF.po 2017-09-08 14:23:24 +0000
4@@ -11366,13 +11366,15 @@
5 msgid "Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."
6 msgstr "Tipo de envío de la lista de picking que contendrá el movimiento encadenado (déjelo vacío para detectar automáticamente el tipo en función de las ubicaciones de origen y de destino)."
7
8-#. modules: register_accounting, account_voucher
9+#. modules: register_accounting, account_voucher, msf_doc_import
10 #: view:account.statement.from.invoice.lines:0
11 #: code:addons/account_voucher/wizard/account_statement_from_invoice.py:187
12 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
13 #: view:wizard.import.cheque:0
14 #: view:wizard.import.invoice:0
15-#, python-format
16+#: model:ir.actions.act_window,name:msf_doc_import.action_migration_accounting_import_wizard
17+#: model:ir.ui.menu,name:msf_doc_import.menu_finance_migration_accounting
18+#: view:msf.doc.import.accounting:0
19 msgid "Import Entries"
20 msgstr "Importar asientos"
21
22@@ -44767,13 +44769,6 @@
23 msgid "America/Argentina/Salta"
24 msgstr "America/Argentina/Salta"
25
26-#. module: msf_doc_import
27-#: model:ir.actions.act_window,name:msf_doc_import.action_migration_accounting_import_wizard
28-#: model:ir.ui.menu,name:msf_doc_import.menu_finance_migration_accounting
29-#: view:msf.doc.import.accounting:0
30-msgid "Import Entries"
31-msgstr "Importar asientos de migración"
32-
33 #. module: base
34 #: view:ir.model.access:0
35 #: view:ir.rule:0
36@@ -52188,7 +52183,7 @@
37 #. module: account
38 #: field:account.journal,default_debit_account_id:0
39 msgid "Default Debit Account"
40-msgstr "Cuenta de crédito por defecto"
41+msgstr "Cuenta de débito por defecto"
42
43 #. module: base
44 #: selection:res.config.users,context_tz:0
45
46=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
47--- bin/addons/msf_profile/i18n/fr_MF.po 2017-09-03 15:15:05 +0000
48+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-09-08 14:23:24 +0000
49@@ -79005,9 +79005,13 @@
50 msgid "Please keep in mind that documents currently displayed may not be relevant after switching to another company. If you have unsaved changes, please make sure to save and close all forms before switching to a different company. (You can click on Cancel in the User Preferences now)"
51 msgstr "Gardez à l'esprit que les documents actuellement affichés peuvent ne plus être pertinents après le changement vers une autre société. Si vous avez des changements non enregistrés, veuillez vérifier que vous avez sauvegardé et enregistré tous les formulaires avant de changer de société. (Vous pouvez maintenant cliquer sur Annuler dans les Préférences Utilisateur)"
52
53-#. modules: register_accounting, account_voucher
54+#. modules: register_accounting, account_voucher, msf_doc_import
55 #: view:account.statement.from.invoice.lines:0
56 #: code:addons/account_voucher/wizard/account_statement_from_invoice.py:187
57+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
58+#: model:ir.actions.act_window,name:msf_doc_import.action_migration_accounting_import_wizard
59+#: model:ir.ui.menu,name:msf_doc_import.menu_finance_migration_accounting
60+#: view:msf.doc.import.accounting:0
61 #: view:wizard.import.cheque:0
62 #: view:wizard.import.invoice:0
63 #, python-format
64@@ -86334,14 +86338,6 @@
65 msgid "Copy of standard.price.track.changes is not allowed"
66 msgstr "Copy of standard.price.track.changes is not allowed"
67
68-#. modules: msf_doc_import, account_voucher
69-#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
70-#: model:ir.actions.act_window,name:msf_doc_import.action_migration_accounting_import_wizard
71-#: model:ir.ui.menu,name:msf_doc_import.menu_finance_migration_accounting
72-#: view:msf.doc.import.accounting:0
73-msgid "Import Entries"
74-msgstr "Import d'entrées de migration"
75-
76 #. module: msf_budget
77 #: field:wizard.budget.criteria.export,period_id:0
78 msgid "Year-to-date"

Subscribers

People subscribed via source and target branches

to all changes: