NaNtic
/
trytond-patches
mirror of https://github.com/NaN-tic/trytond-patches.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use new core monorepository.

This commit is contained in:
Albert Cervera i Areny 2023-01-04 16:05:47 +01:00
parent ddafa8ae4a
commit 3c36a42d8f
18 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
analitic_line_company_rules.diff
View File

@ -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>

12
babi_multiprocess.diff
View File

@ -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(

6
issue11731.diff
View File

@ -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)

8
issue3932.diff
View File

@ -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>

6
issue4030.diff
View File

@ -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
@@ -29,7 +29,7 @@ class Line(ModelSQL, ModelView):
account = fields.Many2One(
'analytic_account.account', "Account", required=True,

4
issue4482.diff
View File

@ -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>

18
issue4506.diff
View File

@ -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"

6
issue8479.diff
View File

@ -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"/>

4
issue8618.diff
View File

@ -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

4
issue9802.diff
View File

@ -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 = []

6
model.diff
View File

@ -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

8
sale_supply_supply_on_sale_multivalue.diff
View File

@ -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.

12
sao_colors.diff
View File

@ -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
@@ -70,6 +70,12 @@ html[theme="default"] {
}
}

10
sao_remove_email.diff
View File

@ -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',

4
search_warehouse.diff
View File

@ -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.")

4
statement_of_account.diff
View File

@ -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'

4
tax_update_unit_price.diff
View File

@ -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(

6
worker_logger.diff
View File

@ -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 b0d751fb..16070d9b 100644
--- a/trytond/trytond/worker.py
+++ b/trytond/trytond/worker.py
--- a/tryton/trytond/trytond/worker.py
+++ b/tryton/trytond/trytond/worker.py
@@ -143,6 +143,9 @@ def run_task(pool, task_id):
except (UserError, UserWarning) as e:
Error.log(task, e)