[tryton-commits] changeset in trytond:5.8 Add missing new lines on docs
changeset 406b95a3ae8d in trytond:5.8 details: https://hg.tryton.org/trytond?cmd=changeset=406b95a3ae8d description: Add missing new lines on docs issue10887 review387211002 (grafted from 71e538c0e6ea1f94198927715e0da1d25e908fa5) diffstat: doc/ref/models/models.rst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r 41ac6c023d71 -r 406b95a3ae8d doc/ref/models/models.rst --- a/doc/ref/models/models.rst Tue Oct 19 00:22:08 2021 +0200 +++ b/doc/ref/models/models.rst Wed Oct 20 15:16:10 2021 +0200 @@ -37,13 +37,16 @@ into the queue. .. attribute:: Model._fields + It contains a dictionary with the field name as key and its :class:`~trytond.model.field` instance as value. .. attribute:: Model._record + It stores the record class to store internaly the values of the instances. .. attribute:: Model._defaults + It contains a dictionary with the field name as key and its default method as value.
[tryton-commits] changeset in trytond:6.0 Add missing new lines on docs
changeset b02d8774b6e9 in trytond:6.0 details: https://hg.tryton.org/trytond?cmd=changeset=b02d8774b6e9 description: Add missing new lines on docs issue10887 review387211002 (grafted from 71e538c0e6ea1f94198927715e0da1d25e908fa5) diffstat: doc/ref/models/models.rst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r eb37e31d8eda -r b02d8774b6e9 doc/ref/models/models.rst --- a/doc/ref/models/models.rst Tue Oct 19 00:22:08 2021 +0200 +++ b/doc/ref/models/models.rst Wed Oct 20 15:16:10 2021 +0200 @@ -42,13 +42,16 @@ into the queue. .. attribute:: Model._fields + It contains a dictionary with the field name as key and its :class:`~trytond.model.field` instance as value. .. attribute:: Model._record + It stores the record class to store internaly the values of the instances. .. attribute:: Model._defaults + It contains a dictionary with the field name as key and its default method as value.
[tryton-commits] changeset in trytond:5.0 Set the target field name in the contex...
changeset 3de5a88c76dd in trytond:5.0
details: https://hg.tryton.org/trytond?cmd=changeset=3de5a88c76dd
description:
Set the target field name in the context to get the size
The getter of 'data_size' field must use the name 'data' in the context
instead
of 'data_size'.
issue10849
review383301002
(grafted from 7166741cf718c8750d1dae951df49eec989e2d7b)
diffstat:
trytond/ir/attachment.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 77ab3a4e6165 -r 3de5a88c76dd trytond/ir/attachment.py
--- a/trytond/ir/attachment.py Fri Oct 15 17:09:30 2021 +0200
+++ b/trytond/ir/attachment.py Tue Oct 19 00:22:08 2021 +0200
@@ -90,7 +90,7 @@
def get_size(self, name):
with Transaction().set_context({
-'%s.%s' % (self.__name__, name): 'size',
+'%s.%s' % (self.__name__, name[:-len('_size')]): 'size',
}):
record = self.__class__(self.id)
return record.data
[tryton-commits] changeset in trytond:5.8 Set the target field name in the contex...
changeset 41ac6c023d71 in trytond:5.8
details: https://hg.tryton.org/trytond?cmd=changeset=41ac6c023d71
description:
Set the target field name in the context to get the size
The getter of 'data_size' field must use the name 'data' in the context
instead
of 'data_size'.
issue10849
review383301002
(grafted from 7166741cf718c8750d1dae951df49eec989e2d7b)
diffstat:
trytond/ir/attachment.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 084d41bb8592 -r 41ac6c023d71 trytond/ir/attachment.py
--- a/trytond/ir/attachment.py Fri Oct 15 17:09:03 2021 +0200
+++ b/trytond/ir/attachment.py Tue Oct 19 00:22:08 2021 +0200
@@ -93,7 +93,7 @@
def get_size(self, name):
with Transaction().set_context({
-'%s.%s' % (self.__name__, name): 'size',
+'%s.%s' % (self.__name__, name[:-len('_size')]): 'size',
}):
record = self.__class__(self.id)
return record.data
[tryton-commits] changeset in trytond:6.0 Set the target field name in the contex...
changeset eb37e31d8eda in trytond:6.0
details: https://hg.tryton.org/trytond?cmd=changeset=eb37e31d8eda
description:
Set the target field name in the context to get the size
The getter of 'data_size' field must use the name 'data' in the context
instead
of 'data_size'.
issue10849
review383301002
(grafted from 7166741cf718c8750d1dae951df49eec989e2d7b)
diffstat:
trytond/ir/attachment.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 38fa3f883966 -r eb37e31d8eda trytond/ir/attachment.py
--- a/trytond/ir/attachment.py Fri Oct 15 19:15:14 2021 +0200
+++ b/trytond/ir/attachment.py Tue Oct 19 00:22:08 2021 +0200
@@ -88,7 +88,7 @@
def get_size(self, name):
with Transaction().set_context({
-'%s.%s' % (self.__name__, name): 'size',
+'%s.%s' % (self.__name__, name[:-len('_size')]): 'size',
}):
record = self.__class__(self.id)
return record.data
[tryton-commits] changeset in trytond:6.0 Do not change action name if menu has m...
changeset 38fa3f883966 in trytond:6.0 details: https://hg.tryton.org/trytond?cmd=changeset=38fa3f883966 description: Do not change action name if menu has multiple keywords issue10828 review353011002 (grafted from d6f44538ceada798a22083c925228a00c4718e28) diffstat: trytond/ir/action.py | 7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (18 lines): diff -r 6e8422f9e0d8 -r 38fa3f883966 trytond/ir/action.py --- a/trytond/ir/action.py Fri Oct 15 17:08:01 2021 +0200 +++ b/trytond/ir/action.py Fri Oct 15 19:15:14 2021 +0200 @@ -273,10 +273,11 @@ keywords.append(value) if keyword == 'tree_open' and model == Menu.__name__: menu = Menu(model_id) -if menu.parent: -for value in keywords: -if value['type'] == 'ir.action.act_window': +for value in keywords: +if value['type'] == 'ir.action.act_window': +if len(keywords) == 1: value['name'] = menu.name +if menu.parent: parent = menu.parent if parent.name == value['name']: parent = parent.parent
[tryton-commits] changeset in tryton:5.8 Fix typo in Gdk identifier
changeset 80b122d3d328 in tryton:5.8 details: https://hg.tryton.org/tryton?cmd=changeset=80b122d3d328 description: Fix typo in Gdk identifier issue10882 review354241002 (grafted from ad169d67663af50ba14d203d891bdf040a975c56) diffstat: tryton/gui/window/win_export.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e8a99916f407 -r 80b122d3d328 tryton/gui/window/win_export.py --- a/tryton/gui/window/win_export.py Tue Oct 19 00:23:30 2021 +0200 +++ b/tryton/gui/window/win_export.py Wed Oct 20 15:18:58 2021 +0200 @@ -415,7 +415,7 @@ return True def export_keypress(self, treeview, event): -if event.keyval not in [Gdk.KEY_Return, Gdk.KEY_.space]: +if event.keyval not in [Gdk.KEY_Return, Gdk.KEY_space]: return model, selected = treeview.get_selection().get_selected() if not selected:
[tryton-commits] changeset in tryton:6.0 Fix typo in Gdk identifier
changeset 310c54d59854 in tryton:6.0 details: https://hg.tryton.org/tryton?cmd=changeset=310c54d59854 description: Fix typo in Gdk identifier issue10882 review354241002 (grafted from ad169d67663af50ba14d203d891bdf040a975c56) diffstat: tryton/gui/window/win_export.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ffe200f85eb7 -r 310c54d59854 tryton/gui/window/win_export.py --- a/tryton/gui/window/win_export.py Tue Oct 19 00:23:30 2021 +0200 +++ b/tryton/gui/window/win_export.py Wed Oct 20 15:18:58 2021 +0200 @@ -444,7 +444,7 @@ return True def export_keypress(self, treeview, event): -if event.keyval not in [Gdk.KEY_Return, Gdk.KEY_.space]: +if event.keyval not in [Gdk.KEY_Return, Gdk.KEY_space]: return model, selected = treeview.get_selection().get_selected() if not selected:
[tryton-commits] changeset in tryton:5.8 Use changed event to trigger focus out i...
changeset e8a99916f407 in tryton:5.8
details: https://hg.tryton.org/tryton?cmd=changeset=e8a99916f407
description:
Use changed event to trigger focus out in Selection widget of Dict
issue10856
review389101002
(grafted from 795501d0c8d174bc7c0c4baf4449fae150c33b46)
diffstat:
tryton/gui/window/view_form/view/form_gtk/dictionary.py | 20 +++-
1 files changed, 13 insertions(+), 7 deletions(-)
diffs (41 lines):
diff -r aefd45038be4 -r e8a99916f407
tryton/gui/window/view_form/view/form_gtk/dictionary.py
--- a/tryton/gui/window/view_form/view/form_gtk/dictionary.py Fri Oct 15
17:13:58 2021 +0200
+++ b/tryton/gui/window/view_form/view/form_gtk/dictionary.py Tue Oct 19
00:23:30 2021 +0200
@@ -99,13 +99,11 @@
# customizing entry
child = widget.get_child()
child.props.activates_default = True
-child.connect('changed', self.parent_widget.send_modified)
+child.connect('changed', self._changed)
child.connect('focus-out-event',
lambda w, e: self.parent_widget._focus_out())
child.connect('activate',
lambda w: self.parent_widget._focus_out())
-widget.connect('notify::active',
-lambda w, e: self.parent_widget._focus_out())
widget.connect(
'scroll-event',
lambda c, e: c.stop_emission_by_name('scroll-event'))
@@ -156,10 +154,18 @@
if selection[1] == value:
active = i
break
-self.widget.set_active(active)
-if active == -1:
-# When setting no item GTK doesn't clear the entry
-self.widget.get_child().set_text('')
+child = self.widget.get_child()
+child.handler_block_by_func(self._changed)
+try:
+self.widget.set_active(active)
+if active == -1:
+# When setting no item GTK doesn't clear the entry
+child.set_text('')
+finally:
+child.handler_unblock_by_func(self._changed)
+
+def _changed(self, selection):
+GLib.idle_add(self.parent_widget._focus_out)
def set_readonly(self, readonly):
self.widget.set_sensitive(not readonly)
[tryton-commits] changeset in tryton:6.0 Use changed event to trigger focus out i...
changeset ffe200f85eb7 in tryton:6.0
details: https://hg.tryton.org/tryton?cmd=changeset=ffe200f85eb7
description:
Use changed event to trigger focus out in Selection widget of Dict
issue10856
review389101002
(grafted from 795501d0c8d174bc7c0c4baf4449fae150c33b46)
diffstat:
tryton/gui/window/view_form/view/form_gtk/dictionary.py | 20 +++-
1 files changed, 13 insertions(+), 7 deletions(-)
diffs (41 lines):
diff -r c881999a79f9 -r ffe200f85eb7
tryton/gui/window/view_form/view/form_gtk/dictionary.py
--- a/tryton/gui/window/view_form/view/form_gtk/dictionary.py Fri Oct 15
17:11:13 2021 +0200
+++ b/tryton/gui/window/view_form/view/form_gtk/dictionary.py Tue Oct 19
00:23:30 2021 +0200
@@ -99,13 +99,11 @@
# customizing entry
child = widget.get_child()
child.props.activates_default = True
-child.connect('changed', self.parent_widget.send_modified)
+child.connect('changed', self._changed)
child.connect('focus-out-event',
lambda w, e: self.parent_widget._focus_out())
child.connect('activate',
lambda w: self.parent_widget._focus_out())
-widget.connect('notify::active',
-lambda w, e: self.parent_widget._focus_out())
widget.connect(
'scroll-event',
lambda c, e: c.stop_emission_by_name('scroll-event'))
@@ -156,10 +154,18 @@
if selection[1] == value:
active = i
break
-self.widget.set_active(active)
-if active == -1:
-# When setting no item GTK doesn't clear the entry
-self.widget.get_child().set_text('')
+child = self.widget.get_child()
+child.handler_block_by_func(self._changed)
+try:
+self.widget.set_active(active)
+if active == -1:
+# When setting no item GTK doesn't clear the entry
+child.set_text('')
+finally:
+child.handler_unblock_by_func(self._changed)
+
+def _changed(self, selection):
+GLib.idle_add(self.parent_widget._focus_out)
def set_readonly(self, readonly):
self.widget.set_sensitive(not readonly)
[tryton-commits] changeset in sao:5.8 Run tests in UTC and use millisecond precis...
changeset 639b113c44b5 in sao:5.8
details: https://hg.tryton.org/sao?cmd=changeset=639b113c44b5
description:
Run tests in UTC and use millisecond precision for moment comparison
Backout of changeset d5742068fd8d
issue10846
review389071002
(grafted from a4689a7b33a2432e723d3a3fba36eafa9eec323f)
diffstat:
Gruntfile.js | 3 +++
src/pyson.js | 6 +++---
src/sao.js | 5 +
tests/sao.js | 38 +++---
4 files changed, 26 insertions(+), 26 deletions(-)
diffs (175 lines):
diff -r 15eb97ea3727 -r 639b113c44b5 Gruntfile.js
--- a/Gruntfile.js Fri Oct 15 17:19:56 2021 +0200
+++ b/Gruntfile.js Tue Oct 19 00:20:37 2021 +0200
@@ -141,6 +141,9 @@
args: [
'--no-sandbox',
],
+env: {
+TZ: 'UTC',
+},
},
},
all: ['tests/*.html']
diff -r 15eb97ea3727 -r 639b113c44b5 src/pyson.js
--- a/src/pyson.js Fri Oct 15 17:19:56 2021 +0200
+++ b/src/pyson.js Tue Oct 19 00:20:37 2021 +0200
@@ -452,7 +452,7 @@
var values = [value.s1, value.s2];
for (var i=0; i < 2; i++) {
if (values[i] instanceof moment) {
-values[i] = values[i].unix();
+values[i] = values[i].valueOf();
}
else {
values[i] = Number(values[i]);
@@ -759,10 +759,10 @@
Sao.PYSON.Date.eval_ = function(value, context) {
var date = value.start;
if (date && date.isDateTime) {
-date = Sao.Date(date.year(), date.month(), date.date(), true);
+date = Sao.Date(date.year(), date.month(), date.date());
}
if (!date || !date.isDate) {
-date = Sao.Date(undefined, undefined, undefined, true);
+date = Sao.Date();
}
if (value.y) date.year(value.y);
if (value.M) date.month(value.M - 1);
diff -r 15eb97ea3727 -r 639b113c44b5 src/sao.js
--- a/src/sao.jsFri Oct 15 17:19:56 2021 +0200
+++ b/src/sao.jsTue Oct 19 00:20:37 2021 +0200
@@ -189,7 +189,7 @@
}
};
-Sao.Date = function(year, month, day, utc) {
+Sao.Date = function(year, month, day) {
var date;
if (month === undefined) {
date = moment(year);
@@ -198,9 +198,6 @@
else {
date = moment();
}
-if (utc) {
-date.utc();
-}
date.year(year);
date.month(month);
date.date(day);
diff -r 15eb97ea3727 -r 639b113c44b5 tests/sao.js
--- a/tests/sao.js Fri Oct 15 17:19:56 2021 +0200
+++ b/tests/sao.js Tue Oct 19 00:20:37 2021 +0200
@@ -474,18 +474,18 @@
'Date(2020, 0, 2)))');
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Greater(
-new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0),
-Sao.Date(2020, 0, 1, true)));
-QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), false,
-'decode(Greater(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0), ' +
-'Date(2020, 0, 1, true)))');
+new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 1000),
+Sao.Date(2020, 0, 1)));
+QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), true,
+'decode(Greater(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 1000), ' +
+'Date(2020, 0, 1)))');
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Greater(
new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0),
-Sao.Date(2020, 0, 1, true), true));
+Sao.Date(2020, 0, 1), true));
QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), true,
'decode(Greater(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0), ' +
-'Date(2020, 0, 1, true), true))');
+'Date(2020, 0, 1), true))');
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Greater(
new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0),
@@ -496,7 +496,7 @@
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Greater(
new Sao.PYSON.Date(2020, 1, 1),
-Sao.Date(2020, 0, 1, true)));
+Sao.Date(2020, 0, 1)));
QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), false,
'decode(Greater(PYSON.Date(2020, 1, 1), Date(2020, 0, 1)))');
@@ -593,10 +593,10 @@
"Less(0, 1, false)");
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Less(
-new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0),
+new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 1000),
Sao.Date(2020, 0, 1)));
QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), false,
-'decode(Less(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0), ' +
+'decode(Less(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 1000), ' +
'Date(2020, 0, 1)))');
eval_ = new
[tryton-commits] changeset in sao:6.0 Run tests in UTC and use millisecond precis...
changeset a52c997b7d6d in sao:6.0
details: https://hg.tryton.org/sao?cmd=changeset=a52c997b7d6d
description:
Run tests in UTC and use millisecond precision for moment comparison
Backout of changeset d5742068fd8d
issue10846
review389071002
(grafted from a4689a7b33a2432e723d3a3fba36eafa9eec323f)
diffstat:
Gruntfile.js | 3 +++
src/pyson.js | 6 +++---
src/sao.js | 5 +
tests/sao.js | 38 +++---
4 files changed, 26 insertions(+), 26 deletions(-)
diffs (175 lines):
diff -r 3397b0f37355 -r a52c997b7d6d Gruntfile.js
--- a/Gruntfile.js Mon Oct 18 12:26:34 2021 +0200
+++ b/Gruntfile.js Tue Oct 19 00:20:37 2021 +0200
@@ -140,6 +140,9 @@
args: [
'--no-sandbox',
],
+env: {
+TZ: 'UTC',
+},
},
},
all: ['tests/*.html']
diff -r 3397b0f37355 -r a52c997b7d6d src/pyson.js
--- a/src/pyson.js Mon Oct 18 12:26:34 2021 +0200
+++ b/src/pyson.js Tue Oct 19 00:20:37 2021 +0200
@@ -453,7 +453,7 @@
var values = [value.s1, value.s2];
for (var i=0; i < 2; i++) {
if (values[i] instanceof moment) {
-values[i] = values[i].unix();
+values[i] = values[i].valueOf();
}
else {
values[i] = Number(values[i]);
@@ -760,10 +760,10 @@
Sao.PYSON.Date.eval_ = function(value, context) {
var date = value.start;
if (date && date.isDateTime) {
-date = Sao.Date(date.year(), date.month(), date.date(), true);
+date = Sao.Date(date.year(), date.month(), date.date());
}
if (!date || !date.isDate) {
-date = Sao.Date(undefined, undefined, undefined, true);
+date = Sao.Date();
}
if (value.y) date.year(value.y);
if (value.M) date.month(value.M - 1);
diff -r 3397b0f37355 -r a52c997b7d6d src/sao.js
--- a/src/sao.jsMon Oct 18 12:26:34 2021 +0200
+++ b/src/sao.jsTue Oct 19 00:20:37 2021 +0200
@@ -198,7 +198,7 @@
}
};
-Sao.Date = function(year, month, day, utc) {
+Sao.Date = function(year, month, day) {
var date;
if (month === undefined) {
date = moment(year);
@@ -207,9 +207,6 @@
else {
date = moment();
}
-if (utc) {
-date.utc();
-}
date.year(year);
date.month(month);
date.date(day);
diff -r 3397b0f37355 -r a52c997b7d6d tests/sao.js
--- a/tests/sao.js Mon Oct 18 12:26:34 2021 +0200
+++ b/tests/sao.js Tue Oct 19 00:20:37 2021 +0200
@@ -468,18 +468,18 @@
'Date(2020, 0, 2)))');
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Greater(
-new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0),
-Sao.Date(2020, 0, 1, true)));
-QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), false,
-'decode(Greater(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0), ' +
-'Date(2020, 0, 1, true)))');
+new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 1000),
+Sao.Date(2020, 0, 1)));
+QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), true,
+'decode(Greater(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 1000), ' +
+'Date(2020, 0, 1)))');
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Greater(
new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0),
-Sao.Date(2020, 0, 1, true), true));
+Sao.Date(2020, 0, 1), true));
QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), true,
'decode(Greater(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0), ' +
-'Date(2020, 0, 1, true), true))');
+'Date(2020, 0, 1), true))');
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Greater(
new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0),
@@ -490,7 +490,7 @@
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Greater(
new Sao.PYSON.Date(2020, 1, 1),
-Sao.Date(2020, 0, 1, true)));
+Sao.Date(2020, 0, 1)));
QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), false,
'decode(Greater(PYSON.Date(2020, 1, 1), Date(2020, 0, 1)))');
@@ -587,10 +587,10 @@
"Less(0, 1, false)");
eval_ = new Sao.PYSON.Encoder().encode(new Sao.PYSON.Less(
-new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0),
+new Sao.PYSON.DateTime(2020, 1, 1, 0, 0, 0, 1000),
Sao.Date(2020, 0, 1)));
QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), false,
-'decode(Less(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 0), ' +
+'decode(Less(PYSON.DateTime(2020, 1, 1, 0, 0, 0, 1000), ' +
'Date(2020, 0, 1)))');
eval_ = new
[tryton-commits] changeset in sao:6.0 Make email addresses field fill all availab...
changeset 3397b0f37355 in sao:6.0
details: https://hg.tryton.org/sao?cmd=changeset=3397b0f37355
description:
Make email addresses field fill all available space
issue10760
review362651012
(grafted from 26335e50cc8b84a77284fc4edc91a0fbcdf9f3ad)
diffstat:
src/common.js | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diffs (11 lines):
diff -r 950309cbcad4 -r 3397b0f37355 src/common.js
--- a/src/common.js Fri Oct 15 17:17:52 2021 +0200
+++ b/src/common.js Mon Oct 18 12:26:34 2021 +0200
@@ -3498,7 +3498,6 @@
} else {
el.wrap('');
this.dropdown = el.parent();
-this.dropdown.css('display', 'table');
}
this.input = el.find('input').add(el.filter('input')).first();
this.input.attr('autocomplete', 'off');
[tryton-commits] changeset in modules/stock_quantity_issue:6.0 Delete open record...
changeset a075c42fe425 in modules/stock_quantity_issue:6.0
details:
https://hg.tryton.org/modules/stock_quantity_issue?cmd=changeset=a075c42fe425
description:
Delete open records without warehouse
issue10822
review369891004
(grafted from 0723c6b65ee384a24efee0402640e5c65270d3fa)
diffstat:
stock.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r 34494295ea74 -r a075c42fe425 stock.py
--- a/stock.py Sat May 15 22:37:24 2021 +0200
+++ b/stock.py Fri Oct 15 19:12:36 2021 +0200
@@ -217,7 +217,8 @@
('company', '=', company.id),
('state', '=', 'open'),
])
-opens = [i for i in opens if i.warehouse in warehouses]
+opens = [
+i for i in opens if i.warehouse in warehouses or not i.warehouse]
cls.delete(opens)
issues = {}
[tryton-commits] changeset in modules/stock_quantity_early_planning:6.0 Pass name...
changeset dac241902e83 in modules/stock_quantity_early_planning:6.0
details:
https://hg.tryton.org/modules/stock_quantity_early_planning?cmd=changeset=dac241902e83
description:
Pass name parameter to super call of getter
issue10824
review383211002
(grafted from a2639d2639dc5a030f652bf47e54a95aab6c1413)
diffstat:
stock.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 2ef015e4b4d3 -r dac241902e83 stock.py
--- a/stock.py Fri Oct 15 19:12:36 2021 +0200
+++ b/stock.py Fri Oct 15 19:14:03 2021 +0200
@@ -339,7 +339,7 @@
def get_moves(self, name):
pool = Pool()
Production = pool.get('production')
-moves = super().get_moves()
+moves = super().get_moves(name)
if isinstance(self.origin, Production):
for move in self.origin.inputs + self.origin.outputs:
moves.extend([p.id for p in move.quantity_early_plans])
[tryton-commits] changeset in modules/stock_quantity_early_planning:6.0 Delete op...
changeset 2ef015e4b4d3 in modules/stock_quantity_early_planning:6.0
details:
https://hg.tryton.org/modules/stock_quantity_early_planning?cmd=changeset=2ef015e4b4d3
description:
Delete open records without warehouse
issue10822
review369891004
(grafted from 427c0d552da2fb149ecc1df1ec6731ebb2bd3ba2)
diffstat:
stock.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r 4557c59d9d79 -r 2ef015e4b4d3 stock.py
--- a/stock.py Mon May 03 15:49:25 2021 +0200
+++ b/stock.py Fri Oct 15 19:12:36 2021 +0200
@@ -241,7 +241,8 @@
('company', '=', company.id),
('state', '=', 'open'),
])
-opens = [p for p in opens if p.warehouse in warehouses]
+opens = [
+p for p in opens if p.warehouse in warehouses or not p.warehouse]
cls.delete(opens)
plans = {}
[tryton-commits] changeset in modules/stock_lot_unit:5.0 Only test inventory unit...
changeset 79cb4f91924e in modules/stock_lot_unit:5.0
details:
https://hg.tryton.org/modules/stock_lot_unit?cmd=changeset=79cb4f91924e
description:
Only test inventory units for lines with quantity
issue10821
review366031002
(grafted from 942ec3917dcf0d7d221d2dfd0eada92c90253005)
diffstat:
stock.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (14 lines):
diff -r c154439c7ca7 -r 79cb4f91924e stock.py
--- a/stock.py Thu Jun 17 22:10:41 2021 +0200
+++ b/stock.py Wed Oct 13 11:02:43 2021 +0200
@@ -121,7 +121,9 @@
Move = pool.get('stock.move')
for inventory in inventories:
for line in inventory.lines:
-if (line.lot and line.lot.unit
+if (line.quantity is not None
+and line.lot
+and line.lot.unit
and line.quantity > line.lot.unit_quantity):
Move.raise_user_error('lot_unit_quantity_greater', {
'lot': line.lot.rec_name,
[tryton-commits] changeset in modules/stock_lot_unit:6.0 Only test inventory unit...
changeset d80e94c40c02 in modules/stock_lot_unit:6.0
details:
https://hg.tryton.org/modules/stock_lot_unit?cmd=changeset=d80e94c40c02
description:
Only test inventory units for lines with quantity
issue10821
review366031002
(grafted from 942ec3917dcf0d7d221d2dfd0eada92c90253005)
diffstat:
stock.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (14 lines):
diff -r 04e0bc0ca18d -r d80e94c40c02 stock.py
--- a/stock.py Mon May 03 15:48:58 2021 +0200
+++ b/stock.py Wed Oct 13 11:02:43 2021 +0200
@@ -130,7 +130,9 @@
def confirm(cls, inventories):
for inventory in inventories:
for line in inventory.lines:
-if (line.lot and line.lot.unit
+if (line.quantity is not None
+and line.lot
+and line.lot.unit
and line.quantity > line.lot.unit_quantity):
raise LotUnitQuantityError(
gettext('stock_lot_unit.msg_lot_unit_quantity_greater',
[tryton-commits] changeset in modules/stock:6.0 Use unique ID for today record in...
changeset ef20d6d41683 in modules/stock:6.0
details: https://hg.tryton.org/modules/stock?cmd=changeset=ef20d6d41683
description:
Use unique ID for today record in ProductQuantitiesByWarehouse query
We must use a unique ID to ensure to not collide with records in the
transaction cache.
issue10831
review353021002
(grafted from a1917dccb59b826c803cdc58d939aea334695705)
diffstat:
product.py | 13 +++--
1 files changed, 7 insertions(+), 6 deletions(-)
diffs (49 lines):
diff -r 42975b4ee4cc -r ef20d6d41683 product.py
--- a/product.pyThu Sep 16 23:47:02 2021 +0200
+++ b/product.pyFri Oct 15 19:16:47 2021 +0200
@@ -552,7 +552,7 @@
from_ = move.join(product, condition=move.product == product.id)
product_clause = product.template.in_(product_template or [-1])
product_column = Concat('product.template,', product.template)
-products = ['product.template,%s' % i for i in product_template]
+products = [('product.template', i) for i in product_template]
else:
product = context.get('product', -1)
if product is None:
@@ -561,7 +561,7 @@
product = [product]
product_clause = move.product.in_(product or [-1])
product_column = Concat('product.product,', move.product)
-products = ['product.product,%s' % i for i in product]
+products = [('product.product', i) for i in product]
if 'warehouse' in context:
warehouse = Location(context.get('warehouse'))
@@ -576,7 +576,7 @@
], query=True, order=[]))
date_column = Coalesce(move.effective_date, move.planned_date)
query = (from_.select(
-(Max(move.id) + len(products)).as_('id'),
+Max(move.id * 3).as_('id'),
Literal(0).as_('create_uid'),
CurrentTimestamp().as_('create_date'),
Literal(None).as_('write_uid'),
@@ -598,14 +598,15 @@
| (date_column >= today)),
group_by=(date_column, product_column, move.company),
with_=warehouse))
-for i, product in enumerate(products):
+for model, id_ in products:
+gap = ['product.template', 'product.product'].index(model) + 1
query |= Select([
-Literal(i).as_('id'),
+Literal(id_ * 3 + gap).as_('id'),
Literal(0).as_('create_uid'),
CurrentTimestamp().as_('create_date'),
Literal(None).as_('write_uid'),
Literal(None).as_('write_date'),
-Literal(product).as_('product'),
+Literal('%s,%s' % (model, id_)).as_('product'),
Literal(today).as_('date'),
Literal(context.get('company', -1)).as_('company'),
])
[tryton-commits] changeset in modules/notification_email:5.8 Do not migrate log i...
changeset daa23021a482 in modules/notification_email:5.8
details:
https://hg.tryton.org/modules/notification_email?cmd=changeset=daa23021a482
description:
Do not migrate log if it has resource
issue10855
review364201002
(grafted from 789a2cf4007744330cfe70cfe81a9eb2d9750e96)
diffstat:
notification.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 4e541f0511ca -r daa23021a482 notification.py
--- a/notification.py Wed Sep 01 22:57:57 2021 +0200
+++ b/notification.py Wed Oct 13 18:27:52 2021 +0200
@@ -385,7 +385,7 @@
cursor.execute(*table.update(
[table.notification, table.resource],
[notification, resource],
-where=table.trigger != Null))
+where=(table.trigger != Null) & (table.resource == Null)))
table_h.not_null_action('trigger', 'remove')
def get_date(self, name):
[tryton-commits] changeset in modules/notification_email:6.0 Do not migrate log i...
changeset 40cd7f9613a2 in modules/notification_email:6.0
details:
https://hg.tryton.org/modules/notification_email?cmd=changeset=40cd7f9613a2
description:
Do not migrate log if it has resource
issue10855
review364201002
(grafted from 789a2cf4007744330cfe70cfe81a9eb2d9750e96)
diffstat:
notification.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 537105bf9880 -r 40cd7f9613a2 notification.py
--- a/notification.py Wed Sep 01 22:57:36 2021 +0200
+++ b/notification.py Wed Oct 13 18:27:52 2021 +0200
@@ -389,7 +389,7 @@
cursor.execute(*table.update(
[table.notification, table.resource],
[notification, resource],
-where=table.trigger != Null))
+where=(table.trigger != Null) & (table.resource == Null)))
table_h.not_null_action('trigger', 'remove')
def get_date(self, name):
[tryton-commits] changeset in modules/account:default Allow browsing closed Journ...
changeset 6af390be96cf in modules/account:default details: https://hg.tryton.org/modules/account?cmd=changeset=6af390be96cf description: Allow browsing closed Journals - Periods diffstat: journal.xml | 5 - 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 790fd7b11f11 -r 6af390be96cf journal.xml --- a/journal.xml Mon Oct 18 14:48:58 2021 +0200 +++ b/journal.xml Fri Oct 22 19:28:00 2021 +0200 @@ -142,7 +142,10 @@ Journals - Periods account.journal.period +
[tryton-commits] changeset in modules/stock:default Manage multiple arguments on ...
changeset 49b558494120 in modules/stock:default details: https://hg.tryton.org/modules/stock?cmd=changeset=49b558494120 description: Manage multiple arguments on inventory write issue10894 review362981002 diffstat: inventory.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r cba100c1c8ab -r 49b558494120 inventory.py --- a/inventory.py Thu Oct 21 00:07:14 2021 +0200 +++ b/inventory.py Fri Oct 22 15:47:33 2021 +0200 @@ -214,8 +214,9 @@ return inventories @classmethod -def write(cls, inventories, values): -super(Inventory, cls).write(inventories, values) +def write(cls, *args): +super().write(*args) +inventories = cls.browse(set(sum(args[::2], []))) cls.complete_lines(inventories, fill=False) @classmethod
[tryton-commits] changeset in modules/incoterm:default Get incoterm from quotatio...
changeset 430d98793d1f in modules/incoterm:default
details: https://hg.tryton.org/modules/incoterm?cmd=changeset=430d98793d1f
description:
Get incoterm from quotation instead of line
issue10891
review387251002
diffstat:
purchase.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (15 lines):
diff -r 010c463a9d21 -r 430d98793d1f purchase.py
--- a/purchase.py Sun Jul 04 17:54:47 2021 +0200
+++ b/purchase.py Fri Oct 22 15:46:47 2021 +0200
@@ -64,9 +64,9 @@
def _group_purchase_key(cls, requests, request):
return super()._group_purchase_key(requests, request) + (
('incoterm',
-request.best_quotation_line.incoterm
+request.best_quotation_line.quotation.incoterm
if request.best_quotation_line else None),
('incoterm_location',
-request.best_quotation_line.incoterm_location
+request.best_quotation_line.quotation.incoterm_location
if request.best_quotation_line else None),
)
[tryton-commits] changeset in weblate:default Translated using Weblate (Catalan)
changeset 1f5b4987c5bb in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset=1f5b4987c5bb description: Translated using Weblate (Catalan) Currently translated at 63.3% (19 of 30 strings) Translation: Tryton/stock_package_shipping_sendcloud Translate-URL: https://translate.tryton.org/projects/tryton/stock_package_shipping_sendcloud/ca/ diffstat: modules/stock_package_shipping_sendcloud/locale/ca.po | 53 -- 1 files changed, 34 insertions(+), 19 deletions(-) diffs (116 lines): diff -r 1f11ec2f5743 -r 1f5b4987c5bb modules/stock_package_shipping_sendcloud/locale/ca.po --- a/modules/stock_package_shipping_sendcloud/locale/ca.po Fri Oct 22 12:15:54 2021 + +++ b/modules/stock_package_shipping_sendcloud/locale/ca.po Fri Oct 22 07:54:19 2021 + @@ -1,78 +1,93 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-10-22 12:20+\n" +"PO-Revision-Date: 2021-10-22 12:20+\n" +"Last-Translator: David Blanco Bautista \n" +"Language-Team: LANGUAGE \n" +"Language: ca\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.8.1\n" + msgctxt "field:carrier,sendcloud_format:" msgid "Format" -msgstr "" +msgstr "Format" msgctxt "field:carrier.credential.sendcloud,addresses:" msgid "Addresses" -msgstr "" +msgstr "Adreces" msgctxt "field:carrier.credential.sendcloud,company:" msgid "Company" -msgstr "" +msgstr "Empresa" msgctxt "field:carrier.credential.sendcloud,public_key:" msgid "Public Key" -msgstr "" +msgstr "Clau pública" msgctxt "field:carrier.credential.sendcloud,secret_key:" msgid "Secret Key" -msgstr "" +msgstr "Clau secreta" msgctxt "field:carrier.credential.sendcloud,shipping_methods:" msgid "Methods" -msgstr "" +msgstr "Mètodes" msgctxt "field:carrier.sendcloud.address,address:" msgid "Address" -msgstr "" +msgstr "Adreça" msgctxt "field:carrier.sendcloud.address,sendcloud:" msgid "Sendcloud" -msgstr "" +msgstr "Sendcloud" msgctxt "field:carrier.sendcloud.address,warehouse:" msgid "Warehouse" -msgstr "" +msgstr "Magatzem" msgctxt "field:carrier.sendcloud.shipping_method,carrier:" msgid "Carrier" -msgstr "" +msgstr "Transportista" msgctxt "field:carrier.sendcloud.shipping_method,sendcloud:" msgid "Sendcloud" -msgstr "" +msgstr "Sendcloud" msgctxt "field:carrier.sendcloud.shipping_method,shipping_method:" msgid "Shipping Method" -msgstr "" +msgstr "Mètode d'enviament" msgctxt "field:stock.package,sendcloud_shipping_id:" msgid "ID" -msgstr "" +msgstr "ID" msgctxt "field:stock.package,sendcloud_shipping_tracking_url:" msgid "Tracking URL" -msgstr "" +msgstr "URL de seguiment" msgctxt "help:carrier.sendcloud.address,address:" msgid "Leave empty for the Sendcloud default." -msgstr "" +msgstr "Deixar buit per al valor per defecte de Sendcloud." msgctxt "model:carrier.credential.sendcloud,name:" msgid "Sendcloud Credential" -msgstr "" +msgstr "Credencial Sendcloud" msgctxt "model:carrier.sendcloud.address,name:" msgid "Sendcloud Address" -msgstr "" +msgstr "Adreça Sendcloud" msgctxt "model:carrier.sendcloud.shipping_method,name:" msgid "Sendcloud Shipping Method" -msgstr "" +msgstr "Mètode d'enviament Sendcloud" msgctxt "model:ir.action,name:act_create_shipping_wizard" msgid "Create Sendcloud Shipping for Packages" -msgstr "" +msgstr "Crear enviament Sendcloud per a paquets" msgctxt "model:ir.action,name:act_credential_form" msgid "Sendcloud Credentials"
[tryton-commits] changeset in weblate:default Translated using Weblate (Catalan)
changeset 1f11ec2f5743 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset=1f11ec2f5743 description: Translated using Weblate (Catalan) Currently translated at 35.2% (18 of 51 strings) Translation: Tryton/stock_package_shipping_mygls Translate-URL: https://translate.tryton.org/projects/tryton/stock_package_shipping_mygls/ca/ diffstat: modules/stock_package_shipping_mygls/locale/ca.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 7e44c5b21d52 -r 1f11ec2f5743 modules/stock_package_shipping_mygls/locale/ca.po --- a/modules/stock_package_shipping_mygls/locale/ca.po Fri Oct 22 12:16:06 2021 + +++ b/modules/stock_package_shipping_mygls/locale/ca.po Fri Oct 22 12:15:54 2021 + @@ -4,7 +4,7 @@ "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-22 12:15+\n" "PO-Revision-Date: 2021-10-22 12:17+\n" -"Last-Translator: David Blanco Bautista \n" +"Last-Translator: Sergi Almacellas Abellana \n" "Language-Team: LANGUAGE \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -71,7 +71,7 @@ msgctxt "model:ir.action,name:act_create_shipping_mygls_wizard" msgid "Create MyGLS Shipping for Packages" -msgstr "Crear enviaments MyGLS per a paquets" +msgstr "Crear enviaments MyGLS pels paquets" msgctxt "model:ir.action,name:act_credential_form" msgid "MyGLS Credentials"
[tryton-commits] changeset in weblate:default Translated using Weblate (Catalan)
changeset 7e44c5b21d52 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset=7e44c5b21d52 description: Translated using Weblate (Catalan) Currently translated at 35.2% (18 of 51 strings) Translation: Tryton/stock_package_shipping_mygls Translate-URL: https://translate.tryton.org/projects/tryton/stock_package_shipping_mygls/ca/ diffstat: modules/stock_package_shipping_mygls/locale/ca.po | 10 -- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (45 lines): diff -r ad2d19820930 -r 7e44c5b21d52 modules/stock_package_shipping_mygls/locale/ca.po --- a/modules/stock_package_shipping_mygls/locale/ca.po Fri Oct 22 07:54:27 2021 + +++ b/modules/stock_package_shipping_mygls/locale/ca.po Fri Oct 22 12:16:06 2021 + @@ -3,7 +3,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-22 12:15+\n" -"PO-Revision-Date: 2021-10-22 12:15+\n" +"PO-Revision-Date: 2021-10-22 12:17+\n" "Last-Translator: David Blanco Bautista \n" "Language-Team: LANGUAGE \n" "Language: ca\n" @@ -75,25 +75,31 @@ msgctxt "model:ir.action,name:act_credential_form" msgid "MyGLS Credentials" -msgstr "" +msgstr "Credencials MyGLS" msgctxt "model:ir.message,text:msg_email_required" msgid "" "To validate shipment \"%(shipment)s\" you must add an email to party " "\"%(party)s\"." msgstr "" +"Per validar l'albarà \"%(shipment)s\", heu d'afegir un correu electrònic al " +"tercer \"%(party)s\"." msgctxt "model:ir.message,text:msg_mobile_required" msgid "" "To validate shipment \"%(shipment)s\" you must add a mobile number to party " "\"%(party)s\"." msgstr "" +"Per validar l'albarà \"%(shipment)s\", heu d'afegir un número de mòbil al " +"tercer \"%(party)s\"." msgctxt "model:ir.message,text:msg_mygls_api_error" msgid "" "MyGLS API call failed with the following error message:\n" "%(message)s" msgstr "" +"La trucada de l'API MyGLS ha fallat amb el següent missatge d'error:\n" +"%(message)s" msgctxt "model:ir.message,text:msg_phone_mobile_required" msgid ""
[tryton-commits] changeset in weblate:default Translated using Weblate (Catalan)
changeset ad2d19820930 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset=ad2d19820930 description: Translated using Weblate (Catalan) Currently translated at 27.4% (14 of 51 strings) Translation: Tryton/stock_package_shipping_mygls Translate-URL: https://translate.tryton.org/projects/tryton/stock_package_shipping_mygls/ca/ diffstat: modules/stock_package_shipping_mygls/locale/ca.po | 43 -- 1 files changed, 30 insertions(+), 13 deletions(-) diffs (94 lines): diff -r 83c59ab5ff33 -r ad2d19820930 modules/stock_package_shipping_mygls/locale/ca.po --- a/modules/stock_package_shipping_mygls/locale/ca.po Fri Oct 22 07:54:29 2021 + +++ b/modules/stock_package_shipping_mygls/locale/ca.po Fri Oct 22 07:54:27 2021 + @@ -1,60 +1,77 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-10-22 12:15+\n" +"PO-Revision-Date: 2021-10-22 12:15+\n" +"Last-Translator: David Blanco Bautista \n" +"Language-Team: LANGUAGE \n" +"Language: ca\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.8.1\n" + msgctxt "field:carrier,mygls_print_position:" msgid "Print Position" -msgstr "" +msgstr "Posició d’impressió" msgctxt "field:carrier,mygls_services:" msgid "Services" -msgstr "" +msgstr "Serveis" msgctxt "field:carrier,mygls_sms:" msgid "SMS" -msgstr "" +msgstr "SMS" msgctxt "field:carrier,mygls_type_of_printer:" msgid "Type of Printer" -msgstr "" +msgstr "Tipus d’impressora" msgctxt "field:carrier.credential.mygls,client_number:" msgid "Client Number" -msgstr "" +msgstr "Número de client" msgctxt "field:carrier.credential.mygls,company:" msgid "Company" -msgstr "" +msgstr "Empresa" msgctxt "field:carrier.credential.mygls,country:" msgid "Country" -msgstr "" +msgstr "País" msgctxt "field:carrier.credential.mygls,password:" msgid "Password" -msgstr "" +msgstr "Contrasenya" msgctxt "field:carrier.credential.mygls,server:" msgid "Server" -msgstr "" +msgstr "Servidor" msgctxt "field:carrier.credential.mygls,username:" msgid "Username" -msgstr "" +msgstr "Nom d'usuari" msgctxt "field:stock.package,mygls_shipping_id:" msgid "ID" -msgstr "" +msgstr "ID" msgctxt "help:carrier,mygls_sms:" msgid "" "Variables that can be used in the text of the SMS:\n" "ParcelNr#, #COD#, #PickupDate#, #From_Name#, #ClientRef#" msgstr "" +"Variables que es poden utilitzar al text de l'SMS:\n" +"ParcelNr#, #COD#, #PickupDate#, #From_Name#, #ClientRef#" msgctxt "model:carrier.credential.mygls,name:" msgid "MyGLS Credential" -msgstr "" +msgstr "Credencial MyGLS" msgctxt "model:ir.action,name:act_create_shipping_mygls_wizard" msgid "Create MyGLS Shipping for Packages" -msgstr "" +msgstr "Crear enviaments MyGLS per a paquets" msgctxt "model:ir.action,name:act_credential_form" msgid "MyGLS Credentials"
[tryton-commits] changeset in modules/web_shop_shopify:default Customize api_back...
changeset 0a56a54e9d4e in modules/web_shop_shopify:default
details:
https://hg.tryton.org/modules/web_shop_shopify?cmd=changeset=0a56a54e9d4e
description:
Customize api_backoff_time for concurrent testing
diffstat:
.drone.yml | 4 ++--
tox.ini| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diffs (25 lines):
diff -r b32db72d69fd -r 0a56a54e9d4e .drone.yml
--- a/.drone.ymlFri Oct 22 11:55:09 2021 +0200
+++ b/.drone.ymlFri Oct 22 12:22:40 2021 +0200
@@ -12,9 +12,9 @@
environment:
- CFLAGS=-O0
- DB_CACHE=/cache
-- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER
CI_JOB_NUMBER CI_JOB_ID SHOPIFY_PASSWORD SHOPIFY_URL
+- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER
CI_JOB_NUMBER CI_JOB_ID SHOPIFY_PASSWORD SHOPIFY_URL
TRYTOND_WEB_SHOP_SHOPIFY__API_BACKOFF_TIME
- POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
-secrets: [ shopify_password, shopify_url ]
+secrets: [ shopify_password, shopify_url,
trytond_web_shop_shopify__api_backoff_time ]
commands:
- echo "[extensions]" >> /root/.hgrc
- echo "hgext.share =" >> /root/.hgrc
diff -r b32db72d69fd -r 0a56a54e9d4e tox.ini
--- a/tox.ini Fri Oct 22 11:55:09 2021 +0200
+++ b/tox.ini Fri Oct 22 12:22:40 2021 +0200
@@ -12,5 +12,5 @@
postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
sqlite: DB_NAME={env:SQLITE_NAME::memory:}
postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
-passenv = SHOPIFY_PASSWORD SHOPIFY_URL
+passenv = SHOPIFY_PASSWORD SHOPIFY_URL
TRYTOND_WEB_SHOP_SHOPIFY__API_BACKOFF_TIME
install_command = pip install --pre --find-links
https://trydevpi.tryton.org/?local_version={env:CI_JOB_ID:{env:CI_BUILD_NUMBER:}.{env:CI_JOB_NUMBER:}}
{opts} {packages}
[tryton-commits] changeset in modules/web_shop_shopify:default Test only inventor...
changeset b32db72d69fd in modules/web_shop_shopify:default
details:
https://hg.tryton.org/modules/web_shop_shopify?cmd=changeset=b32db72d69fd
description:
Test only inventory_levels of our shop
diffstat:
tests/scenario_web_shop_shopify.rst | 7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
diffs (25 lines):
diff -r 4c9a8a99f55f -r b32db72d69fd tests/scenario_web_shop_shopify.rst
--- a/tests/scenario_web_shop_shopify.rst Fri Oct 22 10:53:53 2021 +0200
+++ b/tests/scenario_web_shop_shopify.rst Fri Oct 22 11:55:09 2021 +0200
@@ -50,6 +50,7 @@
>>> Product = Model.get('product.product')
>>> ProductAttribute = Model.get('product.attribute')
>>> ProductAttributeSet = Model.get('product.attribute.set')
+>>> ProductInventoryItem = Model.get('product.shopify_inventory_item')
>>> ProductTemplate = Model.get('product.template')
>>> Sale = Model.get('sale.sale')
>>> ShopifyIdentifier = Model.get('web.shop.shopify_identifier')
@@ -349,8 +350,12 @@
Check inventory item::
+>>> inventory_items = ProductInventoryItem.find([])
+>>> inventory_item_ids = [i.shopify_identifier
+... for inv in inventory_items for i in inv.shopify_identifiers]
>>> inventory_levels = location.inventory_levels()
->>> sorted(l.available for l in inventory_levels if l.available)
+>>> sorted(l.available for l in inventory_levels
+... if l.available and l.inventory_item_id in inventory_item_ids)
[5, 10]
Remove a category, a product and an image::
[tryton-commits] changeset in modules/web_shop_shopify:default Set drone secrets ...
changeset 4c9a8a99f55f in modules/web_shop_shopify:default details: https://hg.tryton.org/modules/web_shop_shopify?cmd=changeset=4c9a8a99f55f description: Set drone secrets to environment diffstat: .drone.yml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 4710902957f5 -r 4c9a8a99f55f .drone.yml --- a/.drone.ymlFri Oct 22 00:41:28 2021 +0200 +++ b/.drone.ymlFri Oct 22 10:53:53 2021 +0200 @@ -14,6 +14,7 @@ - DB_CACHE=/cache - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER CI_JOB_NUMBER CI_JOB_ID SHOPIFY_PASSWORD SHOPIFY_URL - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/ +secrets: [ shopify_password, shopify_url ] commands: - echo "[extensions]" >> /root/.hgrc - echo "hgext.share =" >> /root/.hgrc
[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Se...
changeset 2715226e8445 in modules/stock_package_shipping_sendcloud:default details: https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=2715226e8445 description: Set drone secrets to environment diffstat: .drone.yml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (14 lines): diff -r e9c23790683c -r 2715226e8445 .drone.yml --- a/.drone.ymlMon Oct 11 18:50:11 2021 +0200 +++ b/.drone.ymlFri Oct 22 10:53:53 2021 +0200 @@ -12,8 +12,9 @@ environment: - CFLAGS=-O0 - DB_CACHE=/cache -- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER CI_JOB_NUMBER CI_JOB_ID +- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER CI_JOB_NUMBER CI_JOB_ID SENDCLOUD_PUBLIC_KEY SENDCLOUD_SECRET_KEY - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/ +secrets: [ sendcloud_public_key, sendcloud_secret_key ] commands: - echo "[extensions]" >> /root/.hgrc - echo "hgext.share =" >> /root/.hgrc
[tryton-commits] changeset in modules/stock_package_shipping_mygls:default Set dr...
changeset a70864f89e0f in modules/stock_package_shipping_mygls:default details: https://hg.tryton.org/modules/stock_package_shipping_mygls?cmd=changeset=a70864f89e0f description: Set drone secrets to environment diffstat: .drone.yml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 397df23b1c99 -r a70864f89e0f .drone.yml --- a/.drone.ymlTue Oct 12 09:22:14 2021 +0200 +++ b/.drone.ymlFri Oct 22 10:53:53 2021 +0200 @@ -14,6 +14,7 @@ - DB_CACHE=/cache - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER CI_JOB_NUMBER CI_JOB_ID MYGLS_USERNAME MYGLS_PASSWORD MYGLS_CLIENT_NUMBER - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/ +secrets: [ mygls_username, mygls_password, mygls_client_number ] commands: - echo "[extensions]" >> /root/.hgrc - echo "hgext.share =" >> /root/.hgrc
[tryton-commits] changeset in modules/currency_rs:default Set drone secrets to en...
changeset 071b00d1857d in modules/currency_rs:default details: https://hg.tryton.org/modules/currency_rs?cmd=changeset=071b00d1857d description: Set drone secrets to environment diffstat: .drone.yml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r bf108dd0218b -r 071b00d1857d .drone.yml --- a/.drone.ymlSat Oct 09 13:03:31 2021 +0200 +++ b/.drone.ymlFri Oct 22 10:53:53 2021 +0200 @@ -14,6 +14,7 @@ - DB_CACHE=/cache - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER CI_JOB_NUMBER CI_JOB_ID NBS_RS_USERNAME NBS_RS_PASSWORD NBS_RS_LICENSE_ID - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/ +secrets: [ nbs_rs_username, nbs_rs_password, nbs_rs_license_id ] commands: - echo "[extensions]" >> /root/.hgrc - echo "hgext.share =" >> /root/.hgrc
[tryton-commits] changeset in modules/sale_supply_drop_shipment:default Process s...
changeset 20b2886e3f89 in modules/sale_supply_drop_shipment:default
details:
https://hg.tryton.org/modules/sale_supply_drop_shipment?cmd=changeset=20b2886e3f89
description:
Process sales on ship
This ensures partial shipments are properly linked to sales.
issue10430
review361921002
diffstat:
stock.py | 1 +
tests/scenario_sale_supply_drop_shipment.rst | 9 -
2 files changed, 9 insertions(+), 1 deletions(-)
diffs (44 lines):
diff -r cbf861fec31e -r 20b2886e3f89 stock.py
--- a/stock.py Fri Oct 08 19:21:06 2021 +0200
+++ b/stock.py Fri Oct 22 10:15:48 2021 +0200
@@ -573,6 +573,7 @@
@classmethod
@ModelView.button
@Workflow.transition('shipped')
+@process_sale('customer_moves')
@process_purchase('supplier_moves')
def ship(cls, shipments):
pool = Pool()
diff -r cbf861fec31e -r 20b2886e3f89
tests/scenario_sale_supply_drop_shipment.rst
--- a/tests/scenario_sale_supply_drop_shipment.rst Fri Oct 08 19:21:06
2021 +0200
+++ b/tests/scenario_sale_supply_drop_shipment.rst Fri Oct 22 10:15:48
2021 +0200
@@ -195,7 +195,10 @@
>>> sale.reload()
>>> sale.shipments
[]
->>> shipment, = sale.drop_shipments
+>>> len(sale.drop_shipments)
+2
+>>> shipment, = [s for s in sale.drop_shipments
+... if s.state == 'shipped']
>>> set_user(stock_user)
>>> shipment.click('done')
@@ -205,6 +208,8 @@
>>> sale.reload()
>>> sale.shipments
[]
+>>> len(sale.drop_shipments)
+2
The purchase is now waiting for his new drop shipment::
@@ -212,6 +217,8 @@
>>> purchase.reload()
>>> purchase.shipment_state
'waiting'
+>>> len(purchase.drop_shipments)
+2
>>> shipment, = [s for s in purchase.drop_shipments
... if s.state == 'waiting']
>>> move, = shipment.customer_moves
[tryton-commits] changeset in modules/sale:default Reset actual quantity when cop...
changeset 60a2d7af770a in modules/sale:default
details: https://hg.tryton.org/modules/sale?cmd=changeset=60a2d7af770a
description:
Reset actual quantity when copying line
issue10874
review350841002
diffstat:
sale.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diffs (11 lines):
diff -r e1c36b00e678 -r 60a2d7af770a sale.py
--- a/sale.py Thu Oct 21 00:03:36 2021 +0200
+++ b/sale.py Fri Oct 22 10:14:10 2021 +0200
@@ -1748,6 +1748,7 @@
default.setdefault('moves_ignored', None)
default.setdefault('moves_recreated', None)
default.setdefault('invoice_lines', None)
+default.setdefault('actual_quantity')
return super(SaleLine, cls).copy(lines, default=default)
[tryton-commits] changeset in modules/purchase:default Reset actual quantity when...
changeset 7f21b6d067a4 in modules/purchase:default
details: https://hg.tryton.org/modules/purchase?cmd=changeset=7f21b6d067a4
description:
Reset actual quantity when copying line
issue10874
review350841002
diffstat:
purchase.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diffs (11 lines):
diff -r 3938612a9b45 -r 7f21b6d067a4 purchase.py
--- a/purchase.py Fri Oct 22 00:38:12 2021 +0200
+++ b/purchase.py Fri Oct 22 10:14:10 2021 +0200
@@ -1772,6 +1772,7 @@
default.setdefault('moves_ignored', None)
default.setdefault('moves_recreated', None)
default.setdefault('invoice_lines', None)
+default.setdefault('actual_quantity')
return super().copy(lines, default=default)
[tryton-commits] changeset in weblate:default Translated using Weblate (Catalan)
changeset 83c59ab5ff33 in weblate:default details: https://hg.tryton.org/weblate?cmd=changeset=83c59ab5ff33 description: Translated using Weblate (Catalan) Currently translated at 18.7% (12 of 64 strings) Translation: Tryton/web_shop_shopify Translate-URL: https://translate.tryton.org/projects/tryton/web_shop_shopify/ca/ diffstat: modules/web_shop_shopify/locale/ca.po | 39 -- 1 files changed, 27 insertions(+), 12 deletions(-) diffs (81 lines): diff -r c220ad6c4600 -r 83c59ab5ff33 modules/web_shop_shopify/locale/ca.po --- a/modules/web_shop_shopify/locale/ca.po Thu Oct 21 07:16:19 2021 + +++ b/modules/web_shop_shopify/locale/ca.po Fri Oct 22 07:54:29 2021 + @@ -1,50 +1,65 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-10-22 07:57+\n" +"PO-Revision-Date: 2021-10-22 07:57+\n" +"Last-Translator: David Blanco Bautista \n" +"Language-Team: LANGUAGE \n" +"Language: ca\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.8.1\n" + msgctxt "field:product.attribute.set,shopify_option1:" msgid "Option 1" -msgstr "" +msgstr "Opció 1" msgctxt "field:product.attribute.set,shopify_option2:" msgid "Option 2" -msgstr "" +msgstr "Opció 2" msgctxt "field:product.attribute.set,shopify_option3:" msgid "Option 3" -msgstr "" +msgstr "Opció 3" msgctxt "field:product.product,shopify_sku:" msgid "SKU" -msgstr "" +msgstr "SKU" msgctxt "field:product.product,shopify_uom:" msgid "Shopify UOM" -msgstr "" +msgstr "UdM Shopify" msgctxt "field:product.shopify_inventory_item,product:" msgid "Product" -msgstr "" +msgstr "Producte" msgctxt "field:product.template,shopify_uom:" msgid "Shopify UOM" -msgstr "" +msgstr "UdM Shopify" msgctxt "field:sale.sale,shopify_tax_adjustment:" msgid "Shopify Tax Adjustment" -msgstr "" +msgstr "Ajust d'impostos de Shopify" msgctxt "field:stock.shipment.shopify_identifier,sale:" msgid "Sale" -msgstr "" +msgstr "Venda" msgctxt "field:stock.shipment.shopify_identifier,shipment:" msgid "Shipment" -msgstr "" +msgstr "Albarà" msgctxt "field:web.shop,shopify_password:" msgid "Password" -msgstr "" +msgstr "Contrasenya" msgctxt "field:web.shop,shopify_payment_journals:" msgid "Payment Journals" -msgstr "" +msgstr "Diaris de pagaments" msgctxt "field:web.shop,shopify_trial:" msgid "Trial"
