update patches to not take care about symbolic links
This commit is contained in:
parent
0684bff745
commit
8ad488bbe6
|
@ -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
|
||||
|
|
|
@ -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 @@
|
||||
<field name="value" eval="'ir.sequence,' + str(ref('sequence_shipment_internal'))"/>
|
||||
</record>
|
||||
|
@ -29,8 +29,8 @@ diff -r c78f5fd48086 configuration.xml
|
|||
<field name="model" search="[('model', '=', 'stock.configuration')]"/>
|
||||
<field name="perm_read" eval="True"/>
|
||||
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 @@
|
||||
<field name="group" ref="group_stock"/>
|
||||
</record>
|
||||
|
@ -98,8 +98,8 @@ diff -r c78f5fd48086 inventory.xml
|
|||
</data>
|
||||
</tryton>
|
||||
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 @@
|
||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
|
@ -117,8 +117,8 @@ diff -r c78f5fd48086 view/configuration_form.xml
|
|||
+ <field name="inventory_sequence"/>
|
||||
</form>
|
||||
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 @@
|
||||
<form string="Inventory" col="4">
|
||||
<label name="location"/>
|
||||
|
@ -139,8 +139,8 @@ diff -r c78f5fd48086 view/inventory_form.xml
|
|||
name="complete_lines" colspan="2"
|
||||
help="Add an inventory line for each missing products"/>
|
||||
diff -r c78f5fd48086 view/inventory_tree.xml
|
||||
--- a/modules/stock/view/inventory_tree.xml Thu Mar 31 10:01:41 2016 +0200
|
||||
+++ b/modules/stock//view/inventory_tree.xml Thu Mar 31 10:45:19 2016 +0200
|
||||
--- a/trytond/trytond/modules/stock/view/inventory_tree.xml Thu Mar 31 10:01:41 2016 +0200
|
||||
+++ b/trytond/trytond/modules/stock//view/inventory_tree.xml Thu Mar 31 10:45:19 2016 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
# http://hg.tryton.org/modules/stock/rev/9b49590277df
|
||||
|
||||
diff -r 99021dd6717a move.py
|
||||
--- a/modules/stock/move.py Wed Oct 25 09:54:30 2017 +0200
|
||||
+++ b/modules/stock/move.py Wed Oct 25 16:43:23 2017 +0200
|
||||
--- a/trytond/trytond/modules/stock/move.py Wed Oct 25 09:54:30 2017 +0200
|
||||
+++ b/trytond/trytond/modules/stock/move.py Wed Oct 25 16:43:23 2017 +0200
|
||||
@@ -1,3 +1,4 @@
|
||||
+
|
||||
#This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r dfbce32f79c5 product.py
|
||||
--- a/modules/account_product/product.py Sun Mar 01 19:19:20 2015 +0100
|
||||
+++ b/modules/account_product/product.py Wed Jul 12 12:42:53 2017 +0200
|
||||
--- a/trytond/trytond/modules/account_product/product.py Sun Mar 01 19:19:20 2015 +0100
|
||||
+++ b/trytond/trytond/modules/account_product/product.py Wed Jul 12 12:42:53 2017 +0200
|
||||
@@ -74,6 +74,7 @@
|
||||
domain=[('parent', '=', None), ['OR',
|
||||
('group', '=', None),
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -r e098ffef0317 sale.py
|
||||
--- a/modules/sale_shipment_grouping/sale.py Sat Feb 21 09:21:21 2015 +0100
|
||||
+++ b/modules/sale_shipment_grouping/sale.py Tue Feb 16 10:43:38 2016 +0100
|
||||
--- a/trytond/trytond/modules/sale_shipment_grouping/sale.py Sat Feb 21 09:21:21 2015 +0100
|
||||
+++ b/trytond/trytond/modules/sale_shipment_grouping/sale.py Tue Feb 16 10:43:38 2016 +0100
|
||||
@@ -37,6 +37,8 @@
|
||||
defaults = Shipment.default_get(self._shipment_grouping_fields,
|
||||
with_rec_name=False)
|
||||
|
|
Loading…
Reference in New Issue