From 8ad488bbe6a9a7ca757e4111f5e48bfa7668a7ba Mon Sep 17 00:00:00 2001 From: ?ngel ?lvarez Date: Mon, 30 Apr 2018 14:09:19 +0200 Subject: [PATCH] update patches to not take care about symbolic links --- account_chart_speedup.diff | 12 ++++---- issue17151002_80001.diff | 28 +++++++++---------- ...ove_performance_of_average_cost_price.diff | 4 +-- multicompany_account_product.diff | 4 +-- sale_shipment_grouping.diff | 4 +-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/account_chart_speedup.diff b/account_chart_speedup.diff index 64c2fa2..36b23f9 100644 --- a/account_chart_speedup.diff +++ b/account_chart_speedup.diff @@ -1,6 +1,6 @@ diff -r 8bae00903e21 account.py ---- a/modules/account/account.py Thu Dec 10 13:03:38 2015 +0100 -+++ b/modules/account/account.py Thu Dec 10 13:06:19 2015 +0100 +--- a/trytond/trytond/modules/account/account.py Thu Dec 10 13:03:38 2015 +0100 ++++ b/trytond/trytond/modules/account/account.py Thu Dec 10 13:06:19 2015 +0100 @@ -1699,11 +1699,20 @@ ('account', '=', account_template.id), ('parent', '=', None), @@ -21,7 +21,7 @@ diff -r 8bae00903e21 account.py + template2tax_code=template2tax_code, + template2account=template2account, + template2tax=template2tax) - + # Update taxes on accounts account_template.update_account_taxes(template2account, @@ -1726,6 +1735,7 @@ @@ -30,12 +30,12 @@ diff -r 8bae00903e21 account.py template2rule, template2rule_line=template2rule_line) + return 'properties' - + def default_properties(self, fields): diff -r 21688b4ca06a tryton.cfg ---- a/modules/account_es/tryton.cfg Tue Aug 11 16:16:46 2015 +0200 -+++ b/modules/account_es/tryton.cfg Thu Sep 03 16:48:10 2015 +0200 +--- a/trytond/trytond/modules/account_es/tryton.cfg Tue Aug 11 16:16:46 2015 +0200 ++++ b/trytond/trytond/modules/account_es/tryton.cfg Thu Sep 03 16:48:10 2015 +0200 @@ -3,6 +3,7 @@ depends: ir diff --git a/issue17151002_80001.diff b/issue17151002_80001.diff index 3690f00..cffdce7 100644 --- a/issue17151002_80001.diff +++ b/issue17151002_80001.diff @@ -1,6 +1,6 @@ diff -r c78f5fd48086 configuration.py ---- a/modules/stock/configuration.py Thu Mar 31 10:01:41 2016 +0200 -+++ b/modules/stock//configuration.py Thu Mar 31 10:45:19 2016 +0200 +--- a/trytond/trytond/modules/stock/configuration.py Thu Mar 31 10:01:41 2016 +0200 ++++ b/trytond/trytond/modules/stock//configuration.py Thu Mar 31 10:45:19 2016 +0200 @@ -39,3 +39,9 @@ [Eval('context', {}).get('company', -1), None]), ('code', '=', 'stock.shipment.internal'), @@ -12,8 +12,8 @@ diff -r c78f5fd48086 configuration.py + ('code', '=', 'stock.inventory'), + ], required=True)) diff -r c78f5fd48086 configuration.xml ---- a/modules/stock/configuration.xml Thu Mar 31 10:01:41 2016 +0200 -+++ b/modules/stock//configuration.xml Thu Mar 31 10:45:19 2016 +0200 +--- a/trytond/trytond/modules/stock/configuration.xml Thu Mar 31 10:01:41 2016 +0200 ++++ b/trytond/trytond/modules/stock//configuration.xml Thu Mar 31 10:45:19 2016 +0200 @@ -52,6 +52,13 @@ @@ -29,8 +29,8 @@ diff -r c78f5fd48086 configuration.xml diff -r c78f5fd48086 inventory.py ---- a/modules/stock/inventory.py Thu Mar 31 10:01:41 2016 +0200 -+++ b/modules/stock//inventory.py Thu Mar 31 10:45:19 2016 +0200 +--- a/trytond/trytond/modules/stock/inventory.py Thu Mar 31 10:01:41 2016 +0200 ++++ b/trytond/trytond/modules/stock//inventory.py Thu Mar 31 10:45:19 2016 +0200 @@ -17,6 +17,8 @@ class Inventory(Workflow, ModelSQL, ModelView): 'Stock Inventory' @@ -69,8 +69,8 @@ diff -r c78f5fd48086 inventory.py new_inventories = [] for inventory in inventories: diff -r c78f5fd48086 inventory.xml ---- a/modules/stock/inventory.xml Thu Mar 31 10:01:41 2016 +0200 -+++ b/modules/stock//inventory.xml Thu Mar 31 10:45:19 2016 +0200 +--- a/trytond/trytond/modules/stock/inventory.xml Thu Mar 31 10:01:41 2016 +0200 ++++ b/trytond/trytond/modules/stock//inventory.xml Thu Mar 31 10:45:19 2016 +0200 @@ -118,5 +118,25 @@ @@ -98,8 +98,8 @@ diff -r c78f5fd48086 inventory.xml diff -r c78f5fd48086 view/configuration_form.xml ---- a/modules/stock/view/configuration_form.xml Thu Mar 31 10:01:41 2016 +0200 -+++ b/modules/stock//view/configuration_form.xml Thu Mar 31 10:45:19 2016 +0200 +--- a/trytond/trytond/modules/stock/view/configuration_form.xml Thu Mar 31 10:01:41 2016 +0200 ++++ b/trytond/trytond/modules/stock//view/configuration_form.xml Thu Mar 31 10:45:19 2016 +0200 @@ -2,6 +2,7 @@ @@ -117,8 +117,8 @@ diff -r c78f5fd48086 view/configuration_form.xml + diff -r c78f5fd48086 view/inventory_form.xml ---- a/modules/stock/view/inventory_form.xml Thu Mar 31 10:01:41 2016 +0200 -+++ b/modules/stock//view/inventory_form.xml Thu Mar 31 10:45:19 2016 +0200 +--- a/trytond/trytond/modules/stock/view/inventory_form.xml Thu Mar 31 10:01:41 2016 +0200 ++++ b/trytond/trytond/modules/stock//view/inventory_form.xml Thu Mar 31 10:45:19 2016 +0200 @@ -4,13 +4,15 @@