[tryton-commits] changeset in trytond:4.8 Always update ir.model.data if the file...
changeset f751de8173d1 in trytond:4.8
details: https://hg.tryton.org/trytond?cmd=changeset;node=f751de8173d1
description:
Always update ir.model.data if the filesystem value is different
We must compare against the filesystem value instead of the old value
because
it is the actual target.
issue8353
review261471002
(grafted from 71187a2c37b6a377d5464db9218e58cf920e91b1)
diffstat:
trytond/convert.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 494282634672 -r f751de8173d1 trytond/convert.py
--- a/trytond/convert.pyMon Apr 22 10:24:09 2019 +0200
+++ b/trytond/convert.pyWed May 22 18:29:04 2019 +0200
@@ -765,7 +765,7 @@
temp_values.update(values)
values = temp_values
-if values != old_values:
+if values != fs_values:
self.grouped_model_data.extend(([self.ModelData(mdata_id)], {
'fs_id': fs_id,
'model': model,
[tryton-commits] changeset in modules/stock:4.6 Ensure date of Product Quantities...
changeset c90ff490f355 in modules/stock:4.6
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=c90ff490f355
description:
Ensure date of Product Quantities By Warehouse is a date instance
On SQLite, the date column of the table query is not converted into date
instance but into string.
issue8355
review261481002
(grafted from 6df4344216418b69bfab6a5b738de3f80bc35038)
diffstat:
product.py | 16 +++-
1 files changed, 15 insertions(+), 1 deletions(-)
diffs (26 lines):
diff -r 829f16a3d686 -r c90ff490f355 product.py
--- a/product.pyMon Apr 22 11:00:08 2019 +0200
+++ b/product.pyWed May 22 18:31:21 2019 +0200
@@ -290,7 +290,21 @@
class ProductQuantitiesByWarehouse(ModelSQL, ModelView):
'Product Quantities By Warehouse'
__name__ = 'stock.product_quantities_warehouse'
-date = fields.Date('Date')
+
+class _Date(fields.Date):
+def get(self, ids, model, name, values=None):
+if values is None:
+values = {}
+result = {}
+for v in values:
+date = v[name]
+# SQLite does not convert to date
+if isinstance(date, str):
+date = datetime.date(*map(int, date.split('-', 2)))
+result[v['id']] = date
+return result
+
+date = _Date('Date')
quantity = fields.Function(fields.Float('Quantity'), 'get_quantity')
@classmethod
[tryton-commits] changeset in trytond:4.4 Always update ir.model.data if the file...
changeset d2645ec8901e in trytond:4.4
details: https://hg.tryton.org/trytond?cmd=changeset;node=d2645ec8901e
description:
Always update ir.model.data if the filesystem value is different
We must compare against the filesystem value instead of the old value
because
it is the actual target.
issue8353
review261471002
(grafted from 71187a2c37b6a377d5464db9218e58cf920e91b1)
diffstat:
trytond/convert.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r b8c83f647426 -r d2645ec8901e trytond/convert.py
--- a/trytond/convert.pyMon Apr 22 10:25:46 2019 +0200
+++ b/trytond/convert.pyWed May 22 18:29:04 2019 +0200
@@ -764,7 +764,7 @@
temp_values.update(values)
values = temp_values
-if values != old_values:
+if values != fs_values:
self.grouped_model_data.extend(([self.ModelData(mdata_id)], {
'fs_id': fs_id,
'model': model,
[tryton-commits] changeset in modules/stock:4.4 Ensure date of Product Quantities...
changeset 959adfae39b1 in modules/stock:4.4
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=959adfae39b1
description:
Ensure date of Product Quantities By Warehouse is a date instance
On SQLite, the date column of the table query is not converted into date
instance but into string.
issue8355
review261481002
(grafted from 6df4344216418b69bfab6a5b738de3f80bc35038)
diffstat:
product.py | 16 +++-
1 files changed, 15 insertions(+), 1 deletions(-)
diffs (26 lines):
diff -r 06d501941e9a -r 959adfae39b1 product.py
--- a/product.pyMon Apr 22 11:02:56 2019 +0200
+++ b/product.pyWed May 22 18:31:21 2019 +0200
@@ -299,7 +299,21 @@
class ProductQuantitiesByWarehouse(ModelSQL, ModelView):
'Product Quantities By Warehouse'
__name__ = 'stock.product_quantities_warehouse'
-date = fields.Date('Date')
+
+class _Date(fields.Date):
+def get(self, ids, model, name, values=None):
+if values is None:
+values = {}
+result = {}
+for v in values:
+date = v[name]
+# SQLite does not convert to date
+if isinstance(date, str):
+date = datetime.date(*map(int, date.split('-', 2)))
+result[v['id']] = date
+return result
+
+date = _Date('Date')
quantity = fields.Function(fields.Float('Quantity'), 'get_quantity')
@classmethod
[tryton-commits] changeset in tryton:5.2 Use FileFinder and SourceFileLoader to l...
changeset cc62e47041e0 in tryton:5.2
details: https://hg.tryton.org/tryton?cmd=changeset;node=cc62e47041e0
description:
Use FileFinder and SourceFileLoader to load plugins
On frozen environment using import_module does not work because the
plugins
are not in the PYTHONPATH.
issue8334
review253491002
(grafted from f20c2e42084ad4370f58793ca88bc93d0e4759a8)
diffstat:
tryton/plugins/__init__.py | 12 ++--
1 files changed, 10 insertions(+), 2 deletions(-)
diffs (29 lines):
diff -r 23592c13e192 -r cc62e47041e0 tryton/plugins/__init__.py
--- a/tryton/plugins/__init__.pyMon May 06 14:46:44 2019 +0200
+++ b/tryton/plugins/__init__.pyMon May 13 22:39:27 2019 +0200
@@ -23,15 +23,23 @@
imported = set()
for path in paths:
+finder = importlib.machinery.FileFinder(
+path, (
+importlib.machinery.SourceFileLoader,
+importlib.machinery.SOURCE_SUFFIXES))
for plugin in os.listdir(path):
module = os.path.splitext(plugin)[0]
if (module.startswith('_') or module in imported):
continue
module = 'tryton.plugins.%s' % module
+spec = finder.find_spec(module)
+if not spec:
+continue
+module = importlib.util.module_from_spec(spec)
try:
-module = importlib.import_module(module)
-MODULES.append(module)
+spec.loader.exec_module(module)
except ImportError:
continue
else:
+MODULES.append(module)
imported.add(module.__name__)
[tryton-commits] changeset in trytond:5.2 Always update ir.model.data if the file...
changeset d1b1b93864d8 in trytond:5.2
details: https://hg.tryton.org/trytond?cmd=changeset;node=d1b1b93864d8
description:
Always update ir.model.data if the filesystem value is different
We must compare against the filesystem value instead of the old value
because
it is the actual target.
issue8353
review261471002
(grafted from 71187a2c37b6a377d5464db9218e58cf920e91b1)
diffstat:
trytond/convert.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r cabd58328a68 -r d1b1b93864d8 trytond/convert.py
--- a/trytond/convert.pyThu May 09 09:33:17 2019 +0200
+++ b/trytond/convert.pyWed May 22 18:29:04 2019 +0200
@@ -764,7 +764,7 @@
fs_values = old_values.copy()
fs_values.update(new_values)
-if values != old_values:
+if values != fs_values:
self.grouped_model_data.extend(([self.ModelData(mdata_id)], {
'fs_id': fs_id,
'model': model,
[tryton-commits] changeset in trytond:5.0 Always update ir.model.data if the file...
changeset 0e1806f28627 in trytond:5.0
details: https://hg.tryton.org/trytond?cmd=changeset;node=0e1806f28627
description:
Always update ir.model.data if the filesystem value is different
We must compare against the filesystem value instead of the old value
because
it is the actual target.
issue8353
review261471002
(grafted from 71187a2c37b6a377d5464db9218e58cf920e91b1)
diffstat:
trytond/convert.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r b3ad9950eeff -r 0e1806f28627 trytond/convert.py
--- a/trytond/convert.pyMon May 06 11:34:11 2019 +0200
+++ b/trytond/convert.pyWed May 22 18:29:04 2019 +0200
@@ -755,7 +755,7 @@
fs_values = old_values.copy()
fs_values.update(new_values)
-if values != old_values:
+if values != fs_values:
self.grouped_model_data.extend(([self.ModelData(mdata_id)], {
'fs_id': fs_id,
'model': model,
[tryton-commits] changeset in modules/project_plan:4.6 Remove requests from docum...
changeset 55f45be51ac7 in modules/project_plan:4.6 details: https://hg.tryton.org/modules/project_plan?cmd=changeset;node=55f45be51ac7 description: Remove requests from documentation issue7875 review52531002 (grafted from 1b7e33b08916fc0da9620440b209e05b444a953d) diffstat: doc/index.rst | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 00b023f3abc3 -r 55f45be51ac7 doc/index.rst --- a/doc/index.rst Mon Oct 30 15:25:21 2017 +0100 +++ b/doc/index.rst Tue May 14 13:17:07 2019 +0200 @@ -29,8 +29,6 @@ also Late Start and Early Finish dates) are computed automatically. - Resource allocation: Each task may allocate one or more resource (I.E. a certain amount of time of an employee). -- Requests: On each work, a list of request is available, allowing to - exchange and follow various information about the work execution. The *Task Leveling* wizard allow to level a group of tasks to avoid
[tryton-commits] changeset in modules/account:5.0 Use tax for record name of tax ...
changeset 35336a15f758 in modules/account:5.0 details: https://hg.tryton.org/modules/account?cmd=changeset;node=35336a15f758 description: Use tax for record name of tax line only if set issue8352 review251351002 (grafted from a6cd9f931fb38961702ebad31eafc3be87afe3a7) diffstat: tax.py | 5 - 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 45b1d9552685 -r 35336a15f758 tax.py --- a/tax.pyThu May 16 18:32:26 2019 +0200 +++ b/tax.pyMon May 20 15:35:15 2019 +0200 @@ -1220,7 +1220,10 @@ return self.move_line.account.company.id def get_rec_name(self, name): -return self.tax.rec_name +name = super(TaxLine, self).get_rec_name(name) +if self.tax: +name = self.tax.rec_name +return name @classmethod def search_rec_name(cls, name, clause):
[tryton-commits] changeset in modules/stock:5.0 Ensure date of Product Quantities...
changeset ab8f8e76535c in modules/stock:5.0
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=ab8f8e76535c
description:
Ensure date of Product Quantities By Warehouse is a date instance
On SQLite, the date column of the table query is not converted into date
instance but into string.
issue8355
review261481002
(grafted from 6df4344216418b69bfab6a5b738de3f80bc35038)
diffstat:
product.py | 16 +++-
1 files changed, 15 insertions(+), 1 deletions(-)
diffs (26 lines):
diff -r d86afb245cd9 -r ab8f8e76535c product.py
--- a/product.pyMon Apr 22 10:57:10 2019 +0200
+++ b/product.pyWed May 22 18:31:21 2019 +0200
@@ -315,7 +315,21 @@
class ProductQuantitiesByWarehouse(ModelSQL, ModelView):
'Product Quantities By Warehouse'
__name__ = 'stock.product_quantities_warehouse'
-date = fields.Date('Date')
+
+class _Date(fields.Date):
+def get(self, ids, model, name, values=None):
+if values is None:
+values = {}
+result = {}
+for v in values:
+date = v[name]
+# SQLite does not convert to date
+if isinstance(date, str):
+date = datetime.date(*map(int, date.split('-', 2)))
+result[v['id']] = date
+return result
+
+date = _Date('Date')
quantity = fields.Function(fields.Float('Quantity'), 'get_quantity')
@classmethod
[tryton-commits] changeset in modules/stock:4.8 Ensure date of Product Quantities...
changeset 150ec749b12b in modules/stock:4.8
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=150ec749b12b
description:
Ensure date of Product Quantities By Warehouse is a date instance
On SQLite, the date column of the table query is not converted into date
instance but into string.
issue8355
review261481002
(grafted from 6df4344216418b69bfab6a5b738de3f80bc35038)
diffstat:
product.py | 16 +++-
1 files changed, 15 insertions(+), 1 deletions(-)
diffs (26 lines):
diff -r 14634e7c44b9 -r 150ec749b12b product.py
--- a/product.pyMon Apr 22 10:57:53 2019 +0200
+++ b/product.pyWed May 22 18:31:21 2019 +0200
@@ -317,7 +317,21 @@
class ProductQuantitiesByWarehouse(ModelSQL, ModelView):
'Product Quantities By Warehouse'
__name__ = 'stock.product_quantities_warehouse'
-date = fields.Date('Date')
+
+class _Date(fields.Date):
+def get(self, ids, model, name, values=None):
+if values is None:
+values = {}
+result = {}
+for v in values:
+date = v[name]
+# SQLite does not convert to date
+if isinstance(date, str):
+date = datetime.date(*map(int, date.split('-', 2)))
+result[v['id']] = date
+return result
+
+date = _Date('Date')
quantity = fields.Function(fields.Float('Quantity'), 'get_quantity')
@classmethod
[tryton-commits] changeset in modules/stock:5.2 Ensure date of Product Quantities...
changeset 0538b05ecedc in modules/stock:5.2
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=0538b05ecedc
description:
Ensure date of Product Quantities By Warehouse is a date instance
On SQLite, the date column of the table query is not converted into date
instance but into string.
issue8355
review261481002
(grafted from 6df4344216418b69bfab6a5b738de3f80bc35038)
diffstat:
product.py | 16 +++-
1 files changed, 15 insertions(+), 1 deletions(-)
diffs (26 lines):
diff -r 3d2321469bde -r 0538b05ecedc product.py
--- a/product.pyMon May 06 15:14:28 2019 +0200
+++ b/product.pyWed May 22 18:31:21 2019 +0200
@@ -318,7 +318,21 @@
class ProductQuantitiesByWarehouse(ModelSQL, ModelView):
'Product Quantities By Warehouse'
__name__ = 'stock.product_quantities_warehouse'
-date = fields.Date('Date')
+
+class _Date(fields.Date):
+def get(self, ids, model, name, values=None):
+if values is None:
+values = {}
+result = {}
+for v in values:
+date = v[name]
+# SQLite does not convert to date
+if isinstance(date, str):
+date = datetime.date(*map(int, date.split('-', 2)))
+result[v['id']] = date
+return result
+
+date = _Date('Date')
quantity = fields.Function(fields.Float('Quantity'), 'get_quantity')
@classmethod
[tryton-commits] changeset in modules/project_plan:4.4 Remove requests from docum...
changeset 4d23dc69dbfe in modules/project_plan:4.4 details: https://hg.tryton.org/modules/project_plan?cmd=changeset;node=4d23dc69dbfe description: Remove requests from documentation issue7875 review52531002 (grafted from 1b7e33b08916fc0da9620440b209e05b444a953d) diffstat: doc/index.rst | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r bd0d862530dd -r 4d23dc69dbfe doc/index.rst --- a/doc/index.rst Wed Nov 08 23:21:04 2017 +0100 +++ b/doc/index.rst Tue May 14 13:17:07 2019 +0200 @@ -29,8 +29,6 @@ also Late Start and Early Finish dates) are computed automatically. - Resource allocation: Each task may allocate one or more resource (I.E. a certain amount of time of an employee). -- Requests: On each work, a list of request is available, allowing to - exchange and follow various information about the work execution. The *Task Leveling* wizard allow to level a group of tasks to avoid
[tryton-commits] changeset in modules/project_plan:4.8 Remove requests from docum...
changeset d1e01f0e7769 in modules/project_plan:4.8 details: https://hg.tryton.org/modules/project_plan?cmd=changeset;node=d1e01f0e7769 description: Remove requests from documentation issue7875 review52531002 (grafted from 1b7e33b08916fc0da9620440b209e05b444a953d) diffstat: doc/index.rst | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r a8b0c0412f02 -r d1e01f0e7769 doc/index.rst --- a/doc/index.rst Tue Feb 19 22:55:21 2019 +0100 +++ b/doc/index.rst Tue May 14 13:17:07 2019 +0200 @@ -29,8 +29,6 @@ also Late Start and Early Finish dates) are computed automatically. - Resource allocation: Each task may allocate one or more resource (I.E. a certain amount of time of an employee). -- Requests: On each work, a list of request is available, allowing to - exchange and follow various information about the work execution. The *Task Leveling* wizard allow to level a group of tasks to avoid
[tryton-commits] changeset in modules/project_plan:5.0 Remove requests from docum...
changeset e16e9bb1ee49 in modules/project_plan:5.0 details: https://hg.tryton.org/modules/project_plan?cmd=changeset;node=e16e9bb1ee49 description: Remove requests from documentation issue7875 review52531002 (grafted from 1b7e33b08916fc0da9620440b209e05b444a953d) diffstat: doc/index.rst | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 756bedb78f28 -r e16e9bb1ee49 doc/index.rst --- a/doc/index.rst Tue Feb 19 22:07:32 2019 +0100 +++ b/doc/index.rst Tue May 14 13:17:07 2019 +0200 @@ -29,8 +29,6 @@ also Late Start and Early Finish dates) are computed automatically. - Resource allocation: Each task may allocate one or more resource (I.E. a certain amount of time of an employee). -- Requests: On each work, a list of request is available, allowing to - exchange and follow various information about the work execution. The *Task Leveling* wizard allow to level a group of tasks to avoid
[tryton-commits] changeset in modules/account:4.8 Use tax for record name of tax ...
changeset da702713aea4 in modules/account:4.8 details: https://hg.tryton.org/modules/account?cmd=changeset;node=da702713aea4 description: Use tax for record name of tax line only if set issue8352 review251351002 (grafted from a6cd9f931fb38961702ebad31eafc3be87afe3a7) diffstat: tax.py | 5 - 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 94c18c63fb7a -r da702713aea4 tax.py --- a/tax.pyThu May 16 18:33:28 2019 +0200 +++ b/tax.pyMon May 20 15:35:15 2019 +0200 @@ -1272,7 +1272,10 @@ return self.move_line.account.company.id def get_rec_name(self, name): -return self.tax.rec_name +name = super(TaxLine, self).get_rec_name(name) +if self.tax: +name = self.tax.rec_name +return name @classmethod def search_rec_name(cls, name, clause):
[tryton-commits] changeset in modules/project_plan:5.2 Remove requests from docum...
changeset 82fcc131d7c1 in modules/project_plan:5.2 details: https://hg.tryton.org/modules/project_plan?cmd=changeset;node=82fcc131d7c1 description: Remove requests from documentation issue7875 review52531002 (grafted from 1b7e33b08916fc0da9620440b209e05b444a953d) diffstat: doc/index.rst | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r c681e25bb2f0 -r 82fcc131d7c1 doc/index.rst --- a/doc/index.rst Mon May 06 15:08:57 2019 +0200 +++ b/doc/index.rst Tue May 14 13:17:07 2019 +0200 @@ -29,8 +29,6 @@ also Late Start and Early Finish dates) are computed automatically. - Resource allocation: Each task may allocate one or more resource (I.E. a certain amount of time of an employee). -- Requests: On each work, a list of request is available, allowing to - exchange and follow various information about the work execution. The *Task Leveling* wizard allow to level a group of tasks to avoid
[tryton-commits] changeset in modules/account:5.2 Use tax for record name of tax ...
changeset 03a5eec73512 in modules/account:5.2 details: https://hg.tryton.org/modules/account?cmd=changeset;node=03a5eec73512 description: Use tax for record name of tax line only if set issue8352 review251351002 (grafted from a6cd9f931fb38961702ebad31eafc3be87afe3a7) diffstat: tax.py | 5 - 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r e119c600cde3 -r 03a5eec73512 tax.py --- a/tax.pyMon May 06 14:53:05 2019 +0200 +++ b/tax.pyMon May 20 15:35:15 2019 +0200 @@ -1216,7 +1216,10 @@ return self.move_line.account.company.id def get_rec_name(self, name): -return self.tax.rec_name +name = super(TaxLine, self).get_rec_name(name) +if self.tax: +name = self.tax.rec_name +return name @classmethod def search_rec_name(cls, name, clause):
[tryton-commits] changeset in modules/account_invoice:5.2 Fix typo in message id ...
changeset 031a09bada2c in modules/account_invoice:5.2
details:
https://hg.tryton.org/modules/account_invoice?cmd=changeset;node=031a09bada2c
description:
Fix typo in message id
account_invoice.msg_payment_term_missing_last_remainder
issue8359
review271411002
(grafted from c2006dd08a84a863de7ac4fd24a56f6ef886448d)
diffstat:
payment_term.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 0d9136be3538 -r 031a09bada2c payment_term.py
--- a/payment_term.py Mon May 06 14:55:51 2019 +0200
+++ b/payment_term.py Sat May 18 16:08:57 2019 +0200
@@ -43,7 +43,7 @@
def check_remainder(self):
if not self.lines or not self.lines[-1].type == 'remainder':
raise PaymentTermValidationError(
-gettext('account_invoive'
+gettext('account_invoice'
'.msg_payment_term_missing_last_remainder',
payment_term=self.rec_name))
[tryton-commits] changeset in trytond:default Evaluate n_sign_posn and p_sign_pos...
changeset 69c4e6981f14 in trytond:default details: https://hg.tryton.org/trytond?cmd=changeset;node=69c4e6981f14 description: Evaluate n_sign_posn and p_sign_posn as integer instead of char in XML issue8375 review269561002 diffstat: trytond/ir/ir.xml | 4 +- trytond/ir/lang.xml | 84 ++-- 2 files changed, 44 insertions(+), 44 deletions(-) diffs (248 lines): diff -r 71187a2c37b6 -r 69c4e6981f14 trytond/ir/ir.xml --- a/trytond/ir/ir.xml Wed May 22 18:29:04 2019 +0200 +++ b/trytond/ir/ir.xml Mon May 27 23:20:04 2019 +0200 @@ -19,8 +19,8 @@ [3, 3, 0] . , -1 -1 + + - diff -r 71187a2c37b6 -r 69c4e6981f14 trytond/ir/lang.xml --- a/trytond/ir/lang.xml Wed May 22 18:29:04 2019 +0200 +++ b/trytond/ir/lang.xml Mon May 27 23:20:04 2019 +0200 @@ -17,8 +17,8 @@ [3, 3, 0] , -1 -1 + + - @@ -38,8 +38,8 @@ [3, 3, 0] , . -1 -1 + + - @@ -59,8 +59,8 @@ [3, 3, 0] , -1 -1 + + - @@ -80,8 +80,8 @@ [3, 3, 0] , . -1 -1 + + - @@ -104,8 +104,8 @@ [3, 3, 0] , . -1 -1 + + - @@ -125,8 +125,8 @@ [3, 3, 0] . , -1 -1 + + - @@ -144,8 +144,8 @@ [3, 3] , -1 -1 + + - @@ -166,8 +166,8 @@ [3, 0] ٫ ٬ -1 -1 + + - @@ -185,8 +185,8 @@ [3, 3, 0] , -1 -1 + + - @@ -206,8 +206,8 @@ [3, 0] , -1 -1 + + - @@ -227,8 +227,8 @@ [3, 3, 0] , . -1 -1 + + - @@ -248,8 +248,8 @@ [3, 3, 0] , . -1 -1 + + - @@ -269,8 +269,8 @@ [3, 3, 0] . , -4 -4 + + - @@ -290,8 +290,8 @@ [3, 3, 0] , . -1 -1 + + - @@ -311,8 +311,8 @@ [3, 3, 0] , -1 -2 + + - @@ -332,8 +332,8 @@ [3, 0, 0] , -1 -1 + + - @@ -353,8 +353,8 @@ [3, 3, 0] , . -1 -1 + + - @@ -374,8 +374,8 @@ [3, 3, 0] . -1 -1 + + - @@ -395,8 +395,8 @@ [3, 3, 0] , -1 -1 + + - @@ -414,8 +414,8 @@ [3, 3, 0] , . -1 -1 + + - @@ -435,8 +435,8 @@ [3, 0] . , -4 -4 + + -
[tryton-commits] changeset in tryton:default Show revision datetime in local time...
changeset ed4206bb000e in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=ed4206bb000e
description:
Show revision datetime in local timezone
issue8365
review271441002
diffstat:
tryton/gui/window/revision.py | 8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diffs (32 lines):
diff -r b03358feeea9 -r ed4206bb000e tryton/gui/window/revision.py
--- a/tryton/gui/window/revision.py Mon May 27 23:15:24 2019 +0200
+++ b/tryton/gui/window/revision.py Mon May 27 23:18:37 2019 +0200
@@ -4,7 +4,8 @@
from gi.repository import Gtk
-from tryton.common import get_toplevel_window, IconFactory
+from tryton.common import (get_toplevel_window, IconFactory,
+timezoned_date, untimezoned_date)
from tryton.common.datetime_ import date_parse
from tryton.common.underline import set_underline
from tryton.config import TRYTON_ICON
@@ -62,7 +63,8 @@
active = 0
list_store.append(('', ''))
for i, (rev, id_, name) in enumerate(revisions, 1):
-list_store.append((rev.strftime(self._format), name))
+list_store.append(
+(timezoned_date(rev).strftime(self._format), name))
if rev == revision:
active = i
combobox.set_active(active)
@@ -97,7 +99,7 @@
value = None
if text:
try:
-value = date_parse(text, self._format)
+value = untimezoned_date(date_parse(text, self._format))
except ValueError:
pass
self._value = value
[tryton-commits] changeset in tryton:default Parse imported value only if non empty
changeset b03358feeea9 in tryton:default details: https://hg.tryton.org/tryton?cmd=changeset;node=b03358feeea9 description: Parse imported value only if non empty Empty value can not be parsed by locale. So they should stay empty. issue8357 review285231002 diffstat: tryton/gui/window/win_import.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fa60ed55283f -r b03358feeea9 tryton/gui/window/win_import.py --- a/tryton/gui/window/win_import.py Thu May 23 10:10:47 2019 +0200 +++ b/tryton/gui/window/win_import.py Mon May 27 23:15:24 2019 +0200 @@ -197,7 +197,7 @@ continue row = [] for field, val in zip(fields, line): -if locale_format: +if locale_format and val: type_ = self.fields_data[field]['type'] if type_ in ['integer', 'biginteger']: val = locale.atoi(val)
