mirror of
https://github.com/NaN-tic/trytond-patches.git
synced 2023-12-14 06:03:03 +01:00
Use new core monorepository.
This commit is contained in:
parent
64d4abdc95
commit
404bacfe1c
|
@ -1,6 +1,6 @@
|
|||
diff -r 6c1f98f2f997 account.xml
|
||||
--- a/trytond/trytond/modules/analytic_account/account.xml Sun Apr 07 19:50:02 2019 +0200
|
||||
+++ b/trytond/trytond/modules/analytic_account/account.xml Fri Apr 12 21:23:20 2019 +0200
|
||||
--- a/tryton/modules/analytic_account/account.xml Sun Apr 07 19:50:02 2019 +0200
|
||||
+++ b/tryton/modules/analytic_account/account.xml Fri Apr 12 21:23:20 2019 +0200
|
||||
@@ -160,5 +160,20 @@
|
||||
<field name="type">tree</field>
|
||||
<field name="name">analytic_account_entry_tree</field>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/trytond/trytond/pool.py b/trytond/trytond/pool.py
|
||||
diff --git a/tryton/trytond/trytond/pool.py b/trytond/trytond/pool.py
|
||||
index 407ff358..0be2a41a 100644
|
||||
--- a/trytond/trytond/pool.py
|
||||
+++ b/trytond/trytond/pool.py
|
||||
--- a/tryton/trytond/trytond/pool.py
|
||||
+++ b/tryton/trytond/trytond/pool.py
|
||||
@@ -195,6 +195,16 @@ class Pool(object):
|
||||
self.add(cls, type)
|
||||
self.setup_mixin(self._modules, type='report', name=name)
|
||||
|
@ -19,10 +19,10 @@ index 407ff358..0be2a41a 100644
|
|||
raise
|
||||
|
||||
def add(self, cls, type='model'):
|
||||
diff --git a/trytond/trytond/model/modelsql.py b/trytond/trytond/model/modelsql.py
|
||||
diff --git a/tryton/trytond/trytond/model/modelsql.py b/trytond/trytond/model/modelsql.py
|
||||
index d762a27a..5ca47c34 100644
|
||||
--- a/trytond/trytond/model/modelsql.py
|
||||
+++ b/trytond/trytond/model/modelsql.py
|
||||
--- a/tryton/trytond/trytond/model/modelsql.py
|
||||
+++ b/tryton/trytond/trytond/model/modelsql.py
|
||||
@@ -1127,8 +1127,14 @@ class ModelSQL(ModelStorage):
|
||||
foreign_table = Model.__table__()
|
||||
foreign_red_sql = reduce_ids(
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/trytond/trytond/protocols/dispatcher.py b/trytond/trytond/protocols/dispatcher.py
|
||||
diff --git a/tryton/trytond/trytond/protocols/dispatcher.py b/trytond/trytond/protocols/dispatcher.py
|
||||
index 2e86f55e..799a58f4 100644
|
||||
--- a/trytond/trytond/protocols/dispatcher.py
|
||||
+++ b/trytond/trytond/protocols/dispatcher.py
|
||||
--- a/tryton/trytond/trytond/protocols/dispatcher.py
|
||||
+++ b/tryton/trytond/trytond/protocols/dispatcher.py
|
||||
@@ -26,6 +26,8 @@ from trytond.wsgi import app
|
||||
|
||||
from .wrappers import with_pool
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/trytond/trytond/modules/currency/tests/scenario_currency_rate_update.rst b/trytond/trytond/modules/currency/tests/scenario_currency_rate_update.rst
|
||||
diff --git a/tryton/modules/currency/tests/scenario_currency_rate_update.rst b/tryton/trytond/trytond/modules/currency/tests/scenario_currency_rate_update.rst
|
||||
index 231cbc3..ac46be0 100644
|
||||
--- a/trytond/trytond/modules/currency/tests/scenario_currency_rate_update.rst
|
||||
+++ b/trytond/trytond/modules/currency/tests/scenario_currency_rate_update.rst
|
||||
--- a/tryton/modules/currency/tests/scenario_currency_rate_update.rst
|
||||
+++ b/tryton/modules/currency/tests/scenario_currency_rate_update.rst
|
||||
@@ -11,6 +11,7 @@ Imports::
|
||||
>>> today = dt.date.today()
|
||||
>>> previous_week = today - dt.timedelta(days=7)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/trytond/trytond/modules/account/move_template.py b/trytond/trytond/modules/account/move_template.py
|
||||
diff --git a/tryton/modules/account/move_template.py b/tryton/trytond/trytond/modules/account/move_template.py
|
||||
index cbb3aa6..6927533 100644
|
||||
--- a/trytond/trytond/modules/account/move_template.py
|
||||
+++ b/trytond/trytond/modules/account/move_template.py
|
||||
--- a/tryton/modules/account/move_template.py
|
||||
+++ b/tryton/modules/account/move_template.py
|
||||
@@ -68,7 +68,8 @@ class MoveTemplateKeyword(sequence_ordered(), ModelSQL, ModelView):
|
||||
__name__ = 'account.move.template.keyword'
|
||||
name = fields.Char('Name', required=True)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/trytond/trytond/modules/stock_lot/stock.py b/trytond/trytond/modules/stock_lot/stock.py
|
||||
diff --git a/tryton/modules/stock_lot/stock.py b/tryton/trytond/trytond/modules/stock_lot/stock.py
|
||||
index c3d204e..3e93c4e 100644
|
||||
--- a/trytond/trytond/modules/stock_lot/stock.py
|
||||
+++ b/trytond/trytond/modules/stock_lot/stock.py
|
||||
--- a/tryton/modules/stock_lot/stock.py
|
||||
+++ b/tryton/modules/stock_lot/stock.py
|
||||
@@ -7,7 +7,7 @@ from functools import wraps
|
||||
from sql import Column
|
||||
|
||||
|
@ -20,10 +20,10 @@ index c3d204e..3e93c4e 100644
|
|||
"Stock Lot"
|
||||
__name__ = 'stock.lot'
|
||||
_rec_name = 'number'
|
||||
diff --git a/trytond/trytond/modules/stock_lot/view/lot_form.xml b/trytond/trytond/modules/stock_lot/view/lot_form.xml
|
||||
diff --git a/tryton/modules/stock_lot/view/lot_form.xml b/tryton/trytond/trytond/modules/stock_lot/view/lot_form.xml
|
||||
index a71a859..f05aa2a 100644
|
||||
--- a/trytond/trytond/modules/stock_lot/view/lot_form.xml
|
||||
+++ b/trytond/trytond/modules/stock_lot/view/lot_form.xml
|
||||
--- a/tryton/modules/stock_lot/view/lot_form.xml
|
||||
+++ b/tryton/modules/stock_lot/view/lot_form.xml
|
||||
@@ -4,6 +4,10 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<form>
|
||||
<label name="number"/>
|
||||
|
@ -35,10 +35,10 @@ index a71a859..f05aa2a 100644
|
|||
<label name="product"/>
|
||||
<field name="product"/>
|
||||
|
||||
diff --git a/trytond/trytond/modules/stock_lot_sled/view/view/lot_form.xml b/trytond/trytond/modules/stock_lot_sled/view/lot_form.xml
|
||||
diff --git a/tryton/modules/stock_lot_sled/view/view/lot_form.xml b/tryton/trytond/trytond/modules/stock_lot_sled/view/lot_form.xml
|
||||
index 11acbc1..f53e907 100644
|
||||
--- a/trytond/trytond/modules/stock_lot_sled/view/lot_form.xml
|
||||
+++ b/trytond/trytond/modules/stock_lot_sled/view/lot_form.xml
|
||||
--- a/tryton/modules/stock_lot_sled/view/lot_form.xml
|
||||
+++ b/tryton/modules/stock_lot_sled/view/lot_form.xml
|
||||
@@ -3,6 +3,7 @@
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<data>
|
||||
|
@ -47,10 +47,10 @@ index 11acbc1..f53e907 100644
|
|||
<label name="shelf_life_expiration_date"/>
|
||||
<field name="shelf_life_expiration_date"/>
|
||||
<label name="expiration_date"/>
|
||||
diff --git a/trytond/trytond/modules/stock_lot_unit/view/lot_form.xml b/trytond/trytond/modules/stock_lot_unit/view/lot_form.xml
|
||||
diff --git a/tryton/modules/stock_lot_unit/view/lot_form.xml b/tryton/trytond/trytond/modules/stock_lot_unit/view/lot_form.xml
|
||||
index c01f8e1..03fad7d 100644
|
||||
--- a/trytond/trytond/modules/stock_lot_unit/view/lot_form.xml
|
||||
+++ b/trytond/trytond/modules/stock_lot_unit/view/lot_form.xml
|
||||
--- a/tryton/modules/stock_lot_unit/view/lot_form.xml
|
||||
+++ b/tryton/modules/stock_lot_unit/view/lot_form.xml
|
||||
@@ -3,6 +3,7 @@
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<data>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- a/trytond/trytond/worker.py
|
||||
+++ b/trytond/trytond/worker.py
|
||||
--- a/tryton/trytond/trytond/worker.py
|
||||
+++ b/tryton/trytond/trytond/worker.py
|
||||
@@ -73,7 +73,10 @@
|
||||
while len(tasks.filter()) >= processes:
|
||||
time.sleep(0.1)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r d5e2bdf73e16 account.xml
|
||||
--- a/trytond/trytond/modules/account/account.xml Sun Apr 07 19:50:02 2019 +0200
|
||||
+++ b/trytond/trytond/modules/account/account.xml Fri Apr 12 21:43:14 2019 +0200
|
||||
--- a/tryton/modules/account/account.xml Sun Apr 07 19:50:02 2019 +0200
|
||||
+++ b/tryton/modules/account/account.xml Fri Apr 12 21:43:14 2019 +0200
|
||||
@@ -747,5 +747,22 @@
|
||||
<field name="model">account.aged_balance,-1</field>
|
||||
<field name="action" ref="report_aged_balance"/>
|
||||
|
@ -25,8 +25,8 @@ diff -r d5e2bdf73e16 account.xml
|
|||
</data>
|
||||
</tryton>
|
||||
diff -r d5e2bdf73e16 move.xml
|
||||
--- a//trytond/trytond/modules/account/move.xml Sun Apr 07 19:50:02 2019 +0200
|
||||
+++ b//trytond/trytond/modules/account/move.xml Fri Apr 12 21:43:14 2019 +0200
|
||||
--- a//tryton/modules/account/move.xml Sun Apr 07 19:50:02 2019 +0200
|
||||
+++ b//tryton/modules/account/move.xml Fri Apr 12 21:43:14 2019 +0200
|
||||
@@ -411,5 +411,30 @@
|
||||
<field name="report_name">account.move.general_journal</field>
|
||||
<field name="report">account/general_journal.fodt</field>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r 1329bfa523a8 trytond/trytond/modules/analytic_account/line.py
|
||||
--- a/trytond/trytond/modules/analytic_account/line.py Mon Apr 23 17:28:19 2018 +0200
|
||||
+++ b/trytond/trytond/modules/analytic_account/line.py Fri May 11 13:16:07 2018 +0200
|
||||
diff -r 1329bfa523a8 trytond/tryton/trytond/modules/analytic_account/line.py
|
||||
--- a/tryton/modules/analytic_account/line.py Mon Apr 23 17:28:19 2018 +0200
|
||||
+++ b/tryton/modules/analytic_account/line.py Fri May 11 13:16:07 2018 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
'on_change_with_company', searcher='search_company')
|
||||
account = fields.Many2One('analytic_account.account', 'Account',
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r 27ef44e71712 inventory.xml
|
||||
--- a/trytond/trytond/modules/stock/inventory.xml Thu Apr 04 17:02:50 2019 +0200
|
||||
+++ b/trytond/trytond/modules/stock/inventory.xml Thu Apr 04 17:10:20 2019 +0200
|
||||
--- a/tryton/modules/stock/inventory.xml Thu Apr 04 17:02:50 2019 +0200
|
||||
+++ b/tryton/modules/stock/inventory.xml Thu Apr 04 17:10:20 2019 +0200
|
||||
@@ -60,6 +60,16 @@
|
||||
<field name="name">inventory_line_tree</field>
|
||||
</record>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r 9cd9f1c27fdd trytond/trytond/modules/account_invoice/invoice.xml
|
||||
--- a/trytond/trytond/modules/account_invoice/invoice.xml Mon Apr 23 17:32:58 2018 +0200
|
||||
+++ b/trytond/trytond/modules/account_invoice/invoice.xml Fri May 11 13:11:48 2018 +0200
|
||||
diff -r 9cd9f1c27fdd trytond/tryton/trytond/modules/account_invoice/invoice.xml
|
||||
--- a/tryton/modules/account_invoice/invoice.xml Mon Apr 23 17:32:58 2018 +0200
|
||||
+++ b/tryton/modules/account_invoice/invoice.xml Fri May 11 13:11:48 2018 +0200
|
||||
@@ -132,6 +132,17 @@
|
||||
<menuitem parent="menu_invoices" action="act_invoice_in_form"
|
||||
id="menu_invoice_in_form" sequence="3"/>
|
||||
|
@ -19,9 +19,9 @@ diff -r 9cd9f1c27fdd trytond/trytond/modules/account_invoice/invoice.xml
|
|||
<record model="ir.model.access" id="access_invoice">
|
||||
<field name="model" search="[('model', '=', 'account.invoice')]"/>
|
||||
<field name="perm_read" eval="False"/>
|
||||
diff -r 9cd9f1c27fdd trytond/trytond/modules/account_invoice/locale/ca.po
|
||||
--- a/trytond/trytond/modules/account_invoice/locale/ca.po Mon Apr 23 17:32:58 2018 +0200
|
||||
+++ b/trytond/trytond/modules/account_invoice/locale/ca.po Fri May 11 13:11:48 2018 +0200
|
||||
diff -r 9cd9f1c27fdd trytond/tryton/trytond/modules/account_invoice/locale/ca.po
|
||||
--- a/tryton/modules/account_invoice/locale/ca.po Mon Apr 23 17:32:58 2018 +0200
|
||||
+++ b/tryton/modules/account_invoice/locale/ca.po Fri May 11 13:11:48 2018 +0200
|
||||
@@ -1127,6 +1127,10 @@
|
||||
msgid "Invoice Tax"
|
||||
msgstr "Impost de factura"
|
||||
|
@ -33,9 +33,9 @@ diff -r 9cd9f1c27fdd trytond/trytond/modules/account_invoice/locale/ca.po
|
|||
msgctxt "model:ir.action,name:act_invoice_form"
|
||||
msgid "Invoices"
|
||||
msgstr "Factures"
|
||||
diff -r 9cd9f1c27fdd trytond/trytond/modules/account_invoice/locale/es.po
|
||||
--- a/trytond/trytond/modules/account_invoice/locale/es.po Mon Apr 23 17:32:58 2018 +0200
|
||||
+++ b/trytond/trytond/modules/account_invoice/locale/es.po Fri May 11 13:11:48 2018 +0200
|
||||
diff -r 9cd9f1c27fdd trytond/tryton/trytond/modules/account_invoice/locale/es.po
|
||||
--- a/tryton/modules/account_invoice/locale/es.po Mon Apr 23 17:32:58 2018 +0200
|
||||
+++ b/tryton/modules/account_invoice/locale/es.po Fri May 11 13:11:48 2018 +0200
|
||||
@@ -1123,6 +1123,10 @@
|
||||
msgid "Invoice Tax"
|
||||
msgstr "Impuesto de factura"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r 80d34e8f57a0 trytond/trytond/modules/account_invoice/invoice.xml
|
||||
--- a/trytond/trytond/modules/account_invoice/invoice.xml Mon Jul 08 11:14:42 2019 +0200
|
||||
+++ b/trytond/trytond/modules/account_invoice/invoice.xml Mon Jul 08 11:15:43 2019 +0200
|
||||
diff -r 80d34e8f57a0 trytond/tryton/trytond/modules/account_invoice/invoice.xml
|
||||
--- a/tryton/modules/account_invoice/invoice.xml Mon Jul 08 11:14:42 2019 +0200
|
||||
+++ b/tryton/modules/account_invoice/invoice.xml Mon Jul 08 11:15:43 2019 +0200
|
||||
@@ -411,5 +411,17 @@
|
||||
pyson="1"/>
|
||||
<field name="rule_group" ref="rule_group_invoice_line"/>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r 6597f33e51d2 invoice.py
|
||||
--- a/trytond/trytond/modules/account_invoice/invoice.py Fri Aug 09 16:33:39 2019 +0200
|
||||
+++ b/trytond/trytond/modules/account_invoice/invoice.py Wed Aug 28 23:44:50 2019 +0200
|
||||
--- a/tryton/modules/account_invoice/invoice.py Fri Aug 09 16:33:39 2019 +0200
|
||||
+++ b/tryton/modules/account_invoice/invoice.py Wed Aug 28 23:44:50 2019 +0200
|
||||
@@ -2657,7 +2657,7 @@ class InvoiceTax(sequence_ordered(), ModelSQL, ModelView):
|
||||
self.account = self.tax.credit_note_account
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- a/trytond/trytond/modules/stock/move.py
|
||||
+++ b/trytond/trytond/modules/stock/move.py
|
||||
--- a/tryton/modules/stock/move.py
|
||||
+++ b/tryton/modules/stock/move.py
|
||||
@@ -949,6 +949,8 @@
|
||||
child_locations = {}
|
||||
to_write = []
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/trytond/model/model.py b/trytond/model/model.py
|
||||
diff --git a/tryton/trytond/model/model.py b/trytond/model/model.py
|
||||
index c4ab96fc..bdb1c78b 100644
|
||||
--- a/trytond/trytond/model/model.py
|
||||
+++ b/trytond/trytond/model/model.py
|
||||
--- a/tryton/trytond/trytond/model/model.py
|
||||
+++ b/tryton/trytond/trytond/model/model.py
|
||||
@@ -258,7 +258,7 @@ class Model(URLMixin, PoolBase, metaclass=ModelMeta):
|
||||
name = name[len('_parent_'):]
|
||||
parent_values[name][field] = value
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/__init__.py b/__init__.py
|
||||
index c5c21fb..484a6de 100644
|
||||
--- a/trytond/trytond/modules/sale_supply/__init__.py
|
||||
+++ b/trytond/trytond/modules/sale_supply/__init__.py
|
||||
--- a/tryton/modules/sale_supply/__init__.py
|
||||
+++ b/tryton/modules/sale_supply/__init__.py
|
||||
@@ -14,6 +14,7 @@ def register():
|
||||
purchase.Purchase,
|
||||
stock.ShipmentIn,
|
||||
|
@ -12,8 +12,8 @@ index c5c21fb..484a6de 100644
|
|||
Pool.register(
|
||||
diff --git a/product.py b/product.py
|
||||
index 08537ed..34ccc24 100644
|
||||
--- a/trytond/trytond/modules/sale_supply/product.py
|
||||
+++ b/trytond/trytond/modules/sale_supply/product.py
|
||||
--- a/tryton/modules/sale_supply/product.py
|
||||
+++ b/tryton/modules/sale_supply/product.py
|
||||
@@ -1,17 +1,35 @@
|
||||
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
# this repository contains the full copyright notices and license terms.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/sao/src/sao-variables.less b/sao/src/sao-variables.less
|
||||
diff --git a/tryton/sao/src/sao-variables.less b/sao/src/sao-variables.less
|
||||
index 7c27f22..e1b5ee0 100644
|
||||
--- a/sao/src/sao-variables.less
|
||||
+++ b/sao/src/sao-variables.less
|
||||
--- a/tryton/sao/src/sao-variables.less
|
||||
+++ b/tryton/sao/src/sao-variables.less
|
||||
@@ -1,8 +1,9 @@
|
||||
/* This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. */
|
||||
|
@ -38,10 +38,10 @@ index 7c27f22..e1b5ee0 100644
|
|||
|
||||
@icon-font-path: "../bower_components/bootstrap/fonts/";
|
||||
|
||||
diff --git a/sao/src/sao.less b/sao/src/sao.less
|
||||
diff --git a/tryton/sao/src/sao.less b/sao/src/sao.less
|
||||
index f30d758..b0e317a 100644
|
||||
--- a/sao/src/sao.less
|
||||
+++ b/sao/src/sao.less
|
||||
--- a/tryton/sao/src/sao.less
|
||||
+++ b/tryton/sao/src/sao.less
|
||||
@@ -63,6 +63,12 @@ html[theme="default"] {
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/sao/src/common.js b/sao/src/common.js
|
||||
diff --git a/tryton/sao/src/common.js b/sao/src/common.js
|
||||
index f1354013..16d263d1 100644
|
||||
--- a/sao/src/common.js
|
||||
+++ b/sao/src/common.js
|
||||
--- a/tryton/sao/src/common.js
|
||||
+++ b/tryton/sao/src/common.js
|
||||
@@ -1183,17 +1183,8 @@
|
||||
if (~['many2one', 'one2one', 'one2many', 'many2many']
|
||||
.indexOf(field.type)) {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/sao/src/sao.js b/sao/src/sao.js
|
||||
diff --git a/tryton/sao/src/sao.js b/sao/src/sao.js
|
||||
index 05d86252..fcedb792 100644
|
||||
--- a/sao/src/sao.js
|
||||
+++ b/sao/src/sao.js
|
||||
--- a/tryton/sao/src/sao.js
|
||||
+++ b/tryton/sao/src/sao.js
|
||||
@@ -1081,10 +1081,6 @@ var Sao = {};
|
||||
shortcut: 'ctrl+p',
|
||||
label: Sao.i18n.gettext('Print'),
|
||||
|
@ -15,8 +15,8 @@ index 05d86252..fcedb792 100644
|
|||
label: Sao.i18n.gettext('Previous tab'),
|
||||
diff --git a/src/tab.js b/src/tab.js
|
||||
index f9186bc9..47987500 100644
|
||||
--- a/sao/src/tab.js
|
||||
+++ b/sao/src/tab.js
|
||||
--- a/tryton/sao/src/tab.js
|
||||
+++ b/tryton/sao/src/tab.js
|
||||
@@ -91,11 +91,6 @@
|
||||
id: 'print',
|
||||
icon: 'tryton-print',
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/location.py b/location.py
|
||||
index 87104cf..3d89bdb 100644
|
||||
--- a/trytond/trytond/modules/stock/location.py
|
||||
+++ b/trytond/trytond/modules/stock/location.py
|
||||
--- a/tryton/modules/stock/location.py
|
||||
+++ b/tryton/modules/stock/location.py
|
||||
@@ -72,7 +72,7 @@ class Location(DeactivableMixin, tree(), ModelSQL, ModelView):
|
||||
help="Check to enforce a single level of children with no "
|
||||
"grandchildren.")
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/account.py b/account.py
|
||||
index 974a027..60b320f 100644
|
||||
--- a/trytond/trytond/modules/account/account.py
|
||||
+++ a/trytond/trytond/modules/account/account.py
|
||||
--- a/tryton/modules/account/account.py
|
||||
+++ a/tryton/modules/account/account.py
|
||||
@@ -2035,7 +2035,7 @@ class GeneralLedgerAccountContext(ModelView):
|
||||
'General Ledger Account Context'
|
||||
__name__ = 'account.general_ledger.account.context'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff --git a/tax.py b/tax.py
|
||||
--- a/trytond/trytond/modules/account/tax.py Thu Gen 20 10:25:13 2020 +0200
|
||||
+++ b/trytond/trytond/modules/account/tax.py Thu Gen 20 10:32:48 2020 +0200
|
||||
--- a/tryton/modules/account/tax.py Thu Gen 20 10:25:13 2020 +0200
|
||||
+++ b/tryton/modules/account/tax.py Thu Gen 20 10:32:48 2020 +0200
|
||||
@@ -906,7 +906,8 @@ class Tax(sequence_ordered(), ModelSQL, ModelView, DeactivableMixin):
|
||||
if len(tax.childs):
|
||||
values.extend(
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/trytond/trytond/worker.py b/trytond/trytond/worker.py
|
||||
diff --git a/tryton/trytond/trytond/worker.py b/trytond/trytond/worker.py
|
||||
index 5ce8ef0d..b5921908 100644
|
||||
--- a/trytond/trytond/worker.py
|
||||
+++ b/trytond/trytond/worker.py
|
||||
--- a/tryton/trytond/trytond/worker.py
|
||||
+++ b/tryton/trytond/trytond/worker.py
|
||||
@@ -139,6 +139,9 @@ def run_task(pool, task_id):
|
||||
except (UserError, UserWarning) as e:
|
||||
Error.log(task, e)
|
||||
|
|
Loading…
Reference in a new issue