[tryton-commits] changeset in weblate:default Translated using Weblate (French)
changeset 8338f127839c in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=8338f127839c description: Translated using Weblate (French) Currently translated at 100.0% (272 of 272 strings) Translation: Tryton/party Translate-URL: https://translate.tryton.org/projects/tryton/party/fr/ diffstat: modules/party/locale/fr.po | 7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diffs (30 lines): diff -r 48c5c5daa29e -r 8338f127839c modules/party/locale/fr.po --- a/modules/party/locale/fr.poSat Oct 03 22:48:09 2020 + +++ b/modules/party/locale/fr.poSat Oct 03 22:47:54 2020 + @@ -1,15 +1,14 @@ # msgid "" msgstr "" -"PO-Revision-Date: 2020-08-19 00:29+\n" +"PO-Revision-Date: 2020-10-04 02:24+\n" "Last-Translator: Cedric Krier \n" "Language: fr\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.1.1\n" +"X-Generator: Weblate 4.2.2\n" -#, fuzzy msgctxt "field:ir.email.template,contact_mechanism:" msgid "Contact Mechanism" msgstr "Moyen de contact" @@ -268,7 +267,7 @@ msgctxt "help:ir.email.template,contact_mechanism:" msgid "Define which email address to use from the party's contact mechanisms." -msgstr "" +msgstr "Définit quel e-mail utiliser des mécanismes de contact du tiers." msgctxt "help:party.address,party_name:" msgid "If filled, replace the name of the party for address formatting"
[tryton-commits] changeset in weblate:default Translated using Weblate (French)
changeset 48c5c5daa29e in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=48c5c5daa29e description: Translated using Weblate (French) Currently translated at 100.0% (44 of 44 strings) Translation: Tryton/notification_email Translate-URL: https://translate.tryton.org/projects/tryton/notification_email/fr/ diffstat: modules/notification_email/locale/fr.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (28 lines): diff -r c60e32f41cf8 -r 48c5c5daa29e modules/notification_email/locale/fr.po --- a/modules/notification_email/locale/fr.po Sat Oct 03 22:45:35 2020 + +++ b/modules/notification_email/locale/fr.po Sat Oct 03 22:48:09 2020 + @@ -1,13 +1,13 @@ # msgid "" msgstr "" -"PO-Revision-Date: 2020-07-12 08:34+\n" +"PO-Revision-Date: 2020-10-04 02:24+\n" "Last-Translator: Cedric Krier \n" "Language: fr\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.1.1\n" +"X-Generator: Weblate 4.2.2\n" msgctxt "field:ir.trigger,notification_email:" msgid "Email Notification" @@ -107,7 +107,7 @@ msgctxt "help:notification.email,contact_mechanism:" msgid "Define which email to use from the party's contact mechanisms" -msgstr "Défini quel e-mail utiliser des moyen de contact du tiers" +msgstr "Définit quel e-mail utiliser des mécanismes de contact du tiers" msgctxt "help:notification.email,content:" msgid "The report used as email template."
[tryton-commits] changeset in weblate:default Translated using Weblate (French)
changeset c60e32f41cf8 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=c60e32f41cf8 description: Translated using Weblate (French) Currently translated at 100.0% (292 of 292 strings) Translation: Tryton/account_invoice Translate-URL: https://translate.tryton.org/projects/tryton/account_invoice/fr/ diffstat: modules/account_invoice/locale/fr.po | 9 + 1 files changed, 5 insertions(+), 4 deletions(-) diffs (40 lines): diff -r d477baf9f437 -r c60e32f41cf8 modules/account_invoice/locale/fr.po --- a/modules/account_invoice/locale/fr.po Sat Oct 03 22:58:31 2020 + +++ b/modules/account_invoice/locale/fr.po Sat Oct 03 22:45:35 2020 + @@ -1,13 +1,13 @@ # msgid "" msgstr "" -"PO-Revision-Date: 2020-08-09 21:41+\n" +"PO-Revision-Date: 2020-10-04 02:24+\n" "Last-Translator: Cedric Krier \n" "Language: fr\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.1.1\n" +"X-Generator: Weblate 4.2.2\n" msgctxt "field:account.fiscalyear,invoice_sequences:" msgid "Invoice Sequences" @@ -305,10 +305,9 @@ msgid "Taxes" msgstr "Taxes" -#, fuzzy msgctxt "field:account.invoice.line,taxes_date:" msgid "Taxes Date" -msgstr "Taxes" +msgstr "Date de taxes" msgctxt "field:account.invoice.line,type:" msgid "Type" @@ -643,6 +642,8 @@ "The date at which the taxes are computed.\n" "Leave empty for the accounting date." msgstr "" +"La date à laquelle les taxes sont calculées.\n" +"Laissez vide pour la date comptable." msgctxt "help:company.company,cancel_invoice_out:" msgid "Allow cancelling move of customer invoice."
[tryton-commits] changeset in weblate:default Translated using Weblate (French)
changeset d477baf9f437 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=d477baf9f437 description: Translated using Weblate (French) Currently translated at 100.0% (211 of 211 strings) Translation: Tryton/sao Translate-URL: https://translate.tryton.org/projects/tryton/sao/fr/ diffstat: sao/locale/fr.po | 47 --- 1 files changed, 28 insertions(+), 19 deletions(-) diffs (107 lines): diff -r aad6b92f5129 -r d477baf9f437 sao/locale/fr.po --- a/sao/locale/fr.po Sat Oct 03 22:59:10 2020 + +++ b/sao/locale/fr.po Sat Oct 03 22:58:31 2020 + @@ -1,3 +1,18 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-04 02:24+\n" +"PO-Revision-Date: 2020-10-04 02:24+\n" +"Last-Translator: Cedric Krier \n" +"Language-Team: LANGUAGE \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.2.2\n" + # Generated by grunt-xgettext on Wed May 01 2019 00:09:20 GMT+0200 (CEST) # Generated by grunt-xgettext on Mon Apr 15 2019 16:53:42 GMT+0200 (CEST) # Generated by grunt-xgettext on Mon Apr 01 2019 13:14:07 GMT+0200 (CEST) @@ -73,7 +88,7 @@ msgstr "Imprimer" msgid "E-Mail" -msgstr "" +msgstr "E-mail" msgid "Previous tab" msgstr "Onglet précédent" @@ -145,11 +160,10 @@ msgstr "Ajouter une note à l'enregistrement" msgid "E-Mail..." -msgstr "" +msgstr "E-mail..." -#, fuzzy msgid "Send an e-mail using the record" -msgstr "Ajouter une note à l'enregistrement" +msgstr "Envoyer un e-mail en utilisant l'enregistrement" msgid "Export" msgstr "Exporter" @@ -222,9 +236,8 @@ msgid "Add..." msgstr "Ajouter..." -#, fuzzy msgid "Template" -msgstr "Relation" +msgstr "Modèle" msgid "Attachment (%1)" msgstr "Attachement (%1)" @@ -628,24 +641,22 @@ msgstr "Surcharger la définition %s ?" msgid "E-mail %1" -msgstr "" +msgstr "E-mail %1" -#, fuzzy msgid "To:" -msgstr "À" +msgstr "À :" msgid "Cc:" -msgstr "" +msgstr "Cc :" msgid "Bcc:" -msgstr "" +msgstr "Cci :" msgid "Subject:" -msgstr "" +msgstr "Objet :" -#, fuzzy msgid "Reports" -msgstr "Rapporter un bogue" +msgstr "Rapports" # msgid "" @@ -660,16 +671,14 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 4.1.1\n" -#, fuzzy msgid "Attachments" -msgstr "Attachement" +msgstr "Pièces jointes" msgid "Send" -msgstr "" +msgstr "Envoyer" -#, fuzzy msgid "Remove attachment" -msgstr "Attachement" +msgstr "Supprimer la pièce jointe" msgid "Wizard" msgstr "Assistant"
[tryton-commits] changeset in weblate:default Translated using Weblate (French)
changeset aad6b92f5129 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=aad6b92f5129 description: Translated using Weblate (French) Currently translated at 100.0% (371 of 371 strings) Translation: Tryton/tryton Translate-URL: https://translate.tryton.org/projects/tryton/tryton/fr/ diffstat: tryton/tryton/data/locale/fr/LC_MESSAGES/tryton.po | 41 - 1 files changed, 16 insertions(+), 25 deletions(-) diffs (103 lines): diff -r 82d6262564e6 -r aad6b92f5129 tryton/tryton/data/locale/fr/LC_MESSAGES/tryton.po --- a/tryton/tryton/data/locale/fr/LC_MESSAGES/tryton.poSat Oct 03 22:52:36 2020 + +++ b/tryton/tryton/data/locale/fr/LC_MESSAGES/tryton.poSat Oct 03 22:59:10 2020 + @@ -6,13 +6,13 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01 15:34+\n" -"PO-Revision-Date: 2020-07-27 00:19+\n" +"PO-Revision-Date: 2020-10-04 02:24+\n" "Last-Translator: Cedric Krier \n" "Language: fr\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.1.1\n" +"X-Generator: Weblate 4.2.2\n" msgid "specify alternate config file" msgstr "spécifier un fichier de configuration alternatif" @@ -195,9 +195,8 @@ msgid "The number of decimal" msgstr "Le nombre de décimal" -#, fuzzy msgid "Template" -msgstr "Relation" +msgstr "Modèle" msgid "Edit..." msgstr "Éditer..." @@ -554,49 +553,42 @@ msgid "User name:" msgstr "Nom d'utilisateur :" -#, fuzzy msgid "Unable to complete email entry" -msgstr "Impossible de supprimer l'assistant %s" +msgstr "Impossible de compléter l'entrée d'e-mail" -#, fuzzy, python-format +#, python-format msgid "E-mail %s" -msgstr "E-mail" +msgstr "E-mail %s" msgid "To:" msgstr "À :" -#, fuzzy msgid "Cc:" -msgstr "CC :" +msgstr "Cc :" msgid "Bcc:" -msgstr "" +msgstr "Cci :" msgid "Subject:" -msgstr "Sujet :" +msgstr "Objet :" -#, fuzzy msgid "Body" -msgstr "Corps :" +msgstr "Corps" -#, fuzzy msgid "Reports" -msgstr "Rapport" +msgstr "Rapports" -#, fuzzy msgid "Attachments" -msgstr "Attachement :" +msgstr "Pièces jointes" msgid "Send" -msgstr "" +msgstr "Envoyer" -#, fuzzy msgid "Select Attachment" -msgstr "Sélectionner le parent" +msgstr "Sélectionnez une pièce jointe" -#, fuzzy msgid "Remove attachment" -msgstr "Attachement :" +msgstr "Supprimer la pièce jointe" msgid "Add..." msgstr "Ajouter..." @@ -794,9 +786,8 @@ msgid "_E-Mail..." msgstr "_E-mail..." -#, fuzzy msgid "Send an e-mail using the record" -msgstr "Ajouter une note à l'enregistrement" +msgstr "Envoyer un e-mail en utilisant l'enregistrement" msgid "_Export Data..." msgstr "_Export de données..."
[tryton-commits] changeset in weblate:default Translated using Weblate (French)
changeset 82d6262564e6 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=82d6262564e6 description: Translated using Weblate (French) Currently translated at 100.0% (142 of 142 strings) Translation: Tryton/res Translate-URL: https://translate.tryton.org/projects/tryton/res/fr/ diffstat: trytond/trytond/res/locale/fr.po | 17 +++-- 1 files changed, 11 insertions(+), 6 deletions(-) diffs (51 lines): diff -r d39405c26603 -r 82d6262564e6 trytond/trytond/res/locale/fr.po --- a/trytond/trytond/res/locale/fr.po Sat Oct 03 07:28:05 2020 + +++ b/trytond/trytond/res/locale/fr.po Sat Oct 03 22:52:36 2020 + @@ -1,13 +1,13 @@ # msgid "" msgstr "" -"PO-Revision-Date: 2020-04-14 23:52+\n" +"PO-Revision-Date: 2020-10-04 02:24+\n" "Last-Translator: Cedric Krier \n" "Language: fr\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.11.3\n" +"X-Generator: Weblate 4.2.2\n" msgctxt "field:ir.action-res.group,action:" msgid "Action" @@ -444,10 +444,9 @@ msgid "Any view search" msgstr "N'importe quelle recherche de vue" -#, fuzzy msgctxt "model:ir.rule.group,name:rule_group_view_search_common" msgid "Common view search" -msgstr "Recherche de vue propre" +msgstr "Recherche de vue commune" msgctxt "model:ir.rule.group-res.group,name:" msgid "Rule Group - Group" @@ -522,11 +521,17 @@ "[6:tryton://%(host)s/%(database)s][7:]\n" "[8:%(host)s/#%(database)s]" msgstr "" +"Le mot de passe de votre compte, [1:%(login)s], a été réinitialisé.[2:]\n" +"Vous devez en définir un nouveau dans les préférences de " +"l'utilisateur.[3:]\n" +"Vous pouvez vous connecter avec ce mot de passe temporaire " +"[4:%(password)s] à [5:]\n" +"[6: tryton://%(host)s/%(database)s][7:]\n" +"[8:%(host)s/#%(database)s]" -#, fuzzy msgctxt "report:res.user.email_reset_password:" msgid "The password will expire at [1:%(datetime)s UTC]." -msgstr "Le mot de passe expirera le" +msgstr "Le mot de passe expirera à [1:%(datetime)s UTC]." msgctxt "selection:res.user.application,state:" msgid "Cancelled"
[tryton-commits] changeset in modules/account_stock_landed_cost:default Add lande...
changeset 937e1114ce40 in modules/account_stock_landed_cost:default details: https://hg.tryton.org/modules/account_stock_landed_cost?cmd=changeset;node=937e1114ce40 description: Add landed cost relate from supplier shipment issue9609 review319971002 diffstat: CHANGELOG | 1 + account.xml | 24 2 files changed, 25 insertions(+), 0 deletions(-) diffs (42 lines): diff -r 8a909205c706 -r 937e1114ce40 CHANGELOG --- a/CHANGELOG Sun Sep 27 16:46:23 2020 +0200 +++ b/CHANGELOG Sun Oct 04 00:37:27 2020 +0200 @@ -1,3 +1,4 @@ +* Add landed cost relate from supplier shipment * Rename landed cost state from cancel to cancelled Version 5.6.0 - 2020-05-04 diff -r 8a909205c706 -r 937e1114ce40 account.xml --- a/account.xml Sun Sep 27 16:46:23 2020 +0200 +++ b/account.xml Sun Oct 04 00:37:27 2020 +0200 @@ -77,6 +77,30 @@ + +Landed Costs +account.landed_cost + + + + + + + + + + + + + +form_relate +stock.shipment.in,-1 + + +
[tryton-commits] changeset in tryton:default Fallback to model name as title
changeset 60b4dc6f3da9 in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=60b4dc6f3da9
description:
Fallback to model name as title
issue9596
review300381002
diffstat:
CHANGELOG | 1 +
tryton/common/__init__.py | 4 ++--
tryton/common/common.py | 22 ++
tryton/gui/main.py | 1 +
tryton/gui/window/board.py | 7 +++
tryton/gui/window/form.py | 2 ++
tryton/gui/window/win_form.py | 4 +++-
tryton/gui/window/win_search.py | 2 ++
8 files changed, 36 insertions(+), 7 deletions(-)
diffs (141 lines):
diff -r 9095afd5c5a7 -r 60b4dc6f3da9 CHANGELOG
--- a/CHANGELOG Sat Oct 03 23:37:02 2020 +0200
+++ b/CHANGELOG Sun Oct 04 00:35:23 2020 +0200
@@ -1,3 +1,4 @@
+* Fallback to model name as title
* Manage deletable and writable state
* Support e-mail template
* Send e-mail via the server
diff -r 9095afd5c5a7 -r 60b4dc6f3da9 tryton/common/__init__.py
--- a/tryton/common/__init__.py Sat Oct 03 23:37:02 2020 +0200
+++ b/tryton/common/__init__.py Sun Oct 04 00:35:23 2020 +0200
@@ -1,7 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
from .common import (
-IconFactory, MODELACCESS, MODELHISTORY, VIEW_SEARCH,
+IconFactory, MODELACCESS, MODELHISTORY, MODELNAME, VIEW_SEARCH,
get_toplevel_window, get_sensible_widget, selection, file_selection,
slugify, file_write, file_open, mailto, message, warning, userwarning, sur,
sur_3b, ask, concurrency, error, to_xml, process_exception, Login, Logout,
@@ -18,7 +18,7 @@
from . import timedelta
__all__ = [
-IconFactory, MODELACCESS, MODELHISTORY, VIEW_SEARCH,
+IconFactory, MODELACCESS, MODELHISTORY, MODELNAME, VIEW_SEARCH,
get_toplevel_window, get_sensible_widget, selection, file_selection,
slugify, file_write, file_open, mailto, message, warning, userwarning, sur,
sur_3b, ask, concurrency, error, to_xml, process_exception, Login, Logout,
diff -r 9095afd5c5a7 -r 60b4dc6f3da9 tryton/common/common.py
--- a/tryton/common/common.py Sat Oct 03 23:37:02 2020 +0200
+++ b/tryton/common/common.py Sun Oct 04 00:35:23 2020 +0200
@@ -228,6 +228,28 @@
MODELHISTORY = ModelHistory()
+class ModelName:
+_names = {}
+
+def load_names(self):
+try:
+self._names = rpc.execute(
+'model', 'ir.model', 'get_names', rpc.CONTEXT)
+except TrytonServerError:
+pass
+
+def get(self, model):
+if not self._names:
+self.load_names()
+return self._names.get(model, '')
+
+def clear(self):
+return self._names.clear()
+
+
+MODELNAME = ModelName()
+
+
class ViewSearch(object):
searches = {}
diff -r 9095afd5c5a7 -r 60b4dc6f3da9 tryton/gui/main.py
--- a/tryton/gui/main.pySat Oct 03 23:37:02 2020 +0200
+++ b/tryton/gui/main.pySun Oct 04 00:35:23 2020 +0200
@@ -532,6 +532,7 @@
self.favorite_unset()
self.primary_menu.set_menu_model(self._get_primary_menu())
CONFIG['client.lang'] = prefs['language']
+common.MODELNAME.clear()
# Set placeholder after language is set to get correct translation
self.global_search_entry.set_placeholder_text(_("Action"))
CONFIG.save()
diff -r 9095afd5c5a7 -r 60b4dc6f3da9 tryton/gui/window/board.py
--- a/tryton/gui/window/board.pySat Oct 03 23:37:02 2020 +0200
+++ b/tryton/gui/window/board.pySun Oct 04 00:35:23 2020 +0200
@@ -7,7 +7,7 @@
from tryton.signal_event import SignalEvent
from tryton.gui import Main
from tryton.gui.window.view_board import ViewBoard
-from tryton.common import RPCExecute, RPCException
+from tryton.common import RPCExecute, RPCException, MODELNAME
from .tabcontent import TabContent
@@ -35,9 +35,8 @@
self.model = model
self.dialogs = []
if not name:
-self.name = self.board.name
-else:
-self.name = name
+name = MODELNAME.get(model)
+self.name = name
self.create_tabcontent()
self.board.reload()
diff -r 9095afd5c5a7 -r 60b4dc6f3da9 tryton/gui/window/form.py
--- a/tryton/gui/window/form.py Sat Oct 03 23:37:02 2020 +0200
+++ b/tryton/gui/window/form.py Sun Oct 04 00:35:23 2020 +0200
@@ -48,6 +48,8 @@
self.screen = Screen(self.model, **attributes)
self.screen.widget.show()
+if not name:
+name = common.MODELNAME.get(model)
self.name = name
self.create_tabcontent()
diff -r 9095afd5c5a7 -r 60b4dc6f3da9 tryton/gui/window/win_form.py
--- a/tryton/gui/window/win_form.py Sat Oct 03 23:37:02 2020 +0200
+++ b/tryton/gui/window/win_form.py Sun Oct 04 00:35:23 2020 +0200
@@ -6,7 +6,7 @@
from .infobar import InfoBar
import tryton.common as common
-from tryton.common import TRYTON_ICON
+f
[tryton-commits] changeset in trytond:default Fallback to model name as title
changeset 75402881aefc in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=75402881aefc
description:
Fallback to model name as title
issue9596
review300381002
diffstat:
trytond/ir/model.py | 7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diffs (24 lines):
diff -r 8d1f0e31a1c6 -r 75402881aefc trytond/ir/model.py
--- a/trytond/ir/model.py Thu Sep 24 23:05:04 2020 +0200
+++ b/trytond/ir/model.py Sun Oct 04 00:35:23 2020 +0200
@@ -72,6 +72,7 @@
cls.__rpc__.update({
'list_models': RPC(),
'list_history': RPC(),
+'get_names': RPC(),
'global_search': RPC(),
})
@@ -143,6 +144,12 @@
if getattr(model, '_history', False)]
@classmethod
+def get_names(cls):
+"Return a dictionary mapping models to names"
+models = cls.search([])
+return {m.model: m.name for m in models}
+
+@classmethod
def global_search(cls, text, limit, menu='ir.ui.menu'):
"""
Search on models for text including menu
[tryton-commits] changeset in modules/stock:default Add relate to open inventory ...
changeset 139297ec4faa in modules/stock:default
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=139297ec4faa
description:
Add relate to open inventory lines
issue9563
review290881002
diffstat:
CHANGELOG | 1 +
inventory.py| 29 -
inventory.xml | 21 +
view/inventory_form.xml | 2 +-
view/inventory_line_list_simple.xml | 9 +
view/inventory_line_tree.xml| 4 +++-
6 files changed, 63 insertions(+), 3 deletions(-)
diffs (133 lines):
diff -r 7e581e7b9674 -r 139297ec4faa CHANGELOG
--- a/CHANGELOG Sun Sep 27 18:20:34 2020 +0200
+++ b/CHANGELOG Sat Oct 03 23:47:19 2020 +0200
@@ -1,3 +1,4 @@
+* Add relate to open inventory lines
* Use simplified view for moves list on shipments
* Add a relate from product to its moves
* Factorize the cost price of move for cost computation
diff -r 7e581e7b9674 -r 139297ec4faa inventory.py
--- a/inventory.py Sun Sep 27 18:20:34 2020 +0200
+++ b/inventory.py Sat Oct 03 23:47:19 2020 +0200
@@ -49,7 +49,7 @@
('keep', "Keep"),
('empty', "Empty"),
], "Empty Quantity", states=_states, depends=_depends,
-help="How lines without quantity are handled.")
+help="How lines without a quantity are handled.")
company = fields.Many2One('company.company', 'Company', required=True,
states={
'readonly': (Eval('state') != 'draft') | Eval('lines', [0]),
@@ -322,6 +322,14 @@
},
depends=_depends,
help="The inventory the line belongs to.")
+inventory_location = fields.Function(
+fields.Many2One('stock.location', "Location"),
+'on_change_with_inventory_location',
+searcher='search_inventory_location')
+inventory_date = fields.Function(
+fields.Date("Date"),
+'on_change_with_inventory_date',
+searcher='search_inventory_date')
inventory_state = fields.Function(
fields.Selection('get_inventory_states', "Inventory State"),
'on_change_with_inventory_state')
@@ -377,6 +385,25 @@
self.uom = self.product.default_uom
self.unit_digits = self.product.default_uom.digits
+@fields.depends('inventory', '_parent_inventory.location')
+def on_change_with_inventory_location(self, name=None):
+if self.inventory and self.inventory.location:
+return self.inventory.location.id
+
+@classmethod
+def search_inventory_location(cls, name, clause):
+nested = clause[0].lstrip(name)
+return [('inventory.' + name + nested,) + tuple(clause[1:])]
+
+@fields.depends('inventory', '_parent_inventory.date')
+def on_change_with_inventory_date(self, name=None):
+if self.inventory:
+return self.inventory.date
+
+@classmethod
+def search_inventory_date(cls, name, clause):
+return [('inventory.date',) + tuple(clause[1:])]
+
@classmethod
def get_inventory_states(cls):
pool = Pool()
diff -r 7e581e7b9674 -r 139297ec4faa inventory.xml
--- a/inventory.xml Sun Sep 27 18:20:34 2020 +0200
+++ b/inventory.xml Sat Oct 03 23:47:19 2020 +0200
@@ -57,8 +57,29 @@
stock.inventory.line
tree
+
inventory_line_tree
+
+stock.inventory.line
+tree
+
+inventory_line_list_simple
+
+
+
+Inventory Lines
+stock.inventory.line
+
+
+
+form_relate
+stock.inventory,-1
+
+
diff -r 7e581e7b9674 -r 139297ec4faa view/inventory_form.xml
--- a/view/inventory_form.xml Sun Sep 27 18:20:34 2020 +0200
+++ b/view/inventory_form.xml Sat Oct 03 23:47:19 2020 +0200
@@ -15,7 +15,7 @@
-
+
diff -r 7e581e7b9674 -r 139297ec4faa view/inventory_line_list_simple.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/view/inventory_line_list_simple.xml Sat Oct 03 23:47:19 2020 +0200
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
diff -r 7e581e7b9674 -r 139297ec4faa view/inventory_line_tree.xml
--- a/view/inventory_line_tree.xml Sun Sep 27 18:20:34 2020 +0200
+++ b/view/inventory_line_tree.xml Sat Oct 03 23:47:19 2020 +0200
@@ -3,7 +3,9 @@
this repository contains the full copyright notices and license terms. -->
-
+
+
+
[tryton-commits] changeset in modules/stock_lot:default Add relate to open invent...
changeset 234ea81bce99 in modules/stock_lot:default details: https://hg.tryton.org/modules/stock_lot?cmd=changeset;node=234ea81bce99 description: Add relate to open inventory lines issue9563 review290881002 diffstat: stock.xml | 6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 3567f0227f6f -r 234ea81bce99 stock.xml --- a/stock.xml Fri Aug 14 14:21:02 2020 +0200 +++ b/stock.xml Sat Oct 03 23:47:40 2020 +0200 @@ -183,5 +183,11 @@ inventory_line_tree + +stock.inventory.line + +inventory_line_tree + +
[tryton-commits] changeset in modules/stock_inventory_location:default Add comple...
changeset 278d87a40a0f in modules/stock_inventory_location:default details: https://hg.tryton.org/modules/stock_inventory_location?cmd=changeset;node=278d87a40a0f description: Add complete and confirm button to inventory list issue9563 review290881002 diffstat: inventory.xml | 6 ++ view/inventory_list.xml | 9 + 2 files changed, 15 insertions(+), 0 deletions(-) diffs (28 lines): diff -r 074b8f774486 -r 278d87a40a0f inventory.xml --- a/inventory.xml Wed Sep 09 23:28:22 2020 +0200 +++ b/inventory.xml Sat Oct 03 23:49:35 2020 +0200 @@ -26,5 +26,11 @@ form inventory_create_start_form + + +stock.inventory + +inventory_list + diff -r 074b8f774486 -r 278d87a40a0f view/inventory_list.xml --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/view/inventory_list.xml Sat Oct 03 23:49:35 2020 +0200 @@ -0,0 +1,9 @@ + + + + + + + +
[tryton-commits] changeset in modules/stock_inventory_location:default Add empty ...
changeset 3ac82644ead6 in modules/stock_inventory_location:default
details:
https://hg.tryton.org/modules/stock_inventory_location?cmd=changeset;node=3ac82644ead6
description:
Add empty quantity and complete lines options
issue9563
review290881002
diffstat:
CHANGELOG| 2 +
inventory.py | 58 ---
tests/scenario_stock_inventories.rst | 9 ++---
view/inventory_create_start_form.xml | 5 +++
4 files changed, 57 insertions(+), 17 deletions(-)
diffs (139 lines):
diff -r 278d87a40a0f -r 3ac82644ead6 CHANGELOG
--- a/CHANGELOG Sat Oct 03 23:49:35 2020 +0200
+++ b/CHANGELOG Sat Oct 03 23:49:59 2020 +0200
@@ -1,3 +1,5 @@
+* Add empty quantity and complete lines options
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
diff -r 278d87a40a0f -r 3ac82644ead6 inventory.py
--- a/inventory.py Sat Oct 03 23:49:35 2020 +0200
+++ b/inventory.py Sat Oct 03 23:49:59 2020 +0200
@@ -12,13 +12,43 @@
date = fields.Date('Date', required=True)
company = fields.Many2One('company.company', 'Company', required=True,
select=True)
+empty_quantity = fields.Selection(
+'get_empty_quantities', "Empty Quantity",
+help="How lines without a quantity are handled.")
+complete_lines = fields.Boolean(
+"Complete",
+help="Add an inventory line for each missing product.")
locations = fields.Many2Many('stock.location', None, None,
'Locations', required=True, domain=[('type', '=', 'storage')])
+@classmethod
+def default_date(cls):
+return Pool().get('ir.date').today()
+
@staticmethod
def default_company():
return Transaction().context.get('company')
+@classmethod
+def get_empty_quantities(cls):
+pool = Pool()
+Inventory = pool.get('stock.inventory')
+return Inventory.fields_get(
+['empty_quantity'])['empty_quantity']['selection']
+
+@classmethod
+def default_empty_quantity(cls):
+pool = Pool()
+Inventory = pool.get('stock.inventory')
+try:
+return Inventory.default_empty_quantity()
+except AttributeError:
+return
+
+@classmethod
+def default_complete_lines(cls):
+return True
+
class CreateInventories(Wizard):
'Create Inventories'
@@ -30,20 +60,24 @@
])
create_ = StateAction('stock.act_inventory_form')
-def do_create_(self, action):
-Inventory = Pool().get('stock.inventory')
+def get_inventory(self, location, Inventory):
+return Inventory(
+location=location,
+date=self.start.date,
+company=self.start.company,
+empty_quantity=self.start.empty_quantity)
-to_create = []
-for location in self.start.locations:
-to_create.append({
-'location': location.id,
-'date': self.start.date,
-'company': self.start.company.id,
-})
-if to_create:
-inventories = Inventory.create(to_create)
+def do_create_(self, action):
+pool = Pool()
+Inventory = pool.get('stock.inventory')
-Inventory.complete_lines(inventories)
+inventories = [
+self.get_inventory(location, Inventory)
+for location in self.start.locations]
+Inventory.save(inventories)
+
+if self.start.complete_lines:
+Inventory.complete_lines(inventories)
data = {'res_id': [i.id for i in inventories]}
return action, data
diff -r 278d87a40a0f -r 3ac82644ead6 tests/scenario_stock_inventories.rst
--- a/tests/scenario_stock_inventories.rst Sat Oct 03 23:49:35 2020 +0200
+++ b/tests/scenario_stock_inventories.rst Sat Oct 03 23:49:59 2020 +0200
@@ -4,12 +4,9 @@
Imports::
->>> import datetime as dt
>>> from proteus import Model, Wizard
>>> from trytond.tests.tools import activate_modules
->>> from trytond.modules.company.tests.tools import create_company, \
-... get_company
->>> today = dt.date.today()
+>>> from trytond.modules.company.tests.tools import create_company
Activate modules::
@@ -29,7 +26,7 @@
Create inventories::
>>> create = Wizard('stock.inventory.create')
->>> create.form.date = today
+>>> create.form.empty_quantity = 'keep'
>>> create.form.locations.extend(Location.find([('code', '=', 'STO')]))
>>> create.execute('create_')
@@ -38,3 +35,5 @@
2
>>> {i.location for i in inventories} == {storage_loc, storage_loc2}
True
+>>> inventories[0].empty_quantity
+'keep'
diff -r 278d87a40a0f -r 3ac82644ead6 view/inventory_create_start_form.xml
--- a/view/inventory_create_start_form.xml Sat Oct 03 23:49:35 2020 +0200
+++ b/view/inventory_create_start_form.xml Sat Oct
[tryton-commits] changeset in tryton:default Use contextual date format to format...
changeset 9095afd5c5a7 in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=9095afd5c5a7
description:
Use contextual date format to format datetime
When a datetime has min time, we must still use the contextual date
format
instead of the OS.
issue9622
review326131002
diffstat:
tryton/common/domain_parser.py | 7 +++
1 files changed, 3 insertions(+), 4 deletions(-)
diffs (21 lines):
diff -r 9b4d9d92f0fa -r 9095afd5c5a7 tryton/common/domain_parser.py
--- a/tryton/common/domain_parser.pyThu Sep 24 23:00:52 2020 +0200
+++ b/tryton/common/domain_parser.pySat Oct 03 23:37:02 2020 +0200
@@ -338,14 +338,13 @@
def format_datetime():
if not value:
return ''
-format_ = (
-date_format(context.get('date_format')) + ' ' + time_format(field))
if not isinstance(value, datetime.datetime):
time = datetime.datetime.combine(value, datetime.time.min)
else:
time = timezoned_date(value)
-if time.time() == datetime.time.min:
-format_ = '%x'
+format_ = date_format(context.get('date_format'))
+if time.time() != datetime.time.min:
+format_ += ' ' + time_format(field)
return time.strftime(format_)
def format_date():
[tryton-commits] changeset in weblate:default Translated using Weblate (Dutch)
changeset d39405c26603 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=d39405c26603 description: Translated using Weblate (Dutch) Currently translated at 100.0% (21 of 21 strings) Translation: Tryton/stock_assign_manual Translate-URL: https://translate.tryton.org/projects/tryton/stock_assign_manual/nl/ diffstat: modules/stock_assign_manual/locale/nl.po | 57 --- 1 files changed, 37 insertions(+), 20 deletions(-) diffs (128 lines): diff -r fa5fdf6bd11d -r d39405c26603 modules/stock_assign_manual/locale/nl.po --- a/modules/stock_assign_manual/locale/nl.po Sat Oct 03 07:23:13 2020 + +++ b/modules/stock_assign_manual/locale/nl.po Sat Oct 03 07:28:05 2020 + @@ -1,87 +1,104 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-03 15:50+\n" +"PO-Revision-Date: 2020-10-03 15:50+\n" +"Last-Translator: Bert Defoor \n" +"Language-Team: LANGUAGE \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2.2\n" + msgctxt "field:stock.shipment.assign.manual.show,move:" msgid "Move" -msgstr "" +msgstr "Boekingen/bewegingen" msgctxt "field:stock.shipment.assign.manual.show,move_quantity:" msgid "Move Quantity" -msgstr "" +msgstr "Verplaats hoeveelheid" msgctxt "field:stock.shipment.assign.manual.show,place:" msgid "Place" -msgstr "" +msgstr "Plaats" msgctxt "field:stock.shipment.assign.manual.show,quantity:" msgid "Quantity" -msgstr "" +msgstr "Hoeveelheid" msgctxt "field:stock.shipment.assign.manual.show,skipped:" msgid "Skipped" -msgstr "" +msgstr "Overgeslagen" msgctxt "field:stock.shipment.assign.manual.show,unit_digits:" msgid "Unit Digits" -msgstr "" +msgstr "Decimalen eenheid" msgctxt "help:stock.shipment.assign.manual.show,quantity:" msgid "" "The maximum quantity to assign from the place.\n" "Leave empty for the full quantity of the move." msgstr "" +"Het maximale aantal dat vanaf de plaats kan worden toegewezen.\n" +"Laat leeg voor de volledige hoeveelheid van de beweging." msgctxt "model:ir.action,name:wizard_production_assign_manual" msgid "Manual Assign Production" -msgstr "" +msgstr "Handmatige toewijzing van productie" msgctxt "model:ir.action,name:wizard_shipment_in_return_assign_manual" msgid "Manual Assign Supplier Return Shipment" -msgstr "" +msgstr "Handmatig leverancier retourzending toewijzen" msgctxt "model:ir.action,name:wizard_shipment_internal_assign_manual" msgid "Manual Assign Internal Shipment" -msgstr "" +msgstr "Handmatig interne zending toewijzen" msgctxt "model:ir.action,name:wizard_shipment_out_assign_manual" msgid "Manual Assign Customer Shipment" -msgstr "" +msgstr "Handmatig klantzending toewijzen" msgctxt "model:ir.message,text:msg_assign_failed" msgid "Failed to assign of %(move)s from %(place)s, please retry." -msgstr "" +msgstr "Kan %(move)s van %(place)s niet toewijzen, probeer het opnieuw." msgctxt "model:ir.message,text:msg_invalid_quantity" msgid "The quantity must be between 0 and %(quantity)s." -msgstr "" +msgstr "De hoeveelheid moet tussen 0 en %(quantity)s liggen." msgctxt "model:ir.model.button,string:production_assign_manual_wizard_button" msgid "Manual Assign" -msgstr "" +msgstr "Handmatig toewijzen" msgctxt "" "model:ir.model.button,string:shipment_in_return_assign_manual_wizard_button" msgid "Manual Assign" -msgstr "" +msgstr "Handmatig toewijzen" msgctxt "" "model:ir.model.button,string:shipment_internal_assign_manual_wizard_button" msgid "Manual Assign" -msgstr "" +msgstr "Handmatig toewijzen" msgctxt "model:ir.model.button,string:shipment_out_assign_manual_wizard_button" msgid "Manual Assign" -msgstr "" +msgstr "Handmatig toewijzen" msgctxt "model:stock.shipment.assign.manual.show,name:" msgid "Manual Assign Shipment" -msgstr "" +msgstr "Handmatig zending toewijzen" msgctxt "wizard_button:stock.shipment.assign.manual,show,assign:" msgid "Assign" -msgstr "" +msgstr "Toewijzen" msgctxt "wizard_button:stock.shipment.assign.manual,show,end:" msgid "Cancel" -msgstr "" +msgstr "Annuleren" msgctxt "wizard_button:stock.shipment.assign.manual,show,skip:" msgid "Skip" -msgstr "" +msgstr "Overslaan"
[tryton-commits] changeset in weblate:default Translated using Weblate (Dutch)
changeset fa5fdf6bd11d in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=fa5fdf6bd11d description: Translated using Weblate (Dutch) Currently translated at 100.0% (57 of 57 strings) Translation: Tryton/marketing_email Translate-URL: https://translate.tryton.org/projects/tryton/marketing_email/nl/ diffstat: modules/marketing_email/locale/nl.po | 128 -- 1 files changed, 74 insertions(+), 54 deletions(-) diffs (306 lines): diff -r 210bd644573a -r fa5fdf6bd11d modules/marketing_email/locale/nl.po --- a/modules/marketing_email/locale/nl.po Sat Oct 03 07:12:53 2020 + +++ b/modules/marketing_email/locale/nl.po Sat Oct 03 07:23:13 2020 + @@ -1,228 +1,248 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-03 15:50+\n" +"PO-Revision-Date: 2020-10-03 15:50+\n" +"Last-Translator: Bert Defoor \n" +"Language-Team: LANGUAGE \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2.2\n" + msgctxt "field:marketing.email,email:" msgid "E-mail" -msgstr "" +msgstr "E-mail" msgctxt "field:marketing.email,email_token:" msgid "E-mail Token" -msgstr "" +msgstr "E-mail token" msgctxt "field:marketing.email,list_:" msgid "List" -msgstr "" +msgstr "Lijst" msgctxt "field:marketing.email,party:" msgid "Party" -msgstr "" +msgstr "Relatie" msgctxt "field:marketing.email,web_user:" msgid "Web User" -msgstr "" +msgstr "Web gebruiker" msgctxt "field:marketing.email.list,active:" msgid "Active" -msgstr "" +msgstr "Aktief" msgctxt "field:marketing.email.list,emails:" msgid "Emails" -msgstr "" +msgstr "E-mails" msgctxt "field:marketing.email.list,language:" msgid "Language" -msgstr "" +msgstr "Taal" msgctxt "field:marketing.email.list,name:" msgid "Name" -msgstr "" +msgstr "Naam" msgctxt "field:marketing.email.message,content:" msgid "Content" -msgstr "" +msgstr "Inhoud" msgctxt "field:marketing.email.message,from_:" msgid "From" -msgstr "" +msgstr "Van" msgctxt "field:marketing.email.message,list_:" msgid "List" -msgstr "" +msgstr "Lijst" msgctxt "field:marketing.email.message,state:" msgid "State" -msgstr "" +msgstr "Status" msgctxt "field:marketing.email.message,title:" msgid "Title" -msgstr "" +msgstr "Titel" msgctxt "field:marketing.email.message,urls:" msgid "URLs" -msgstr "" +msgstr "URLs" msgctxt "field:marketing.email.send_test,email:" msgid "E-Mail" -msgstr "" +msgstr "E-mail" msgctxt "field:marketing.email.send_test,list_:" msgid "List" -msgstr "" +msgstr "Lijst" msgctxt "field:marketing.email.send_test,message:" msgid "Message" -msgstr "" +msgstr "Bericht" msgctxt "help:marketing.email.message,from_:" msgid "Leave empty for the value defined in the configuration file." msgstr "" +"Laat leeg om de waarde te gebruiken die gedefinieerd is in het " +"configuratiebestand." msgctxt "model:ir.action,name:act_email_list_form" msgid "Mailing Lists" -msgstr "" +msgstr "Mail lijst" msgctxt "model:ir.action,name:act_email_message_form" msgid "Messages" -msgstr "" +msgstr "Bericht" msgctxt "model:ir.action,name:act_email_relate_list" msgid "E-mails" -msgstr "" +msgstr "E-mails" msgctxt "model:ir.action,name:report_email_subscribe" msgid "Subscribe Request" -msgstr "" +msgstr "Abonnementsverzoek" msgctxt "model:ir.action,name:report_email_unsubscribe" msgid "Unsubscribe Request" -msgstr "" +msgstr "Uitschrijfverzoek" msgctxt "model:ir.action,name:wizard_send_test" msgid "Send Test" -msgstr "" +msgstr "Test verzenden" msgctxt "model:ir.action.act_window.domain,name:act_email_message_form_all" msgid "All" -msgstr "" +msgstr "Alle" msgctxt "model:ir.action.act_window.domain,name:act_email_message_form_draft" msgid "Draft" -msgstr "" +msgstr "Concept" msgctxt "model:ir.action.act_window.domain,name:act_email_message_form_sending" msgid "Sending" -msgstr "" +msgstr "Bezig met verzenden" msgctxt "model:ir.message,text:msg_email_list_unique" msgid "Email addresses can only be subscribed once to each list." msgstr "" +"E-mailadressen kunnen slechts één keer op elke lijst worden ingeschreven." msgctxt "model:ir.message,text:msg_message_invalid_content" msgid "" "Invalid content in message \"%(message)s\" with exception \"%(exception)s\"." msgstr "" +"Ongeldige inhoud in bericht \"%(message)s\" met uitzondering \"%(exception)" +"s\"." msgctxt "model:ir.model.button,string:message_draft_button" msgid "Draft" -msgstr "" +msgstr "Concept" msgctxt "model:ir.model.button,string:message_send_button" msgid "Send" -msgstr "" +msgstr "Sturen" msgctxt "model:ir.model.button,string:message_send_test_button" msgid "Send Test" -msgstr "" +msgstr "Test verzenden" msgctxt "model:ir.ui.menu,name:menu_em
[tryton-commits] changeset in weblate:default Translated using Weblate (Dutch)
changeset 210bd644573a in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=210bd644573a description: Translated using Weblate (Dutch) Currently translated at 100.0% (371 of 371 strings) Translation: Tryton/tryton Translate-URL: https://translate.tryton.org/projects/tryton/tryton/nl/ diffstat: tryton/tryton/data/locale/nl/LC_MESSAGES/tryton.po | 39 - 1 files changed, 15 insertions(+), 24 deletions(-) diffs (102 lines): diff -r 21fd7a2eb04f -r 210bd644573a tryton/tryton/data/locale/nl/LC_MESSAGES/tryton.po --- a/tryton/tryton/data/locale/nl/LC_MESSAGES/tryton.poSat Oct 03 07:06:24 2020 + +++ b/tryton/tryton/data/locale/nl/LC_MESSAGES/tryton.poSat Oct 03 07:12:53 2020 + @@ -6,13 +6,13 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-01 15:34+\n" -"PO-Revision-Date: 2020-07-30 20:47+\n" +"PO-Revision-Date: 2020-10-03 15:50+\n" "Last-Translator: Bert Defoor \n" "Language: nl\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.1.1\n" +"X-Generator: Weblate 4.2.2\n" msgid "specify alternate config file" msgstr "specificeer een vervangend configuratiebestand" @@ -194,9 +194,8 @@ msgid "The number of decimal" msgstr "Aantal decimalen" -#, fuzzy msgid "Template" -msgstr "Relatie" +msgstr "Sjabloon" msgid "Edit..." msgstr "Bewerk..." @@ -551,49 +550,42 @@ msgid "User name:" msgstr "Gebruikersnaam:" -#, fuzzy msgid "Unable to complete email entry" -msgstr "Kon de wizard %s niet verwijderen" +msgstr "E-mailinvoer kan niet worden voltooid" -#, fuzzy, python-format +#, python-format msgid "E-mail %s" -msgstr "E-mail" +msgstr "E-mail %s" msgid "To:" msgstr "Aan:" -#, fuzzy msgid "Cc:" -msgstr "CC:" +msgstr "Cc:" msgid "Bcc:" -msgstr "" +msgstr "Bcc:" msgid "Subject:" msgstr "Onderwerp:" -#, fuzzy msgid "Body" -msgstr "Bericht:" +msgstr "Bericht" -#, fuzzy msgid "Reports" -msgstr "Verslag" +msgstr "Rapporten" -#, fuzzy msgid "Attachments" -msgstr "Bijlage:" +msgstr "Bijlagen" msgid "Send" -msgstr "" +msgstr "Sturen" -#, fuzzy msgid "Select Attachment" -msgstr "Selecteer bovenliggend niveau (parent)" +msgstr "Selecteer Bijlage" -#, fuzzy msgid "Remove attachment" -msgstr "Bijlage:" +msgstr "Bijlage verwijderen" msgid "Add..." msgstr "Toevoegen..." @@ -791,9 +783,8 @@ msgid "_E-Mail..." msgstr "_E-mail..." -#, fuzzy msgid "Send an e-mail using the record" -msgstr "Voeg een nota toe aan het veld" +msgstr "Stuur een e-mail met behulp van het record" msgid "_Export Data..." msgstr "_Exporteer gegevens..."
[tryton-commits] changeset in weblate:default Translated using Weblate (Dutch)
changeset 21fd7a2eb04f in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=21fd7a2eb04f description: Translated using Weblate (Dutch) Currently translated at 100.0% (838 of 838 strings) Translation: Tryton/ir Translate-URL: https://translate.tryton.org/projects/tryton/ir/nl/ diffstat: trytond/trytond/ir/locale/nl.po | 32 +++- 1 files changed, 15 insertions(+), 17 deletions(-) diffs (111 lines): diff -r b4a5bb0a9390 -r 21fd7a2eb04f trytond/trytond/ir/locale/nl.po --- a/trytond/trytond/ir/locale/nl.po Sat Oct 03 07:09:24 2020 + +++ b/trytond/trytond/ir/locale/nl.po Sat Oct 03 07:06:24 2020 + @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"PO-Revision-Date: 2020-10-02 12:13+\n" +"PO-Revision-Date: 2020-10-03 14:24+\n" "Last-Translator: Bert Defoor \n" "Language: nl\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -497,7 +497,6 @@ msgid "Model" msgstr "Model" -#, fuzzy msgctxt "field:ir.email.template,model_name:" msgid "Model Name" msgstr "Naam module" @@ -1630,7 +1629,7 @@ msgctxt "model:ir.action,name:act_email_template_form" msgid "E-mail Templates" -msgstr "" +msgstr "E-mailsjablonen" msgctxt "model:ir.action,name:act_export_form" msgid "Exports" @@ -2023,22 +2022,21 @@ msgid "Date" msgstr "Datum" -#, fuzzy msgctxt "model:ir.email,name:" msgid "Email" msgstr "E-mail" msgctxt "model:ir.email.address,name:" msgid "Email Address" -msgstr "" +msgstr "E-mailadres" msgctxt "model:ir.email.template,name:" msgid "Email Template" -msgstr "" +msgstr "Email sjabloon" msgctxt "model:ir.email.template-ir.action.report,name:" msgid "Email Template - Report" -msgstr "" +msgstr "E-mailsjabloon - Rapport" msgctxt "model:ir.export,name:" msgid "Export" @@ -2352,19 +2350,21 @@ msgid "Edited by" msgstr "Bewerk door" -#, fuzzy msgctxt "model:ir.message,text:msg_email_template_invalid_body" msgid "" "Invalid body in e-mail template \"%(template)s\" with exception " "\"%(exception)s\"" -msgstr "Ongeldige context\"%(context)s\" voor actie \"%(action)s\"." - -#, fuzzy +msgstr "" +"Ongeldige tekst in e-mailsjabloon \"%(template)s\" met uitzondering \"" +"%(exception)s\"" + msgctxt "model:ir.message,text:msg_email_template_invalid_subject" msgid "" "Invalid subject in e-mail template \"%(template)s\" with exception " "\"%(exception)s\"" -msgstr "Ongeldige context\"%(context)s\" voor actie \"%(action)s\"." +msgstr "" +"Ongeldige onderwerp in e-mailsjabloon \"%(template)s\" met uitzondering \"" +"%(exception)s\"" msgctxt "model:ir.message,text:msg_foreign_model_exist" msgid "" @@ -2871,14 +2871,13 @@ msgid "Scheduled Actions" msgstr "Geplande acties" -#, fuzzy msgctxt "model:ir.ui.menu,name:menu_email_form" msgid "E-mails" -msgstr "E-mail" +msgstr "E-mails" msgctxt "model:ir.ui.menu,name:menu_email_template_form" msgid "E-mail Templates" -msgstr "" +msgstr "E-mailsjablonen" msgctxt "model:ir.ui.menu,name:menu_export_form" msgid "Exports" @@ -3088,10 +3087,9 @@ msgid "Weeks" msgstr "Weken" -#, fuzzy msgctxt "selection:ir.cron,method:" msgid "Clean Task Queue" -msgstr "Vertalingen opschonen gelukt!" +msgstr "Maak de taakwachtrij schoon" msgctxt "selection:ir.cron,method:" msgid "Run On Time Triggers"
[tryton-commits] changeset in modules/account:default Get account from pool in Cr...
changeset b273c2533e0d in modules/account:default
details: https://hg.tryton.org/modules/account?cmd=changeset;node=b273c2533e0d
description:
Get account from pool in CreateChart default_properties
issue9657
review306531002
diffstat:
account.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diffs (13 lines):
diff -r e9c8d0180829 -r b273c2533e0d account.py
--- a/account.pyFri Sep 18 00:06:31 2020 +0200
+++ b/account.pySat Oct 03 12:24:19 2020 +0100
@@ -2611,6 +2611,9 @@
return 'properties'
def default_properties(self, fields):
+pool = Pool()
+Account = pool.get('account.account')
+
defaults = {
'company': self.account.company.id,
}
[tryton-commits] changeset in modules/account:default Get account from pool in Up...
changeset e94197bb9507 in modules/account:default
details: https://hg.tryton.org/modules/account?cmd=changeset;node=e94197bb9507
description:
Get account from pool in UpdateChart default_start
issue9663
review329121002
diffstat:
account.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diffs (13 lines):
diff -r b273c2533e0d -r e94197bb9507 account.py
--- a/account.pySat Oct 03 12:24:19 2020 +0100
+++ b/account.pySat Oct 03 12:26:12 2020 +0100
@@ -2673,6 +2673,9 @@
])
def default_start(self, fields):
+pool = Pool()
+Account = pool.get('account.account')
+
defaults = {}
charts = Account.search([
('parent', '=', None),
[tryton-commits] changeset in weblate:default Translated using Weblate (Dutch)
changeset b4a5bb0a9390 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset;node=b4a5bb0a9390 description: Translated using Weblate (Dutch) Currently translated at 100.0% (211 of 211 strings) Translation: Tryton/sao Translate-URL: https://translate.tryton.org/projects/tryton/sao/nl/ diffstat: sao/locale/nl.po | 47 --- 1 files changed, 28 insertions(+), 19 deletions(-) diffs (107 lines): diff -r e2c8f11e55aa -r b4a5bb0a9390 sao/locale/nl.po --- a/sao/locale/nl.po Fri Oct 02 12:05:44 2020 + +++ b/sao/locale/nl.po Sat Oct 03 07:09:24 2020 + @@ -1,3 +1,18 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-03 10:18+\n" +"PO-Revision-Date: 2020-10-03 10:18+\n" +"Last-Translator: Bert Defoor \n" +"Language-Team: LANGUAGE \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2.2\n" + # Generated by grunt-xgettext on Wed May 01 2019 00:09:20 GMT+0200 (CEST) msgid "Are your sure to leave?" msgstr "Ben je zeker dat je weggaat?" @@ -57,7 +72,7 @@ msgstr "Afdrukken" msgid "E-Mail" -msgstr "" +msgstr "E-mail" msgid "Previous tab" msgstr "Vorig tabblad" @@ -129,11 +144,10 @@ msgstr "Voeg een nota toe aan het veld" msgid "E-Mail..." -msgstr "" +msgstr "E-mail..." -#, fuzzy msgid "Send an e-mail using the record" -msgstr "Voeg een nota toe aan het veld" +msgstr "Stuur een e-mail met behulp van het record" msgid "Export" msgstr "Exporteren" @@ -206,9 +220,8 @@ msgid "Add..." msgstr "Toevoegen..." -#, fuzzy msgid "Template" -msgstr "Relatie" +msgstr "Sjabloon" msgid "Attachment (%1)" msgstr "Bijlage (%1)" @@ -610,24 +623,22 @@ msgstr "Definitie van %1 overschrijven?" msgid "E-mail %1" -msgstr "" +msgstr "E-mail %1" -#, fuzzy msgid "To:" -msgstr "Aan" +msgstr "Aan:" msgid "Cc:" -msgstr "" +msgstr "Cc:" msgid "Bcc:" -msgstr "" +msgstr "Bcc:" msgid "Subject:" -msgstr "" +msgstr "Onderwerp:" -#, fuzzy msgid "Reports" -msgstr "Programmafout melden" +msgstr "Rapporten" # msgid "" @@ -642,16 +653,14 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 4.1.1\n" -#, fuzzy msgid "Attachments" -msgstr "Bijlage" +msgstr "Bijlagen" msgid "Send" -msgstr "" +msgstr "Sturen" -#, fuzzy msgid "Remove attachment" -msgstr "Bijlage" +msgstr "Bijlage verwijderen" msgid "Wizard" msgstr "Assistent"
