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:09:24 +01:00
parent f33e2b9514
commit 475a1acf35
88 changed files with 394 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
account_asset.diff
View File

@ -1,7 +1,7 @@
diff --git a/asset.py b/asset.py
index fc23ca8..cc10240 100644
--- a/trytond/trytond/modules/account_asset/asset.py Mon May 06 14:53:17 2019 +0200
+++ b/trytond/trytond/modules/account_asset/asset.py Tue Jun 11 22:56:45 2019 +0200
--- a/tryton/modules/account_asset/asset.py Mon May 06 14:53:17 2019 +0200
+++ b/tryton/modules/account_asset/asset.py Tue Jun 11 22:56:45 2019 +0200
@@ -757,7 +757,7 @@ class UpdateAssetShowDepreciation(ModelView):
date = fields.Date('Date', required=True,
domain=[

6
account_asset_update_asset.diff
View File

@ -1,7 +1,7 @@
diff --git a//trytond/trytond/modules/account_asset/asset.py b//trytond/trytond/modules/account_asset/asset.py
diff --git a//tryton/modules/account_asset/asset.py b//tryton/trytond/trytond/modules/account_asset/asset.py
index cf5191f..661982a 100644
--- a//trytond/trytond/modules/account_asset/asset.py
+++ b//trytond/trytond/modules/account_asset/asset.py
--- a//tryton/modules/account_asset/asset.py
+++ b//tryton/modules/account_asset/asset.py
@@ -745,15 +745,32 @@ class CreateMoves(Wizard):
class UpdateAssetStart(ModelView):
'Update Asset Start'

4
account_payment_search_payment_amount.diff
View File

@ -1,6 +1,6 @@
diff --git a/account.py b/account.py
--- a/trytond/trytond/modules/account_payment/account.py
+++ b/trytond/trytond/modules/account_payment/account.py
--- a/tryton/modules/account_payment/account.py
+++ b/tryton/modules/account_payment/account.py
@@ -116,7 +116,7 @@ class MoveLine(metaclass=PoolMeta):
account = Account.__table__()
account_type = AccountType.__table__()

4
account_payment_sepa_locale.diff
View File

@ -1,6 +1,6 @@
diff -r b291668a47fa locale/es.po
--- a/trytond/trytond/modules/account_payment_sepa/locale/es.po Mon Nov 04 12:53:29 2019 +0100
+++ b/trytond/trytond/modules/account_payment_sepa/locale/es.po Wed Nov 20 11:59:52 2019 +0100
--- a/tryton/modules/account_payment_sepa/locale/es.po Mon Nov 04 12:53:29 2019 +0100
+++ b/tryton/modules/account_payment_sepa/locale/es.po Wed Nov 20 11:59:52 2019 +0100
@@ -266,11 +266,11 @@
msgctxt "model:ir.message,text:msg_payment_process_no_iban"

4
account_payment_view.diff
View File

@ -1,6 +1,6 @@
diff -r 9070eb9cb2e2 view/move_line_list.xml
--- a/trytond/trytond/modules/account_payment/view/move_line_list.xml Wed Oct 16 21:18:12 2019 +0200
+++ b/trytond/trytond/modules/account_payment/view/move_line_list.xml Tue Oct 22 14:43:33 2019 +0200
--- a/tryton/modules/account_payment/view/move_line_list.xml Wed Oct 16 21:18:12 2019 +0200
+++ b/tryton/modules/account_payment/view/move_line_list.xml Tue Oct 22 14:43:33 2019 +0200
@@ -3,7 +3,7 @@
this repository contains the full copyright notices and license terms. -->
<tree>

6
advance_payment_term.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/sale_advance_payment/sale.py b/trytond/trytond/modules/sale_advance_payment/sale.py
diff --git a/tryton/modules/sale_advance_payment/sale.py b/tryton/trytond/trytond/modules/sale_advance_payment/sale.py
index fec4ad8..629c94d 100644
--- a/trytond/trytond/modules/sale_advance_payment/sale.py
+++ b/trytond/trytond/modules/sale_advance_payment/sale.py
--- a/tryton/modules/sale_advance_payment/sale.py
+++ b/tryton/modules/sale_advance_payment/sale.py
@@ -83,19 +83,20 @@ class AdvancePaymentTermLine(ModelView, ModelSQL, CompanyMultiValueMixin):
"- total_amount: The total amount of the sale.\n"
"- untaxed_amount: The total untaxed amount of the sale.")

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>

6
babi_multiprocess.diff
View File

@ -1,6 +1,6 @@
diff -r 0bde16075654 trytond/trytond/pool.py
--- a/trytond/trytond/pool.py Sun Jul 28 16:05:45 2019 +0200
+++ b/trytond/trytond/pool.py Fri Aug 16 11:13:08 2019 +0000
diff -r 0bde16075654 trytond/tryton/trytond/pool.py
--- a/tryton/trytond/trytond/pool.py Sun Jul 28 16:05:45 2019 +0200
+++ b/tryton/trytond/trytond/pool.py Fri Aug 16 11:13:08 2019 +0000
@@ -183,6 +183,12 @@
cls.__setup__()
self.add(cls, type)

4
cost_price_in_productions_without_inputs.diff
View File

@ -1,7 +1,7 @@
diff --git a/production.py b/production.py
index afdcdc3..85e6ec5 100644
--- a/trytond/trytond/modules/production/production.py
+++ b/trytond/trytond/modules/production/production.py
--- a/tryton/modules/production/production.py
+++ b/tryton/modules/production/production.py
@@ -467,6 +467,13 @@ class Production(Workflow, ModelSQL, ModelView):
if move.production_input not in productions:
cls.__queue__.set_cost([move.production_input])

8
deactivable_product_supplier.diff
View File

@ -1,7 +1,7 @@
diff --git a/product.py b/product.py
index 8281bdf..6188bfc 100644
--- a/trytond/trytond/modules/purchase/product.py
+++ b/trytond/trytond/modules/purchase/product.py
--- a/tryton/modules/purchase/product.py
+++ b/tryton/modules/purchase/product.py
@@ -6,8 +6,9 @@ from sql import Literal
from sql.aggregate import Count
@ -68,8 +68,8 @@ index 8281bdf..6188bfc 100644
diff --git a/view/product_supplier_form.xml b/view/product_supplier_form.xml
index c706b6e..1008559 100644
--- a/trytond/trytond/modules/purchase/view/product_supplier_form.xml
+++ b/trytond/trytond/modules/purchase/view/product_supplier_form.xml
--- a/tryton/modules/purchase/view/product_supplier_form.xml
+++ b/tryton/modules/purchase/view/product_supplier_form.xml
@@ -8,8 +8,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="product" colspan="3"/>
<label name="party"/>

4
fifo_quantity_round.diff
View File

@ -1,7 +1,7 @@
diff --git a/move.py b/move.py
index 1b41353..85c89eb 100644
--- a/trytond/trytond/modules/product_cost_fifo/move.py
+++ b/trytond/trytond/modules/product_cost_fifo/move.py
--- a/tryton/modules/product_cost_fifo/move.py
+++ b/tryton/modules/product_cost_fifo/move.py
@@ -105,6 +105,9 @@ class Move(metaclass=PoolMeta):
move_qty = Uom.compute_qty(self.product.default_uom, move_qty,
move.uom, round=False)

12
issue10009.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/ir/lang.xml b/trytond/trytond/ir/lang.xml
diff --git a/tryton/trytond/trytond/ir/lang.xml b/trytond/trytond/ir/lang.xml
index 9bd0b510..53d7e6b1 100644
--- a/trytond/trytond/ir/lang.xml
+++ b/trytond/trytond/ir/lang.xml
--- a/tryton/trytond/trytond/ir/lang.xml
+++ b/tryton/trytond/trytond/ir/lang.xml
@@ -479,7 +479,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_lang_form">
<field name="name">Languages</field>
@ -11,10 +11,10 @@ index 9bd0b510..53d7e6b1 100644
</record>
<record model="ir.action.act_window.view"
id="act_lang_form_view1">
diff --git a/trytond/trytond/ir/sequence.xml b/trytond/trytond/ir/sequence.xml
diff --git a/tryton/trytond/trytond/ir/sequence.xml b/trytond/trytond/ir/sequence.xml
index 702333af..fe1f7333 100644
--- a/trytond/trytond/ir/sequence.xml
+++ b/trytond/trytond/ir/sequence.xml
--- a/tryton/trytond/trytond/ir/sequence.xml
+++ b/tryton/trytond/trytond/ir/sequence.xml
@@ -20,7 +20,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Sequences</field>
<field name="type">ir.action.act_window</field>

34
issue10053.diff
View File

@ -1,5 +1,5 @@
--- a/trytond/trytond/modules/party/configuration.py
+++ b/trytond/trytond/modules/party/configuration.py
--- a/tryton/modules/party/configuration.py
+++ b/tryton/modules/party/configuration.py
@@ -1,11 +1,15 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
@ -81,8 +81,8 @@
class _ConfigurationValue(ModelSQL):
--- a/trytond/trytond/modules/party/message.xml
+++ b/trytond/trytond/modules/party/message.xml
--- a/tryton/modules/party/message.xml
+++ b/tryton/modules/party/message.xml
@@ -39,5 +39,8 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.message" id="msg_address_subdivision_country_code_unique">
<field name="text">The country code on subdivision type must be unique.</field>
@ -92,8 +92,8 @@
+ </record>
</data>
</tryton>
--- a/trytond/trytond/modules/party/party.py
+++ b/trytond/trytond/modules/party/party.py
--- a/tryton/modules/party/party.py
+++ b/tryton/modules/party/party.py
@@ -316,6 +316,147 @@ class PartyCategory(ModelSQL):
ondelete='CASCADE', required=True, select=True)
@ -373,8 +373,8 @@
@fields.depends('type', 'code')
def on_change_with_code(self):
if self.type and '_' in self.type:
--- a/trytond/trytond/modules/party/view/configuration_form.xml
+++ b/trytond/trytond/modules/party/view/configuration_form.xml
--- a/tryton/modules/party/view/configuration_form.xml
+++ b/tryton/modules/party/view/configuration_form.xml
@@ -6,4 +6,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="party_sequence"/>
<label name="party_lang"/>
@ -383,10 +383,10 @@
+ <label name="identifier_types"/>
+ <field name="identifier_types"/>
</form>
diff --git a/trytond/trytond/modules/account_payment_sepa/__init__.py b/trytond/trytond/modules/account_payment_sepa/__init__.py
diff --git a/tryton/modules/account_payment_sepa/__init__.py b/tryton/trytond/trytond/modules/account_payment_sepa/__init__.py
index 17457a9..feee60a 100644
--- a/trytond/trytond/modules/account_payment_sepa/__init__.py
+++ b/trytond/trytond/modules/account_payment_sepa/__init__.py
--- a/tryton/modules/account_payment_sepa/__init__.py
+++ b/tryton/modules/account_payment_sepa/__init__.py
@@ -13,6 +13,7 @@ def register():
payment.Mandate,
payment.Payment,
@ -395,10 +395,10 @@ index 17457a9..feee60a 100644
party.Party,
party.PartyIdentifier,
account.Configuration,
diff --git a/trytond/trytond/modules/account_payment_sepa/party.py b/trytond/trytond/modules/account_payment_sepa/party.py
diff --git a/tryton/modules/account_payment_sepa/party.py b/tryton/trytond/trytond/modules/account_payment_sepa/party.py
index 2b7c16c..54de8d7 100644
--- a/trytond/trytond/modules/account_payment_sepa/party.py
+++ b/trytond/trytond/modules/account_payment_sepa/party.py
--- a/tryton/modules/account_payment_sepa/party.py
+++ b/tryton/modules/account_payment_sepa/party.py
@@ -16,6 +16,15 @@ from trytond.modules.party.exceptions import InvalidIdentifierCode
from .exceptions import PartyIdentificationdError
@ -427,10 +427,10 @@ index 2b7c16c..54de8d7 100644
@fields.depends('party', '_parent_party.identifiers')
def check_code(self):
super(PartyIdentifier, self).check_code()
diff --git a/trytond/trytond/modules/account_payment_sepa/tests/test_account_payment_sepa.py b/trytond/trytond/modules/account_payment_sepa/tests/test_account_payment_sepa.py
diff --git a/tryton/modules/account_payment_sepa/tests/test_account_payment_sepa.py b/tryton/trytond/trytond/modules/account_payment_sepa/tests/test_account_payment_sepa.py
index 35ddddc..10e1337 100644
--- a/trytond/trytond/modules/account_payment_sepa/tests/test_account_payment_sepa.py
+++ b/trytond/trytond/modules/account_payment_sepa/tests/test_account_payment_sepa.py
--- a/tryton/modules/account_payment_sepa/tests/test_account_payment_sepa.py
+++ b/tryton/modules/account_payment_sepa/tests/test_account_payment_sepa.py
@@ -150,6 +150,17 @@ class AccountPaymentSepaTestCase(ModuleTestCase):
'Test Account Payment SEPA module'
module = 'account_payment_sepa'

4
issue10068.diff
View File

@ -1,5 +1,5 @@
--- a/trytond/trytond/wsgi.py
+++ b/trytond/trytond/wsgi.py
--- a/tryton/trytond/trytond/wsgi.py
+++ b/tryton/trytond/trytond/wsgi.py
@@ -4,6 +4,7 @@
import http.client
import logging

18
issue10271.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/sale/locale/ca.po b/trytond/trytond/modules/sale/locale/ca.po
diff --git a/tryton/modules/sale/locale/ca.po b/tryton/trytond/trytond/modules/sale/locale/ca.po
index 3b110ce..e4a79f6 100644
--- a/trytond/trytond/modules/sale/locale/ca.po
+++ b/trytond/trytond/modules/sale/locale/ca.po
--- a/tryton/modules/sale/locale/ca.po
+++ b/tryton/modules/sale/locale/ca.po
@@ -684,8 +684,8 @@ msgid "Total"
msgstr "Total"
@ -13,10 +13,10 @@ index 3b110ce..e4a79f6 100644
msgctxt "field:sale.sale,untaxed_amount:"
msgid "Untaxed"
diff --git a/trytond/trytond/modules/sale/locale/es.po b/trytond/trytond/modules/sale/locale/es.po
diff --git a/tryton/modules/sale/locale/es.po b/tryton/trytond/trytond/modules/sale/locale/es.po
index 7229496..aee4002 100644
--- a/trytond/trytond/modules/sale/locale/es.po
+++ b/trytond/trytond/modules/sale/locale/es.po
--- a/tryton/modules/sale/locale/es.po
+++ b/tryton/modules/sale/locale/es.po
@@ -684,8 +684,8 @@ msgid "Total"
msgstr "Total"
@ -28,10 +28,10 @@ index 7229496..aee4002 100644
msgctxt "field:sale.sale,untaxed_amount:"
msgid "Untaxed"
diff --git a/trytond/trytond/modules/sale/sale.py b/trytond/trytond/modules/sale/sale.py
diff --git a/tryton/modules/sale/sale.py b/tryton/trytond/trytond/modules/sale/sale.py
index b1096c2..b3699ee 100644
--- a/trytond/trytond/modules/sale/sale.py
+++ b/trytond/trytond/modules/sale/sale.py
--- a/tryton/modules/sale/sale.py
+++ b/tryton/modules/sale/sale.py
@@ -167,7 +167,7 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
total_amount = fields.Function(fields.Numeric('Total',
digits=(16, Eval('currency_digits', 2)),

8
issue10338.diff
View File

@ -1,5 +1,5 @@
--- a/trytond/trytond/modules/bank/bank.py
+++ b/trytond/trytond/modules/bank/bank.py
--- a/tryton/modules/bank/bank.py
+++ b/tryton/modules/bank/bank.py
@@ -26,7 +26,7 @@ class Bank(ModelSQL, ModelView):
@classmethod
@ -18,8 +18,8 @@
class BankAccountNumber(sequence_ordered(), ModelSQL, ModelView):
--- a/trytond/trytond/modules/bank/party.py
+++ b/trytond/trytond/modules/bank/party.py
--- a/tryton/modules/bank/party.py
+++ b/tryton/modules/bank/party.py
@@ -25,7 +25,8 @@ class Party(metaclass=PoolMeta):
code_value = lstrip_wildcard(clause[2])
return [bool_op,

6
issue10363.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/production/bom.py b/trytond/trytond/modules/production/bom.py
diff --git a/tryton/modules/production/bom.py b/tryton/trytond/trytond/modules/production/bom.py
index b954951..11bb437 100644
--- a/trytond/trytond/modules/production/bom.py
+++ b/trytond/trytond/modules/production/bom.py
--- a/tryton/modules/production/bom.py
+++ b/tryton/modules/production/bom.py
@@ -26,13 +26,15 @@ class BOM(DeactivableMixin, ModelSQL, ModelView):
Compute factor for an output product
'''

6
issue10382.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/stock_split/stock.py b/trytond/trytond/modules/stock_split/stock.py
diff --git a/tryton/modules/stock_split/stock.py b/tryton/trytond/trytond/modules/stock_split/stock.py
index e68fd55..9f00036 100644
--- a/trytond/trytond/modules/stock_split/stock.py
+++ b/trytond/trytond/modules/stock_split/stock.py
--- a/tryton/modules/stock_split/stock.py
+++ b/tryton/modules/stock_split/stock.py
@@ -52,6 +52,7 @@ class Move(metaclass=PoolMeta):
'uom': uom.id,
})

12
issue10467.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/stock_lot/product.py b/trytond/trytond/modules/stock_lot/product.py
diff --git a/tryton/modules/stock_lot/product.py b/tryton/trytond/trytond/modules/stock_lot/product.py
index e8a01ec..8e3b5d9 100644
--- a/trytond/trytond/modules/stock_lot/product.py
+++ b/trytond/trytond/modules/stock_lot/product.py
--- a/tryton/modules/stock_lot/product.py
+++ b/tryton/modules/stock_lot/product.py
@@ -13,12 +13,13 @@ class Template(metaclass=PoolMeta):
__name__ = 'product.template'
@ -18,10 +18,10 @@ index e8a01ec..8e3b5d9 100644
help='The type of location for which lot is required.',
states={
'invisible': ~Eval('type').in_(['goods', 'assets']),
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 699f336..d683f87 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
@@ -116,6 +116,20 @@ class Move(metaclass=PoolMeta):
},
depends=['state', 'product'])

4
issue10500.diff
View File

@ -1,7 +1,7 @@
diff --git a/invoice.py b/invoice.py
index 582265d..1093bb3 100644
--- a/trytond/trytond/modules/account_invoice/invoice.py
+++ b/trytond/trytond/modules/account_invoice/invoice.py
--- a/tryton/modules/account_invoice/invoice.py
+++ b/tryton/modules/account_invoice/invoice.py
@@ -1202,7 +1202,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
gettext('account_invoice.msg_invoice_same_account_line',
account=self.account.rec_name,

4
issue10680.diff
View File

@ -1,6 +1,6 @@
diff --git a/product.py b/product.py
--- a/trytond/trytond/modules/product/product.py
+++ b/trytond/trytond/modules/product/product.py
--- a/tryton/modules/product/product.py
+++ b/tryton/modules/product/product.py
@@ -282,6 +282,10 @@ class Product(
def get_template(self, name):

6
issue10845.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/commission/invoice.py b/trytond/trytond/modules/commission/invoice.py
diff --git a/tryton/modules/commission/invoice.py b/tryton/trytond/trytond/modules/commission/invoice.py
index 93d37be..60535e6 100644
--- a/trytond/trytond/modules/commission/invoice.py
+++ b/trytond/trytond/modules/commission/invoice.py
--- a/tryton/modules/commission/invoice.py
+++ b/tryton/modules/commission/invoice.py
@@ -77,11 +77,13 @@ class Invoice(metaclass=PoolMeta):
pool = Pool()
Commission = pool.get('commission')

18
issue11000.diff
View File

@ -5,10 +5,10 @@
#issue11000
#review354381002
Index: 5.4/trytond/trytond/modules/account/exceptions.py
Index: 5.4/tryton/modules/account/exceptions.py
===================================================================
--- 5.4.orig/trytond/trytond/modules/account/exceptions.py
+++ 5.4/trytond/trytond/modules/account/exceptions.py
--- 5.4.orig/tryton/modules/account/exceptions.py
+++ 5.4/tryton/modules/account/exceptions.py
@@ -69,6 +69,10 @@ class MoveDatesError(ValidationError):
pass
@ -20,10 +20,10 @@ Index: 5.4/trytond/trytond/modules/account/exceptions.py
class CancelWarning(UserWarning):
pass
Index: 5.4/trytond/trytond/modules/account/message.xml
Index: 5.4/tryton/modules/account/message.xml
===================================================================
--- 5.4.orig/trytond/trytond/modules/account/message.xml
+++ 5.4/trytond/trytond/modules/account/message.xml
--- 5.4.orig/tryton/modules/account/message.xml
+++ 5.4/tryton/modules/account/message.xml
@@ -121,6 +121,14 @@ this repository contains the full copyri
Use the current period to cancel the move?</field>
</record>
@ -39,10 +39,10 @@ Index: 5.4/trytond/trytond/modules/account/message.xml
<record model="ir.message" id="msg_write_reconciliation">
<field name="text">You cannot modify any reconciliation.</field>
</record>
Index: 5.4/trytond/trytond/modules/account/move_template.py
Index: 5.4/tryton/modules/account/move_template.py
===================================================================
--- 5.4.orig/trytond/trytond/modules/account/move_template.py
+++ 5.4/trytond/trytond/modules/account/move_template.py
--- 5.4.orig/tryton/modules/account/move_template.py
+++ 5.4/tryton/modules/account/move_template.py
@@ -3,8 +3,9 @@
from xml.sax.saxutils import quoteattr
from decimal import Decimal

18
issue11077.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/model/multivalue.py b/trytond/trytond/model/multivalue.py
diff --git a/tryton/trytond/trytond/model/multivalue.py b/trytond/trytond/model/multivalue.py
index 5cf45d4a..f3765dd6 100644
--- a/trytond/trytond/model/multivalue.py
+++ b/trytond/trytond/model/multivalue.py
--- a/tryton/trytond/trytond/model/multivalue.py
+++ b/tryton/trytond/trytond/model/multivalue.py
@@ -3,6 +3,7 @@
from ..pool import Pool
from .model import Model
@ -27,10 +27,10 @@ index 5cf45d4a..f3765dd6 100644
def __values(self, field, pattern, match_none=True):
Value = self.multivalue_model(field)
diff --git a/trytond/trytond/tests/multivalue.py b/trytond/trytond/tests/multivalue.py
diff --git a/tryton/trytond/trytond/tests/multivalue.py b/trytond/trytond/tests/multivalue.py
index 45fb3863..f303a019 100644
--- a/trytond/trytond/tests/multivalue.py
+++ b/trytond/trytond/tests/multivalue.py
--- a/tryton/trytond/trytond/tests/multivalue.py
+++ b/tryton/trytond/trytond/tests/multivalue.py
@@ -8,13 +8,25 @@ class ModelMultiValue(ModelSQL, MultiValueMixin):
"Model MultiValue"
__name__ = 'test.model_multivalue'
@ -65,10 +65,10 @@ index 45fb3863..f303a019 100644
def register(module):
diff --git a/trytond/trytond/tests/test_multivalue.py b/trytond/trytond/tests/test_multivalue.py
diff --git a/tryton/trytond/trytond/tests/test_multivalue.py b/trytond/trytond/tests/test_multivalue.py
index 73722978..5b97232a 100644
--- a/trytond/trytond/tests/test_multivalue.py
+++ b/trytond/trytond/tests/test_multivalue.py
--- a/tryton/trytond/trytond/tests/test_multivalue.py
+++ b/tryton/trytond/trytond/tests/test_multivalue.py
@@ -13,6 +13,20 @@ class MultiValueTestCase(unittest.TestCase):
def setUpClass(cls):
activate_module('tests')

12
issue11198.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/bank/bank.py b/trytond/trytond/modules/bank/bank.py
diff --git a/tryton/modules/bank/bank.py b/tryton/trytond/trytond/modules/bank/bank.py
index 04f6e3d..7bc6601 100644
--- a/trytond/trytond/modules/bank/bank.py
+++ b/trytond/trytond/modules/bank/bank.py
--- a/tryton/modules/bank/bank.py
+++ b/tryton/modules/bank/bank.py
@@ -3,10 +3,11 @@
from stdnum import iban, bic
import stdnum.exceptions
@ -33,10 +33,10 @@ index 04f6e3d..7bc6601 100644
@classmethod
def default_type(cls):
diff --git a/trytond/trytond/modules/bank/message.xml b/trytond/trytond/modules/bank/message.xml
diff --git a/tryton/modules/bank/message.xml b/tryton/trytond/trytond/modules/bank/message.xml
index a06297f..f4ab923 100644
--- a/trytond/trytond/modules/bank/message.xml
+++ b/trytond/trytond/modules/bank/message.xml
--- a/tryton/modules/bank/message.xml
+++ b/tryton/modules/bank/message.xml
@@ -9,5 +9,11 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.message" id="msg_invalid_bic">
<field name="text">The BIC "%(bic)s" is not valid.</field>

6
issue11499.diff
View File

@ -1,7 +1,7 @@
diff --git a/sao/src/window.js b/sao/src/window.js
diff --git a/tryton/sao/src/window.js b/sao/src/window.js
index d6076f1..ff0b66f 100644
--- a/sao/src/window.js
+++ b/sao/src/window.js
--- a/tryton/sao/src/window.js
+++ b/tryton/sao/src/window.js
@@ -1825,7 +1825,10 @@
val = val.format(Sao.common.date_format());
} else if (!isNaN(Number(val))) {

6
issue11684.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/carrier_percentage/carrier.py b/trytond/trytond/modules/carrier_percentage/carrier.py
diff --git a/tryton/modules/carrier_percentage/carrier.py b/tryton/trytond/trytond/modules/carrier_percentage/carrier.py
index 8cf58a3..d85ceb9 100644
--- a/trytond/trytond/modules/carrier_percentage/carrier.py
+++ b/trytond/trytond/modules/carrier_percentage/carrier.py
--- a/tryton/modules/carrier_percentage/carrier.py
+++ b/tryton/modules/carrier_percentage/carrier.py
@@ -30,8 +30,6 @@ class Carrier(metaclass=PoolMeta):
Currency = Pool().get('currency.currency')

6
issue239_630.diff
View File

@ -1,6 +1,6 @@
diff -r 366b4e8da556 trytond/trytond/modules/stock/location.py
--- a/trytond/trytond/modules/stock/location.py Wed Apr 10 14:21:58 2019 +0200
+++ b/trytond/trytond/modules/stock/location.py Wed Apr 10 17:42:42 2019 +0200
diff -r 366b4e8da556 trytond/tryton/trytond/modules/stock/location.py
--- a/tryton/modules/stock/location.py Wed Apr 10 14:21:58 2019 +0200
+++ b/tryton/modules/stock/location.py Wed Apr 10 17:42:42 2019 +0200
@@ -355,11 +355,14 @@
if trans_context.get('product') is not None:
grouping = ('product',)

6
issue3209.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/production/production.py b/trytond/trytond/modules/production/production.py
diff --git a/tryton/modules/production/production.py b/tryton/trytond/trytond/modules/production/production.py
index acd7a35..1ccc421 100644
--- a/trytond/trytond/modules/production/production.py
+++ b/trytond/trytond/modules/production/production.py
--- a/tryton/modules/production/production.py
+++ b/tryton/modules/production/production.py
@@ -468,12 +468,6 @@ class Production(Workflow, ModelSQL, ModelView):
moves.append(output)
Move.save(moves)

6
issue3932.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/account/move.xml b/trytond/trytond/modules/account/move.xml
diff --git a/tryton/modules/account/move.xml b/tryton/trytond/trytond/modules/account/move.xml
index 3ce79e1..820cee2 100644
--- a/trytond/trytond/modules/account/move.xml
+++ b/trytond/trytond/modules/account/move.xml
--- a/tryton/modules/account/move.xml
+++ b/tryton/modules/account/move.xml
@@ -392,6 +392,19 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_delete" eval="True"/>
</record>

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
@@ -28,7 +28,7 @@
'on_change_with_company', searcher='search_company')
account = fields.Many2One('analytic_account.account', 'Account',

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"

4
issue6253.diff
View File

@ -1,6 +1,6 @@
diff -r 6c85f394741c invoice.py
--- a/trytond/trytond/modules/account_invoice/invoice.py Wed Jan 24 20:14:28 2018 +0100
+++ b/trytond/trytond/modules/account_invoice/invoice.py Wed Feb 07 15:39:49 2018 +0100
--- a/tryton/modules/account_invoice/invoice.py Wed Jan 24 20:14:28 2018 +0100
+++ b/tryton/modules/account_invoice/invoice.py Wed Feb 07 15:39:49 2018 +0100
@@ -1020,6 +1020,11 @@
invoice.number = invoice.get_next_number()
cls.save(invoices)

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
@@ -2267,7 +2267,7 @@
else:
self.account = tax.credit_note_account

4
issue8699.diff
View File

@ -1,6 +1,6 @@
diff -r f4710591683e move.py
--- a/trytond/trytond/modules/product_cost_fifo/move.py Mon May 06 15:06:16 2019 +0200
+++ b/trytond/trytond/modules/product_cost_fifo/move.py Wed Oct 02 10:57:59 2019 +0200
--- a/tryton/modules/product_cost_fifo/move.py Mon May 06 15:06:16 2019 +0200
+++ b/tryton/modules/product_cost_fifo/move.py Wed Oct 02 10:57:59 2019 +0200
@@ -70,6 +70,9 @@
if Decimal(str(consumed_qty)) != Decimal("0"):

12
issue8702.diff
View File

@ -1,6 +1,6 @@
diff -r 168b01453902 __init__.py
--- a/trytond/trytond/modules/stock_supply_forecast/__init__.py Mon May 06 15:17:58 2019 +0200
+++ b/trytond/trytond/modules/stock_supply_forecast/__init__.py Fri Oct 04 10:04:50 2019 +0000
--- a/tryton/modules/stock_supply_forecast/__init__.py Mon May 06 15:17:58 2019 +0200
+++ b/tryton/modules/stock_supply_forecast/__init__.py Fri Oct 04 10:04:50 2019 +0000
@@ -2,10 +2,10 @@
# this repository contains the full copyright notices and license terms.
@ -16,7 +16,7 @@ diff -r 168b01453902 __init__.py
+ stock.StockSupply,
+ module='stock_supply_forecast', type_='wizard')
diff -r 168b01453902 purchase_request.py
--- a/trytond/trytond/modules/stock_supply_forecast/purchase_request.py Mon May 06 15:17:58 2019 +0200
--- a/tryton/modules/stock_supply_forecast/purchase_request.py Mon May 06 15:17:58 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# This file is part of Tryton. The COPYRIGHT file at the top level of
@ -46,7 +46,7 @@ diff -r 168b01453902 purchase_request.py
- Forecast.delete_moves(forecasts)
diff -r 168b01453902 stock.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/trytond/trytond/modules/stock_supply_forecast/stock.py Fri Oct 04 10:04:50 2019 +0000
+++ b/tryton/modules/stock_supply_forecast/stock.py Fri Oct 04 10:04:50 2019 +0000
@@ -0,0 +1,22 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
@ -71,8 +71,8 @@ diff -r 168b01453902 stock.py
+ Forecast.delete_moves(forecasts)
+ return res
diff -r 168b01453902 tryton.cfg
--- a/trytond/trytond/modules/stock_supply_forecast/tryton.cfg Mon May 06 15:17:58 2019 +0200
+++ b/trytond/trytond/modules/stock_supply_forecast/tryton.cfg Fri Oct 04 10:04:50 2019 +0000
--- a/tryton/modules/stock_supply_forecast/tryton.cfg Mon May 06 15:17:58 2019 +0200
+++ b/tryton/modules/stock_supply_forecast/tryton.cfg Fri Oct 04 10:04:50 2019 +0000
@@ -4,3 +4,5 @@
ir
stock_supply

6
issue8776.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/tools/misc.py b/trytond/trytond/tools/misc.py
diff --git a/tryton/trytond/trytond/tools/misc.py b/trytond/trytond/tools/misc.py
index ee2763c9..300b5a72 100644
--- a/trytond/trytond/tools/misc.py
+++ b/trytond/trytond/tools/misc.py
--- a/tryton/trytond/trytond/tools/misc.py
+++ b/tryton/trytond/trytond/tools/misc.py
@@ -12,6 +12,8 @@ import types
import io
import warnings

6
issue8834.diff
View File

@ -1,6 +1,6 @@
diff -r dc6d16f53783 trytond/trytond/modules/account_payment_clearing/payment.py
--- a/trytond/trytond/modules/account_payment_clearing/payment.py Mon Nov 04 12:53:16 2019 +0100
+++ b/trytond/trytond/modules/account_payment_clearing/payment.py Mon Nov 18 14:19:24 2019 +0100
diff -r dc6d16f53783 trytond/tryton/trytond/modules/account_payment_clearing/payment.py
--- a/tryton/modules/account_payment_clearing/payment.py Mon Nov 04 12:53:16 2019 +0100
+++ b/tryton/modules/account_payment_clearing/payment.py Mon Nov 18 14:19:24 2019 +0100
@@ -189,6 +189,8 @@
else:
counterpart.debit, counterpart.credit = local_amount, 0

4
issue8860.diff
View File

@ -1,6 +1,6 @@
diff -r e19cb8ea533a forecast.py
--- a/trytond/trytond/modules/stock_forecast/forecast.py Wed Oct 30 13:23:56 2019 +0100
+++ b/trytond/trytond/modules/stock_forecast/forecast.py Sat Nov 23 01:22:47 2019 +0100
--- a/tryton/modules/stock_forecast/forecast.py Wed Oct 30 13:23:56 2019 +0100
+++ b/tryton/modules/stock_forecast/forecast.py Sat Nov 23 01:22:47 2019 +0100
@@ -448,15 +448,23 @@
unit_price, self.uom)

66
issue8880_trytond.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/ir/action.py b/trytond/ir/action.py
diff --git a/tryton/trytond/trytond/ir/action.py b/trytond/ir/action.py
index a6d6ec32..9904c8dc 100644
--- a/trytond/trytond/ir/action.py
+++ b/trytond/ir/action.py
--- a/tryton/trytond/trytond/ir/action.py
+++ b/tryton/trytond/ir/action.py
@@ -10,6 +10,7 @@ from sql import Null
from trytond.config import config
from trytond.i18n import gettext
@ -41,10 +41,10 @@ index a6d6ec32..9904c8dc 100644
pysons[window.id] = (getattr(window, field)
or defaults.get(field, 'null'))
return pysons
diff --git a/trytond/trytond/ir/attachment.py b/trytond/ir/attachment.py
diff --git a/tryton/trytond/trytond/ir/attachment.py b/trytond/ir/attachment.py
index c9f92a10..5aa85afd 100644
--- a/trytond/trytond/ir/attachment.py
+++ b/trytond/ir/attachment.py
--- a/tryton/trytond/trytond/ir/attachment.py
+++ b/tryton/trytond/ir/attachment.py
@@ -54,7 +54,10 @@ class Attachment(ResourceMixin, ModelSQL, ModelView):
@classmethod
def __setup__(cls):
@ -57,10 +57,10 @@ index c9f92a10..5aa85afd 100644
@classmethod
def __register__(cls, module_name):
diff --git a/trytond/trytond/ir/ui/tree.rnc b/trytond/ir/ui/tree.rnc
diff --git a/tryton/trytond/trytond/ir/ui/tree.rnc b/trytond/ir/ui/tree.rnc
index b694f5f4..77625b55 100644
--- a/trytond/trytond/ir/ui/tree.rnc
+++ b/trytond/ir/ui/tree.rnc
--- a/tryton/trytond/trytond/ir/ui/tree.rnc
+++ b/tryton/trytond/ir/ui/tree.rnc
@@ -5,7 +5,7 @@ tree = element tree { attlist.tree,
| button)*
}
@ -70,10 +70,10 @@ index b694f5f4..77625b55 100644
attlist.tree &= attribute sequence { text }?
attlist.tree &=
[ a:defaultValue = "0" ] attribute keyword_open { "0" | "1" }?
diff --git a/trytond/trytond/ir/ui/tree.rng b/trytond/ir/ui/tree.rng
diff --git a/tryton/trytond/trytond/ir/ui/tree.rng b/trytond/ir/ui/tree.rng
index 0c5651fc..73437d74 100644
--- a/trytond/trytond/ir/ui/tree.rng
+++ b/trytond/ir/ui/tree.rng
--- a/tryton/trytond/trytond/ir/ui/tree.rng
+++ b/tryton/trytond/ir/ui/tree.rng
@@ -29,6 +29,8 @@
<choice>
<value>top</value>
@ -83,10 +83,10 @@ index 0c5651fc..73437d74 100644
</choice>
</attribute>
</optional>
diff --git a/trytond/trytond/ir/view/attachment_list.xml b/trytond/ir/view/attachment_list.xml
diff --git a/tryton/trytond/trytond/ir/view/attachment_list.xml b/trytond/ir/view/attachment_list.xml
index 4759271b..cf5b577b 100644
--- a/trytond/trytond/ir/view/attachment_list.xml
+++ b/trytond/ir/view/attachment_list.xml
--- a/tryton/trytond/trytond/ir/view/attachment_list.xml
+++ b/tryton/trytond/ir/view/attachment_list.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
@ -96,10 +96,10 @@ index 4759271b..cf5b577b 100644
<field name="resource" expand="2"/>
<field name="name" expand="2"/>
<field name="summary" expand="1"/>
diff --git a/trytond/trytond/ir/view/lang_list.xml b/trytond/ir/view/lang_list.xml
diff --git a/tryton/trytond/trytond/ir/view/lang_list.xml b/trytond/ir/view/lang_list.xml
index b50df81d..2d06b1d0 100644
--- a/trytond/trytond/ir/view/lang_list.xml
+++ b/trytond/ir/view/lang_list.xml
--- a/tryton/trytond/trytond/ir/view/lang_list.xml
+++ b/tryton/trytond/ir/view/lang_list.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
@ -109,10 +109,10 @@ index b50df81d..2d06b1d0 100644
<field name="name" expand="1"/>
<field name="code"/>
<field name="direction"/>
diff --git a/trytond/trytond/ir/view/module_config_wizard_item_list.xml b/trytond/ir/view/module_config_wizard_item_list.xml
diff --git a/tryton/trytond/trytond/ir/view/module_config_wizard_item_list.xml b/trytond/ir/view/module_config_wizard_item_list.xml
index 51bfa46f..87498859 100644
--- a/trytond/trytond/ir/view/module_config_wizard_item_list.xml
+++ b/trytond/ir/view/module_config_wizard_item_list.xml
--- a/tryton/trytond/trytond/ir/view/module_config_wizard_item_list.xml
+++ b/tryton/trytond/ir/view/module_config_wizard_item_list.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
@ -122,10 +122,10 @@ index 51bfa46f..87498859 100644
<field name="action" expand="1"/>
<field name="sequence"/>
<field name="state"/>
diff --git a/trytond/trytond/ir/view/translation_list.xml b/trytond/ir/view/translation_list.xml
diff --git a/tryton/trytond/trytond/ir/view/translation_list.xml b/trytond/ir/view/translation_list.xml
index 9b5df31a..0bbe31da 100644
--- a/trytond/trytond/ir/view/translation_list.xml
+++ b/trytond/ir/view/translation_list.xml
--- a/tryton/trytond/trytond/ir/view/translation_list.xml
+++ b/tryton/trytond/ir/view/translation_list.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
@ -135,10 +135,10 @@ index 9b5df31a..0bbe31da 100644
<field name="src" widget="char" expand="2"/>
<field name="value" widget="char" expand="2"/>
<field name="fuzzy"/>
diff --git a/trytond/trytond/model/fields/many2many.py b/trytond/model/fields/many2many.py
diff --git a/tryton/trytond/trytond/model/fields/many2many.py b/trytond/model/fields/many2many.py
index 0c68be0d..0191cc21 100644
--- a/trytond/trytond/model/fields/many2many.py
+++ b/trytond/model/fields/many2many.py
--- a/tryton/trytond/trytond/model/fields/many2many.py
+++ b/tryton/trytond/model/fields/many2many.py
@@ -455,6 +455,9 @@ class Many2Many(Field):
definition['search_context'] = encoder.encode(self.search_context)
definition['search_order'] = encoder.encode(self.search_order)
@ -149,10 +149,10 @@ index 0c68be0d..0191cc21 100644
if self.size is not None:
definition['size'] = encoder.encode(self.size)
return definition
diff --git a/trytond/trytond/model/fields/one2many.py b/trytond/model/fields/one2many.py
diff --git a/tryton/trytond/trytond/model/fields/one2many.py b/trytond/model/fields/one2many.py
index 24d67e09..401e7ef3 100644
--- a/trytond/trytond/model/fields/one2many.py
+++ b/trytond/model/fields/one2many.py
--- a/tryton/trytond/trytond/model/fields/one2many.py
+++ b/tryton/trytond/model/fields/one2many.py
@@ -349,4 +349,7 @@ class One2Many(Field):
if self.size is not None:
definition['size'] = encoder.encode(self.size)
@ -161,10 +161,10 @@ index 24d67e09..401e7ef3 100644
+ getattr(model, '_order', None)
+ if self.order is None else self.order)
return definition
diff --git a/trytond/trytond/model/modelsql.py b/trytond/model/modelsql.py
diff --git a/tryton/trytond/trytond/model/modelsql.py b/trytond/model/modelsql.py
index 0ace0b7f..af41284d 100644
--- a/trytond/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
--- a/tryton/trytond/trytond/model/modelsql.py
+++ b/tryton/trytond/model/modelsql.py
@@ -188,7 +188,7 @@ class ModelSQL(ModelStorage):
cls._sql_constraints.append(
('id_positive', Check(table, table.id >= 0),

4
issue8944.diff
View File

@ -1,5 +1,5 @@
--- a/trytond/trytond/modules/sale_shipment_cost/sale.py
+++ b/trytond/trytond/modules/sale_shipment_cost/sale.py
--- a/tryton/modules/sale_shipment_cost/sale.py
+++ b/tryton/modules/sale_shipment_cost/sale.py
@@ -168,13 +168,12 @@
def quote(cls, sales):
pool = Pool()

6
issue8952.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/country/scripts/import_zip.py b/trytond/trytond/modules/country/scripts/import_zip.py
diff --git a/tryton/modules/country/scripts/import_zip.py b/tryton/trytond/trytond/modules/country/scripts/import_zip.py
index 25bbfc7..4bf3ed7 100755
--- a/trytond/trytond/modules/country/scripts/import_zip.py
+++ b/trytond/trytond/modules/country/scripts/import_zip.py
--- a/tryton/modules/country/scripts/import_zip.py
+++ b/tryton/modules/country/scripts/import_zip.py
@@ -36,7 +36,7 @@ def clean(code):
def fetch(code):

12
issue9004.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/product/message.xml b/trytond/trytond/modules/product/message.xml
diff --git a/tryton/modules/product/message.xml b/tryton/trytond/trytond/modules/product/message.xml
index d77bc0e..d8b1f2f 100644
--- a/trytond/trytond/modules/product/message.xml
+++ b/trytond/trytond/modules/product/message.xml
--- a/tryton/modules/product/message.xml
+++ b/tryton/modules/product/message.xml
@@ -24,5 +24,8 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.message" id="msg_invalid_code">
<field name="text">The %(type)s "%(code)s" for product "%(product)s" is not valid.</field>
@ -11,10 +11,10 @@ index d77bc0e..d8b1f2f 100644
+ </record>
</data>
</tryton>
diff --git a/trytond/trytond/modules/product/product.py b/trytond/trytond/modules/product/product.py
diff --git a/tryton/modules/product/product.py b/tryton/trytond/trytond/modules/product/product.py
index 7207c02..559329e 100644
--- a/trytond/trytond/modules/product/product.py
+++ b/trytond/trytond/modules/product/product.py
--- a/tryton/modules/product/product.py
+++ b/tryton/modules/product/product.py
@@ -7,12 +7,13 @@ from importlib import import_module
import stdnum

6
issue9032.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/account_invoice_stock/stock.py b/trytond/trytond/modules/account_invoice_stock/stock.py
diff --git a/tryton/modules/account_invoice_stock/stock.py b/tryton/trytond/trytond/modules/account_invoice_stock/stock.py
index a741d88..b118326 100644
--- a/trytond/trytond/modules/account_invoice_stock/stock.py
+++ b/trytond/trytond/modules/account_invoice_stock/stock.py
--- a/tryton/modules/account_invoice_stock/stock.py
+++ b/tryton/modules/account_invoice_stock/stock.py
@@ -20,6 +20,8 @@ class StockMove(metaclass=PoolMeta):
Uom = pool.get('product.uom')
quantity = 0

40
issue9049-issue4050.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/purchase/__init__.py b/trytond/trytond/modules/purchase/__init__.py
diff --git a/tryton/modules/purchase/__init__.py b/tryton/trytond/trytond/modules/purchase/__init__.py
index 5f548ca..db72ac1 100644
--- a/trytond/trytond/modules/purchase/__init__.py
+++ b/trytond/trytond/modules/purchase/__init__.py
--- a/tryton/modules/purchase/__init__.py
+++ b/tryton/modules/purchase/__init__.py
@@ -36,6 +36,7 @@ def register():
Location,
party.Party,
@ -16,10 +16,10 @@ index 5f548ca..db72ac1 100644
ModifyHeader,
+ purchase.ReturnPurchase,
module='purchase', type_='wizard')
diff --git a/trytond/trytond/modules/purchase/locale/ca.po b/trytond/trytond/modules/purchase/locale/ca.po
diff --git a/tryton/modules/purchase/locale/ca.po b/tryton/trytond/trytond/modules/purchase/locale/ca.po
index b184206..e4e01be 100644
--- a/trytond/trytond/modules/purchase/locale/ca.po
+++ b/trytond/trytond/modules/purchase/locale/ca.po
--- a/tryton/modules/purchase/locale/ca.po
+++ b/tryton/modules/purchase/locale/ca.po
@@ -526,6 +526,10 @@ msgctxt "model:ir.action,name:wizard_modify_header"
msgid "Modify Header"
msgstr "Modificar capçalera"
@ -42,10 +42,10 @@ index b184206..e4e01be 100644
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
msgid "Cancel"
msgstr "Cancel·la"
diff --git a/trytond/trytond/modules/purchase/locale/es.po b/trytond/trytond/modules/purchase/locale/es.po
diff --git a/tryton/modules/purchase/locale/es.po b/tryton/trytond/trytond/modules/purchase/locale/es.po
index c48d0c8..497e5a3 100644
--- a/trytond/trytond/modules/purchase/locale/es.po
+++ b/trytond/trytond/modules/purchase/locale/es.po
--- a/tryton/modules/purchase/locale/es.po
+++ b/tryton/modules/purchase/locale/es.po
@@ -529,6 +529,10 @@ msgctxt "model:ir.action,name:wizard_modify_header"
msgid "Modify Header"
msgstr "Modificar cabecera"
@ -68,10 +68,10 @@ index c48d0c8..497e5a3 100644
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/trytond/trytond/modules/purchase/purchase.py b/trytond/trytond/modules/purchase/purchase.py
diff --git a/tryton/modules/purchase/purchase.py b/tryton/trytond/trytond/modules/purchase/purchase.py
index a0459a5..4e35105 100644
--- a/trytond/trytond/modules/purchase/purchase.py
+++ b/trytond/trytond/modules/purchase/purchase.py
--- a/tryton/modules/purchase/purchase.py
+++ b/tryton/modules/purchase/purchase.py
@@ -175,6 +175,11 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin):
invoices_recreated = fields.Many2Many(
'purchase.purchase-recreated-account.invoice',
@ -140,10 +140,10 @@ index a0459a5..4e35105 100644
+ if len(return_purchases) == 1:
+ action['views'].reverse()
+ return action, data
diff --git a/trytond/trytond/modules/purchase/purchase.xml b/trytond/trytond/modules/purchase/purchase.xml
diff --git a/tryton/modules/purchase/purchase.xml b/tryton/trytond/trytond/modules/purchase/purchase.xml
index aef771b..97404cb 100644
--- a/trytond/trytond/modules/purchase/purchase.xml
+++ b/trytond/trytond/modules/purchase/purchase.xml
--- a/tryton/modules/purchase/purchase.xml
+++ b/tryton/modules/purchase/purchase.xml
@@ -523,6 +523,22 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">template_tree</field>
</record>
@ -167,10 +167,10 @@ index aef771b..97404cb 100644
<record model="ir.action.wizard" id="act_open_supplier">
<field name="name">Parties associated to Purchases</field>
<field name="wiz_name">purchase.open_supplier</field>
diff --git a/trytond/trytond/modules/purchase/view/purchase_form.xml b/trytond/trytond/modules/purchase/view/purchase_form.xml
diff --git a/tryton/modules/purchase/view/purchase_form.xml b/tryton/trytond/trytond/modules/purchase/view/purchase_form.xml
index d689f5e..5f25f91 100644
--- a/trytond/trytond/modules/purchase/view/purchase_form.xml
+++ b/trytond/trytond/modules/purchase/view/purchase_form.xml
--- a/tryton/modules/purchase/view/purchase_form.xml
+++ b/tryton/modules/purchase/view/purchase_form.xml
@@ -45,6 +45,8 @@ this repository contains the full copyright notices and license terms. -->
<label name="company"/>
<field name="company"/>
@ -180,11 +180,11 @@ index d689f5e..5f25f91 100644
<label name="invoice_method"/>
<field name="invoice_method"/>
<label name="delivery_date"/>
diff --git a/trytond/trytond/modules/purchase/view/return_purchase_start_form.xml b/trytond/trytond/modules/purchase/view/return_purchase_start_form.xml
diff --git a/tryton/modules/purchase/view/return_purchase_start_form.xml b/tryton/trytond/trytond/modules/purchase/view/return_purchase_start_form.xml
new file mode 100644
index 0000000..9a87dd8
--- /dev/null
+++ b/trytond/trytond/modules/purchase/view/return_purchase_start_form.xml
+++ b/tryton/modules/purchase/view/return_purchase_start_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of

6
issue9103.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/trytond/pool.py b/trytond/trytond/pool.py
diff --git a/tryton/trytond/trytond/trytond/pool.py b/trytond/trytond/pool.py
index 8d8d2f28..3349d6a1 100644
--- a/trytond/trytond/pool.py
+++ b/trytond/trytond/pool.py
--- a/tryton/trytond/trytond/pool.py
+++ b/tryton/trytond/trytond/pool.py
@@ -184,6 +184,13 @@ class Pool(object):
cls = builtins.type(str(name), (Report,), {})
cls.__setup__()

22
issue9122.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/stock_supply/__init__.py b/trytond/trytond/modules/stock_supply/__init__.py
diff --git a/tryton/modules/stock_supply/__init__.py b/tryton/trytond/trytond/modules/stock_supply/__init__.py
index 48ced90..0d646e9 100644
--- a/trytond/trytond/modules/stock_supply/__init__.py
+++ b/trytond/trytond/modules/stock_supply/__init__.py
--- a/tryton/modules/stock_supply/__init__.py
+++ b/tryton/modules/stock_supply/__init__.py
@@ -8,6 +8,7 @@ from .purchase_request import *
from .shipment import *
from .location import *
@ -18,11 +18,11 @@
module='stock_supply', type_='model')
Pool.register(
stock.StockSupply,
diff --git a/trytond/trytond/modules/stock_supply/ir.py b/trytond/trytond/modules/stock_supply/ir.py
diff --git a/tryton/modules/stock_supply/ir.py b/tryton/trytond/trytond/modules/stock_supply/ir.py
new file mode 100644
index 0000000..27960e0
--- /dev/null
+++ b/trytond/trytond/modules/stock_supply/ir.py
+++ b/tryton/modules/stock_supply/ir.py
@@ -0,0 +1,14 @@
+# The COPYRIGHT file at the top level of this repository contains the full
+# copyright notices and license terms.
@ -38,10 +38,10 @@ index 0000000..27960e0
+ cls.method.selection.extend([
+ ('stock.order_point|supply_stock', "Supply Stock"),
+ ])
diff --git a/trytond/trytond/modules/stock_supply/order_point.py b/trytond/trytond/modules/stock_supply/order_point.py
diff --git a/tryton/modules/stock_supply/order_point.py b/tryton/trytond/trytond/modules/stock_supply/order_point.py
index 78edc42..e310f0a 100644
--- a/trytond/trytond/modules/stock_supply/order_point.py
+++ b/trytond/trytond/modules/stock_supply/order_point.py
--- a/tryton/modules/stock_supply/order_point.py
+++ b/tryton/modules/stock_supply/order_point.py
@@ -4,6 +4,7 @@ from sql import Null
from trytond.i18n import gettext
@ -62,10 +62,10 @@ index 78edc42..e310f0a 100644
+ session_id, _, _ = StockSupply.create()
+ StockSupply.execute(session_id, {}, 'create_')
+ StockSupply.delete(session_id)
diff --git a/trytond/trytond/modules/stock_supply/tests/scenario_stock_internal_supply.rst b/trytond/trytond/modules/stock_supply/tests/scenario_stock_internal_supply.rst
diff --git a/tryton/modules/stock_supply/tests/scenario_stock_internal_supply.rst b/tryton/trytond/trytond/modules/stock_supply/tests/scenario_stock_internal_supply.rst
index d1681fd..eed49a5 100644
--- a/trytond/trytond/modules/stock_supply/tests/scenario_stock_internal_supply.rst
+++ b/trytond/trytond/modules/stock_supply/tests/scenario_stock_internal_supply.rst
--- a/tryton/modules/stock_supply/tests/scenario_stock_internal_supply.rst
+++ b/tryton/modules/stock_supply/tests/scenario_stock_internal_supply.rst
@@ -178,3 +178,18 @@ Execute internal supply::
'Provisioning Location'
>>> move.to_location.name

6
issue9146.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/account_stock_landed_cost/account.py b/trytond/trytond/modules/account_stock_landed_cost/account.py
diff --git a/tryton/modules/account_stock_landed_cost/account.py b/tryton/trytond/trytond/modules/account_stock_landed_cost/account.py
index 3815326..93478b1 100644
--- a/trytond/trytond/modules/account_stock_landed_cost/account.py
+++ b/trytond/trytond/modules/account_stock_landed_cost/account.py
--- a/tryton/modules/account_stock_landed_cost/account.py
+++ b/tryton/modules/account_stock_landed_cost/account.py
@@ -10,11 +10,18 @@ from trytond.transaction import Transaction
from trytond import backend
from trytond.tools.multivalue import migrate_property

12
issue9519.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/sale/sale.py b/trytond/trytond/modules/sale/sale.py
diff --git a/tryton/modules/sale/sale.py b/tryton/trytond/trytond/modules/sale/sale.py
index 3d66f74..b1096c2 100644
--- a/trytond/trytond/modules/sale/sale.py
+++ b/trytond/trytond/modules/sale/sale.py
--- a/tryton/modules/sale/sale.py
+++ b/tryton/modules/sale/sale.py
@@ -1009,20 +1009,21 @@ class SaleLine(sequence_ordered(), ModelSQL, ModelView):
'readonly': Eval('sale_state') != 'draft',
},
@ -70,10 +70,10 @@ index 3d66f74..b1096c2 100644
def get_invoice_line(self):
'Return a list of invoice lines for sale line'
pool = Pool()
diff --git a/trytond/trytond/modules/purchase/purchase.py b/trytond/trytond/modules/purchase/purchase.py
diff --git a/tryton/modules/purchase/purchase.py b/tryton/trytond/trytond/modules/purchase/purchase.py
index 30ae987..a0459a5 100644
--- a/trytond/trytond/modules/purchase/purchase.py
+++ b/trytond/trytond/modules/purchase/purchase.py
--- a/tryton/modules/purchase/purchase.py
+++ b/tryton/modules/purchase/purchase.py
@@ -967,6 +967,9 @@ class PurchaseLine(sequence_ordered(), ModelSQL, ModelView):
'required': Bool(Eval('product_supplier')),
},

4
issue9616.diff
View File

@ -1,5 +1,5 @@
--- a/trytond/trytond/modules/analytic_invoice/asset.py
+++ b/trytond/trytond/modules/analytic_invoice/asset.py
--- a/tryton/modules/analytic_invoice/asset.py
+++ b/tryton/modules/analytic_invoice/asset.py
@@ -53,7 +53,8 @@ class Asset(AnalyticMixin, metaclass=PoolMeta):
if self.analytic_accounts:
with Transaction().set_context(date=move.date):

6
issue9737.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/stock/shipment.py b/trytond/trytond/modules/stock/shipment.py
diff --git a/tryton/modules/stock/shipment.py b/tryton/trytond/trytond/modules/stock/shipment.py
index d176518..b915c21 100644
--- a/trytond/trytond/modules/stock/shipment.py
+++ b/trytond/trytond/modules/stock/shipment.py
--- a/tryton/modules/stock/shipment.py
+++ b/tryton/modules/stock/shipment.py
@@ -1150,6 +1150,8 @@ class ShipmentOut(ShipmentMixin, Workflow, ModelSQL, ModelView):
Move = pool.get('stock.move')
Move.do([m for s in shipments for m in s.inventory_moves])

4
issue9797.diff
View File

@ -1,6 +1,6 @@
index ac29d17..2b240c1 100644
--- a/trytond/trytond/modules/account_payment_sepa/payment.py
+++ b/trytond/trytond/modules/account_payment_sepa/payment.py
--- a/tryton/modules/account_payment_sepa/payment.py
+++ b/tryton/modules/account_payment_sepa/payment.py
@@ -190,18 +190,23 @@ class Group(metaclass=PoolMeta):
Payment = pool.get('account.payment')
if self.kind == 'receivable':

4
issue9802.diff
View File

@ -1,6 +1,6 @@
index 7995ab4..4277d89 100644
--- 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
@@ -841,6 +841,8 @@ class Move(Workflow, ModelSQL, ModelView):
child_locations = {}
to_write = []

4
issue9814.diff
View File

@ -1,5 +1,5 @@
--- a/trytond/trytond/modules/product/product.py
+++ b/trytond/trytond/modules/product/product.py
--- a/tryton/modules/product/product.py
+++ b/tryton/modules/product/product.py
@@ -165,9 +165,9 @@ class Template(
class TemplateFunction(fields.Function):

4
lock_stock_move.diff
View File

@ -1,6 +1,6 @@
diff -r c1860f118efd move.py
--- a/trytond/trytond/modules/stock/move.py Wed Nov 07 12:14:26 2018 +0100
+++ b/trytond/trytond/modules/stock/move.py Wed Nov 07 12:18:14 2018 +0100
--- a/tryton/modules/stock/move.py Wed Nov 07 12:14:26 2018 +0100
+++ b/tryton/modules/stock/move.py Wed Nov 07 12:18:14 2018 +0100
@@ -748,6 +748,10 @@ class Move(Workflow, ModelSQL, ModelView):
return to_pick
return to_pick

12
logging_jsonrpc_exeption.diff
View File

@ -1,6 +1,6 @@
diff -r 7ed03689fe01 trytond/trytond/protocols/dispatcher.py
--- a/trytond/trytond/protocols/dispatcher.py Fri May 11 13:52:50 2018 +0200
+++ b/trytond/trytond/protocols/dispatcher.py Fri May 11 13:56:27 2018 +0200
diff -r 7ed03689fe01 trytond/tryton/trytond/protocols/dispatcher.py
--- a/tryton/trytond/trytond/protocols/dispatcher.py Fri May 11 13:52:50 2018 +0200
+++ b/tryton/trytond/trytond/protocols/dispatcher.py Fri May 11 13:56:27 2018 +0200
@@ -192,7 +192,7 @@
raise
except (ConcurrencyException, UserError, UserWarning,
@ -10,9 +10,9 @@ diff -r 7ed03689fe01 trytond/trytond/protocols/dispatcher.py
raise
except Exception:
logger.error(log_message, *log_args, exc_info=True)
diff -r 7ed03689fe01 trytond/trytond/protocols/jsonrpc.py
--- a/trytond/trytond/protocols/jsonrpc.py Fri May 11 13:52:50 2018 +0200
+++ b/trytond/trytond/protocols/jsonrpc.py Fri May 11 13:56:27 2018 +0200
diff -r 7ed03689fe01 trytond/tryton/trytond/protocols/jsonrpc.py
--- a/tryton/trytond/trytond/protocols/jsonrpc.py Fri May 11 13:52:50 2018 +0200
+++ b/tryton/trytond/trytond/protocols/jsonrpc.py Fri May 11 13:56:27 2018 +0200
@@ -4,6 +4,7 @@
from decimal import Decimal
import json

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

4
party_identifier_migration.diff
View File

@ -1,6 +1,6 @@
diff -r a2ce49dfb9fd party.py
--- a/trytond/trytond/modules/party/party.py Mon May 06 15:04:56 2019 +0200
+++ b/trytond/trytond/modules/party/party.py Sun Jun 23 15:53:05 2019 +0200
--- a/tryton/modules/party/party.py Mon May 06 15:04:56 2019 +0200
+++ b/tryton/modules/party/party.py Sun Jun 23 15:53:05 2019 +0200
@@ -458,8 +345,11 @@
continue
for type in Party.tax_identifier_types():

8
product-cost-fifo-Use-original-cost-price-for-returned-move.patch
View File

@ -14,8 +14,8 @@ review327491003
diff --git a/move.py b/move.py
index 9e20a1d..423a4bd 100644
--- a/trytond/trytond/modules/product_cost_fifo/move.py
+++ b/trytond/trytond/modules/product_cost_fifo/move.py
--- a/tryton/modules/product_cost_fifo/move.py
+++ b/tryton/modules/product_cost_fifo/move.py
@@ -68,7 +68,6 @@ class Move(metaclass=PoolMeta):
'''
pool = Pool()
@ -69,8 +69,8 @@ index 9e20a1d..423a4bd 100644
cost_price = self._compute_product_cost_price('in')
diff --git a/product.py b/product.py
index b7e25bb..13e7d95 100644
--- a/trytond/trytond/modules/product_cost_fifo/product.py
+++ b/trytond/trytond/modules/product_cost_fifo/product.py
--- a/tryton/modules/product_cost_fifo/product.py
+++ b/tryton/modules/product_cost_fifo/product.py
@@ -4,7 +4,6 @@ import datetime as dt
from decimal import Decimal

4
product_cost_fifo-Do-not-update-average-cost-price-i.patch
View File

@ -14,8 +14,8 @@ issue9484
diff --git a/product.py b/product.py
index 13e7d95..415d833 100644
--- a/trytond/trytond/modules/product_cost_fifo/product.py
+++ b/trytond/trytond/modules/product_cost_fifo/product.py
--- a/tryton/modules/product_cost_fifo/product.py
+++ b/tryton/modules/product_cost_fifo/product.py
@@ -138,9 +138,7 @@ class Product(metaclass=PoolMeta):
return move.from_location.type == 'storage'

4
product_cost_fifo-Enforce-filling-cost-price-of-move.patch
View File

@ -12,8 +12,8 @@ issue9397
diff --git a/move.py b/move.py
index 423a4bd..f4a7b61 100644
--- a/trytond/trytond/modules/product_cost_fifo/move.py
+++ b/trytond/trytond/modules/product_cost_fifo/move.py
--- a/tryton/modules/product_cost_fifo/move.py
+++ b/tryton/modules/product_cost_fifo/move.py
@@ -102,7 +102,7 @@ class Move(metaclass=PoolMeta):
# Compute average cost price
average_cost_price = self._compute_product_cost_price(

8
product_cost_fifo-Use-all-moves-to-compute-FIFO.patch
View File

@ -26,8 +26,8 @@ issue9443
diff --git a/product.py b/product.py
index 0c204bd..b7e25bb 100644
--- a/trytond/trytond/modules/product_cost_fifo/product.py
+++ b/trytond/trytond/modules/product_cost_fifo/product.py
--- a/tryton/modules/product_cost_fifo/product.py
+++ b/tryton/modules/product_cost_fifo/product.py
@@ -30,7 +30,7 @@ class Product(metaclass=PoolMeta):
domain = [
('product', '=', self.id),
@ -115,8 +115,8 @@ index 0c204bd..b7e25bb 100644
diff --git a/tests/scenario_product_cost_fifo_recompute_cost_price.rst b/tests/scenario_product_cost_fifo_recompute_cost_price.rst
index f8b952f..ff76174 100644
--- a/trytond/trytond/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
+++ b/trytond/trytond/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
--- a/tryton/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
+++ b/tryton/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
@@ -45,6 +45,7 @@ Get stock locations::
>>> supplier_loc, = Location.find([('code', '=', 'SUP')])
>>> storage_loc, = Location.find([('code', '=', 'STO')])

12
product_cost_fifo-update-all-moves-to-compute-fifo.patch
View File

@ -17,8 +17,8 @@ review321471002
Index: move.py
===================================================================
--- a/trytond/trytond/modules/product_cost_fifo/move.py
+++ b/trytond/trytond/modules/product_cost_fifo/move.py
--- a/tryton/modules/product_cost_fifo/move.py
+++ b/tryton/modules/product_cost_fifo/move.py
@@ -81,13 +81,15 @@
to_save = []
for move, move_qty in fifo_moves:
@ -44,8 +44,8 @@ Index: move.py
move_qty = Uom.compute_qty(self.product.default_uom, move_qty,
Index: product.py
===================================================================
--- a/trytond/trytond/modules/product_cost_fifo/product.py
+++ b/trytond/trytond/modules/product_cost_fifo/product.py
--- a/tryton/modules/product_cost_fifo/product.py
+++ b/tryton/modules/product_cost_fifo/product.py
@@ -31,7 +31,7 @@
domain = [
('product', '=', self.id),
@ -124,8 +124,8 @@ Index: product.py
Index: tests/scenario_product_cost_fifo_recompute_cost_price.rst
===================================================================
--- a/trytond/trytond/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
+++ b/trytond/trytond/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
--- a/tryton/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
+++ b/tryton/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
@@ -45,6 +45,7 @@
>>> supplier_loc, = Location.find([('code', '=', 'SUP')])
>>> storage_loc, = Location.find([('code', '=', 'STO')])

4
production-Keep-cost-of-unused-input-products.patch
View File

@ -15,8 +15,8 @@ review316051002
diff --git a/production.py b/production.py
index 2bd52d1..13ec112 100644
--- a/trytond/trytond/modules/production/production.py
+++ b/trytond/trytond/modules/production/production.py
--- a/tryton/modules/production/production.py
+++ b/tryton/modules/production/production.py
@@ -1,7 +1,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.

26
production-Update-cost-of-moves-when-recomputing-product-cost.patch
View File

@ -19,8 +19,8 @@ issue7271
diff --git a/__init__.py b/__init__.py
index b8909ab..94292a3 100644
--- a/trytond/trytond/modules/production/__init__.py
+++ b/trytond/trytond/modules/production/__init__.py
--- a/tryton/modules/production/__init__.py
+++ b/tryton/modules/production/__init__.py
@@ -7,6 +7,7 @@ from .bom import *
from .product import *
from .production import *
@ -40,8 +40,8 @@ index b8909ab..94292a3 100644
diff --git a/ir.py b/ir.py
new file mode 100644
index 0000000..3ccc082
--- a/trytond/trytond/modules/production/ir.py
+++ b/trytond/trytond/modules/production/ir.py
--- a/tryton/modules/production/ir.py
+++ b/tryton/modules/production/ir.py
@@ -0,0 +1,14 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
@ -59,8 +59,8 @@ index 0000000..3ccc082
+ ])
diff --git a/production.py b/production.py
index acd7a35..2bd52d1 100644
--- a/trytond/trytond/modules/production/production.py
+++ b/trytond/trytond/modules/production/production.py
--- a/tryton/modules/production/production.py
+++ b/tryton/modules/production/production.py
@@ -445,6 +445,22 @@ class Production(Workflow, ModelSQL, ModelView):
move.save()
self._set_move_planned_date()
@ -86,8 +86,8 @@ index acd7a35..2bd52d1 100644
pool = Pool()
diff --git a/production.xml b/production.xml
index e67fbb5..2f46f8c 100644
--- a/trytond/trytond/modules/production/production.xml
+++ b/trytond/trytond/modules/production/production.xml
--- a/tryton/modules/production/production.xml
+++ b/tryton/modules/production/production.xml
@@ -305,5 +305,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">assign_failed_form</field>
</record>
@ -101,8 +101,8 @@ index e67fbb5..2f46f8c 100644
</tryton>
diff --git a/stock.py b/stock.py
index 092cdba..0b8bbc3 100644
--- a/trytond/trytond/modules/production/stock.py
+++ b/trytond/trytond/modules/production/stock.py
--- a/tryton/modules/production/stock.py
+++ b/tryton/modules/production/stock.py
@@ -32,6 +32,12 @@ class Move(metaclass=PoolMeta):
readonly=True, select=True, ondelete='CASCADE',
domain=[('company', '=', Eval('company'))],
@ -139,7 +139,7 @@ diff --git a/tests/scenario_production_set_cost.rst b/tests/scenario_production_
new file mode 100644
index 0000000..0117fba
--- /dev/null
+++ b/trytond/trytond/modules/production/tests/scenario_production_set_cost.rst
+++ b/tryton/modules/production/tests/scenario_production_set_cost.rst
@@ -0,0 +1,105 @@
+===================
+Production Set Cost
@ -248,8 +248,8 @@ index 0000000..0117fba
+ False
diff --git a/tests/test_production.py b/tests/test_production.py
index 2bcf2ec..e9f596c 100644
--- a/trytond/trytond/modules/production/tests/test_production.py
+++ b/trytond/trytond/modules/production/tests/test_production.py
--- a/tryton/modules/production/tests/test_production.py
+++ b/tryton/modules/production/tests/test_production.py
@@ -54,4 +54,8 @@ def suite():
tearDown=doctest_teardown, encoding='utf-8',
checker=doctest_checker,

10
production_cost_fifo-Update-cost-of-moves-when-recomputing-product-cost.patch
View File

@ -13,8 +13,8 @@ Subject: [PATCH] Update cost of moves when recomputing product cost issue8795
diff --git a/product.py b/product.py
index 86a6faa..0c204bd 100644
--- a/trytond/trytond/modules/product_cost_fifo/product.py
+++ b/trytond/trytond/modules/product_cost_fifo/product.py
--- a/tryton/modules/product_cost_fifo/product.py
+++ b/tryton/modules/product_cost_fifo/product.py
@@ -1,6 +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.
@ -281,7 +281,7 @@ diff --git a/tests/scenario_product_cost_fifo_recompute_cost_price.rst b/tests/s
new file mode 100644
index 0000000..f8b952f
--- /dev/null
+++ b/trytond/trytond/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
+++ b/tryton/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
@@ -0,0 +1,126 @@
+======================================
+Product Cost FIFO Recompute Cost Price
@ -411,8 +411,8 @@ index 0000000..f8b952f
+ Decimal('99.9999')
diff --git a/tests/test_product_cost_fifo.py b/tests/test_product_cost_fifo.py
index 7b81f5e..5ee6fb6 100644
--- a/trytond/trytond/modules/product_cost_fifo/tests/test_product_cost_fifo.py
+++ b/trytond/trytond/modules/product_cost_fifo/tests/test_product_cost_fifo.py
--- a/tryton/modules/product_cost_fifo/tests/test_product_cost_fifo.py
+++ b/tryton/modules/product_cost_fifo/tests/test_product_cost_fifo.py
@@ -32,4 +32,9 @@ def suite():
tearDown=doctest_teardown, encoding='utf-8',
checker=doctest_checker,

18
production_view.diff
View File

@ -1,6 +1,6 @@
diff -r 74028491a4a5 trytond/trytond/modules/production/locale/ca.po
--- a/trytond/trytond/modules/production/locale/ca.po Mon May 06 15:06:40 2019 +0200
+++ b/trytond/trytond/modules/production/locale/ca.po Tue Jul 23 11:43:54 2019 +0200
diff -r 74028491a4a5 trytond/tryton/trytond/modules/production/locale/ca.po
--- a/tryton/modules/production/locale/ca.po Mon May 06 15:06:40 2019 +0200
+++ b/tryton/modules/production/locale/ca.po Tue Jul 23 11:43:54 2019 +0200
@@ -736,6 +736,10 @@
msgstr "Línies"
@ -23,9 +23,9 @@ diff -r 74028491a4a5 trytond/trytond/modules/production/locale/ca.po
msgctxt "wizard_button:production.assign,failed,end:"
msgid "OK"
msgstr "D'acord"
diff -r 74028491a4a5 trytond/trytond/modules/production/locale/es.po
--- a/trytond/trytond/modules/production/locale/es.po Mon May 06 15:06:40 2019 +0200
+++ b/trytond/trytond/modules/production/locale/es.po Tue Jul 23 11:43:54 2019 +0200
diff -r 74028491a4a5 trytond/tryton/trytond/modules/production/locale/es.po
--- a/tryton/modules/production/locale/es.po Mon May 06 15:06:40 2019 +0200
+++ b/tryton/modules/production/locale/es.po Tue Jul 23 11:43:54 2019 +0200
@@ -736,6 +736,10 @@
msgstr "Líneas"
@ -48,9 +48,9 @@ diff -r 74028491a4a5 trytond/trytond/modules/production/locale/es.po
msgctxt "wizard_button:production.assign,failed,end:"
msgid "OK"
msgstr "Aceptar"
diff -r 74028491a4a5 trytond/trytond/modules/production/view/production_form.xml
--- a/trytond/trytond/modules/production/view/production_form.xml Mon May 06 15:06:40 2019 +0200
+++ b/trytond/trytond/modules/production/view/production_form.xml Tue Jul 23 11:43:54 2019 +0200
diff -r 74028491a4a5 trytond/tryton/trytond/modules/production/view/production_form.xml
--- a/tryton/modules/production/view/production_form.xml Mon May 06 15:06:40 2019 +0200
+++ b/tryton/modules/production/view/production_form.xml Tue Jul 23 11:43:54 2019 +0200
@@ -19,9 +19,11 @@
<label name="uom"/>
<field name="uom"/>

6
project_invoice_progress_compute_qty.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/project_invoice/work.py b/trytond/trytond/modules/project_invoice/work.py
diff --git a/tryton/modules/project_invoice/work.py b/tryton/trytond/trytond/modules/project_invoice/work.py
index fcc41a2..3577e1f 100644
--- a/trytond/trytond/modules/project_invoice/work.py
+++ b/trytond/trytond/modules/project_invoice/work.py
--- a/tryton/modules/project_invoice/work.py
+++ b/tryton/modules/project_invoice/work.py
@@ -515,9 +515,6 @@ class Work(metaclass=PoolMeta):
invoiced_progress = sum(x.effort_hours for x in self.invoiced_progress)

6
project_work_company_rule.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/project/work.xml b/trytond/trytond/modules/project/work.xml
diff --git a/tryton/modules/project/work.xml b/tryton/trytond/trytond/modules/project/work.xml
index 8a961cf..349c326 100644
--- a/trytond/trytond/modules/project/work.xml
+++ b/trytond/trytond/modules/project/work.xml
--- a/tryton/modules/project/work.xml
+++ b/tryton/modules/project/work.xml
@@ -225,5 +225,16 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_delete" eval="True"/>
</record>

4
purchase_line_rule.diff
View File

@ -1,7 +1,7 @@
diff --git a/purchase.xml b/purchase.xml
index d3ecb5b..aef771b 100644
--- a/trytond/trytond/modules/purchase/purchase.xml
+++ b/trytond/trytond/modules/purchase/purchase.xml
--- a/tryton/modules/purchase/purchase.xml
+++ b/tryton/modules/purchase/purchase.xml
@@ -559,6 +559,18 @@ this repository contains the full copyright notices and license terms. -->
<field name="rule_group" ref="rule_group_purchase"/>
</record>

4
rule_account_journal_period.diff
View File

@ -1,7 +1,7 @@
diff --git a/account.xml b/account.xml
index f5129dd..eea90b1 100644
--- a/trytond/trytond/modules/account/account.xml
+++ b/trytond/trytond/modules/account/account.xml
--- a/tryton/modules/account/account.xml
+++ b/tryton/modules/account/account.xml
@@ -738,5 +738,17 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">account.aged_balance,-1</field>
<field name="action" ref="report_aged_balance"/>

6
sale-Use-original-cost-price-for-returned-move.patch
View File

@ -1,7 +1,7 @@
diff --git a/stock.py b/trytond/trytond/modules/sale/stock.py
diff --git a/stock.py b/tryton/modules/sale/stock.py
index 8d34c30..955de77 100644
--- a/trytond/trytond/modules/sale/stock.py
+++ b/trytond/trytond/modules/sale/stock.py
--- a/tryton/modules/sale/stock.py
+++ b/tryton/modules/sale/stock.py
@@ -1,5 +1,6 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.

6
sale_copy.diff
View File

@ -1,6 +1,6 @@
diff -r 7fdc432c6f03 trytond/trytond/modules/sale/sale.py
--- a/trytond/trytond/modules/sale/sale.py Mon May 06 15:10:35 2019 +0200
+++ b/trytond/trytond/modules/sale/sale.py Tue Jul 23 16:27:52 2019 +0200
diff -r 7fdc432c6f03 trytond/tryton/trytond/modules/sale/sale.py
--- a/tryton/modules/sale/sale.py Mon May 06 15:10:35 2019 +0200
+++ b/tryton/modules/sale/sale.py Tue Jul 23 16:27:52 2019 +0200
@@ -656,6 +656,9 @@
default.setdefault('moves', None)
default.setdefault('shipment_state', 'none')

10
sale_list_price.diff
View File

@ -1,6 +1,6 @@
diff -r 656db55c90c0 trytond/trytond/modules/sale/product.py
--- a/trytond/trytond/modules/sale/product.py Sat Jan 26 01:12:51 2019 +0100
+++ b/trytond/trytond/modules/sale/product.py Wed Feb 06 16:31:25 2019 +0100
diff -r 656db55c90c0 trytond/tryton/trytond/modules/sale/product.py
--- a/tryton/modules/sale/product.py Sat Jan 26 01:12:51 2019 +0100
+++ b/tryton/modules/sale/product.py Wed Feb 06 16:31:25 2019 +0100
@@ -1,7 +1,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.
@ -10,8 +10,8 @@ diff -r 656db55c90c0 trytond/trytond/modules/sale/product.py
from trytond.model import fields
from trytond.pyson import Eval
from trytond.pool import Pool, PoolMeta
--- a/trytond/trytond/modules/sale/product.py Tue Oct 01 22:23:55 2019 +0200
+++ b/trytond/trytond/modules/sale/product.py Tue Oct 22 14:52:38 2019 +0200
--- a/tryton/modules/sale/product.py Tue Oct 01 22:23:55 2019 +0200
+++ b/tryton/modules/sale/product.py Tue Oct 22 14:52:38 2019 +0200
@@ -119,7 +119,7 @@
user = User(Transaction().user)

4
sale_supply_drop_shippment-Use-original-cost-price-for-returned-move.patch
View File

@ -13,8 +13,8 @@ review327491003
diff --git a/stock.py b/stock.py
index 46dc496..84b00ca 100644
--- a/trytond/trytond/modules/sale_supply_drop_shipment/stock.py
+++ b/trytond/trytond/modules/sale_supply_drop_shipment/stock.py
--- a/tryton/modules/sale_supply_drop_shipment/stock.py
+++ b/tryton/modules/sale_supply_drop_shipment/stock.py
@@ -404,7 +404,6 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
pool = Pool()
UoM = pool.get('product.uom')

12
sale_supply_supply_on_sale_multivalue.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/sale_supply/__init__.py b/trytond/trytond/modules/sale_supply/__init__.py
diff --git a/tryton/modules/sale_supply/__init__.py b/tryton/trytond/trytond/modules/sale_supply/__init__.py
index f39eafa..da71465 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
@@ -16,6 +16,7 @@ def register():
Purchase,
ShipmentIn,
@ -10,10 +10,10 @@ index f39eafa..da71465 100644
Product,
module='sale_supply', type_='model')
Pool.register(
diff --git a/trytond/trytond/modules/sale_supply/product.py b/trytond/trytond/modules/sale_supply/product.py
diff --git a/tryton/modules/sale_supply/product.py b/tryton/trytond/trytond/modules/sale_supply/product.py
index 580ec29..92f046f 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,20 +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.

4
search_warehouse.diff
View File

@ -1,6 +1,6 @@
diff -r 78ac887c5b7f location.py
--- a/trytond/trytond/modules/stock/location.py Tue Jun 12 16:16:43 2018 +0200
+++ b/trytond/trytond/modules/stock/location.py Tue Jun 12 16:19:53 2018 +0200
--- a/tryton/modules/stock/location.py Tue Jun 12 16:16:43 2018 +0200
+++ b/tryton/modules/stock/location.py Tue Jun 12 16:19:53 2018 +0200
@@ -59,7 +59,7 @@
"Flat Children",
help="Check to restrict to one level of children.")

8
statement_of_account.diff
View File

@ -1,6 +1,6 @@
diff -r 62f81d7eb78b account.py
--- a/trytond/trytond/modules/account/account.py Fri Jul 07 10:04:01 2017 +0200
+++ b/trytond/trytond/modules/account/account.py Fri Jul 07 10:30:29 2017 +0200
--- a/tryton/modules/account/account.py Fri Jul 07 10:04:01 2017 +0200
+++ b/tryton/modules/account/account.py Fri Jul 07 10:30:29 2017 +0200
@@ -1261,7 +1261,7 @@
@classmethod
def __setup__(cls):
@ -20,8 +20,8 @@ diff -r 62f81d7eb78b account.py
def get_party_required(self, name):
return self.account.party_required
diff -r 62f81d7eb78b view/general_ledger_line_context_form.xml
--- a/trytond/trytond/modules/account/view/general_ledger_line_context_form.xml Fri Jul 07 10:04:01 2017 +0200
+++ b/trytond/trytond/modules/account/view/general_ledger_line_context_form.xml Fri Jul 07 10:30:29 2017 +0200
--- a/tryton/modules/account/view/general_ledger_line_context_form.xml Fri Jul 07 10:04:01 2017 +0200
+++ b/tryton/modules/account/view/general_ledger_line_context_form.xml Fri Jul 07 10:30:29 2017 +0200
@@ -6,4 +6,16 @@
<label name="party_cumulate"/>
<field name="party_cumulate"/>

4
stock-Enforce-filling-cost-price-of-move.patch
View File

@ -12,8 +12,8 @@ issue9397
diff --git a/move.py b/move.py
index 19f4401..839a393 100644
--- 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
@@ -266,8 +266,15 @@ class Move(Workflow, ModelSQL, ModelView):
'invisible': Eval('state') != 'done',
},

32
stock-Update-cost-of-moves-when-recomputing-product-cost.patch
View File

@ -22,8 +22,8 @@ issue7271
diff --git a/__init__.py b/__init__.py
index daf5784..6d65b2e 100644
--- a/trytond/trytond/modules/stock/__init__.py
+++ b/trytond/trytond/modules/stock/__init__.py
--- a/tryton/modules/stock/__init__.py
+++ b/tryton/modules/stock/__init__.py
@@ -11,6 +11,7 @@ from . import inventory
from . import configuration
from . import party
@ -51,8 +51,8 @@ index daf5784..6d65b2e 100644
diff --git a/ir.py b/ir.py
new file mode 100644
index 0000000..0508a53
--- /a//trytond/trytond/modules/stock/ir.py
+++ b/trytond/trytond/modules/stock/ir.py
--- /a//tryton/modules/stock/ir.py
+++ b/tryton/modules/stock/ir.py
@@ -0,0 +1,15 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
@ -71,8 +71,8 @@ index 0000000..0508a53
+ ])
diff --git a/move.py b/move.py
index 7995ab4..42cf691 100644
--- 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
@@ -246,6 +246,12 @@ class Move(Workflow, ModelSQL, ModelView):
'readonly': Eval('state') != 'draft',
},
@ -130,8 +130,8 @@ index 7995ab4..42cf691 100644
def delete(cls, moves):
diff --git a/product.py b/product.py
index 1d1d448..8de40b1 100644
--- a/trytond/trytond/modules/stock/product.py
+++ b/trytond/trytond/modules/stock/product.py
--- a/tryton/modules/stock/product.py
+++ b/tryton/modules/stock/product.py
@@ -9,7 +9,8 @@ from sql import Literal, Null, Select
from sql.aggregate import Max
from sql.functions import CurrentTimestamp
@ -411,8 +411,8 @@ index 1d1d448..8de40b1 100644
+ from_ = fields.Date("From")
diff --git a/product.xml b/product.xml
index b74a8ed..fbe6d49 100644
--- a/trytond/trytond/modules/stock/product.xml
+++ b/trytond/trytond/modules/stock/product.xml
--- a/tryton/modules/stock/product.xml
+++ b/tryton/modules/stock/product.xml
@@ -32,6 +32,18 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="product.group_product_admin"/>
</record>
@ -441,8 +441,8 @@ index b74a8ed..fbe6d49 100644
</tryton>
diff --git a/tests/scenario_stock_average_cost_price.rst b/tests/scenario_stock_average_cost_price.rst
index 8223c5c..1af0e0d 100644
--- a/trytond/trytond/modules/stock/tests/scenario_stock_average_cost_price.rst
+++ b/trytond/trytond/modules/stock/tests/scenario_stock_average_cost_price.rst
--- a/tryton/modules/stock/tests/scenario_stock_average_cost_price.rst
+++ b/tryton/modules/stock/tests/scenario_stock_average_cost_price.rst
@@ -153,6 +153,7 @@ Change Cost Price to 125, to force to write recomputed price later::
Recompute Cost Price::
@ -462,7 +462,7 @@ diff --git a/tests/scenario_stock_recompute_average_cost_price.rst b/tests/scena
new file mode 100644
index 0000000..f733b8f
--- /dev/null
+++ b/trytond/trytond/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst
+++ b/tryton/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst
@@ -0,0 +1,160 @@
+==================================
+Stock Recompute Average Cost Price
@ -626,8 +626,8 @@ index 0000000..f733b8f
+ [Decimal('105.0000'), Decimal('120.0000'), Decimal('120.0000'), Decimal('100.0000')]
diff --git a/tests/test_stock.py b/tests/test_stock.py
index 60c5cc2..8fda0ea 100644
--- a/trytond/trytond/modules/stock/tests/test_stock.py
+++ b/trytond/trytond/modules/stock/tests/test_stock.py
--- a/tryton/modules/stock/tests/test_stock.py
+++ b/tryton/modules/stock/tests/test_stock.py
@@ -1437,6 +1437,11 @@ def suite():
tearDown=doctest_teardown, encoding='utf-8',
checker=doctest_checker,
@ -644,7 +644,7 @@ diff --git a/view/recompute_cost_price_start_form.xml b/view/recompute_cost_pric
new file mode 100644
index 0000000..70f258f
--- /dev/null
+++ b/trytond/trytond/modules/stock/view/recompute_cost_price_start_form.xml
+++ b/tryton/modules/stock/view/recompute_cost_price_start_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of

4
stock-Use-original-cost-price-for-returned-move.patch
View File

@ -13,8 +13,8 @@ review327491003
diff --git a/move.py b/move.py
index df296f3..19f4401 100644
--- 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
@@ -1,4 +1,4 @@
-# This file is part of Tryton. The COPYRIGHT file at the top level of
+7# This file is part of Tryton. The COPYRIGHT file at the top level of

4
stock_lot_sled_ca_locale.diff
View File

@ -1,7 +1,7 @@
diff --git a/locale/ca.po b/locale/ca.po
index 3f35fe7..338625c 100644
--- a/trytond/trytond/modules/stock_lot_sled/locale/ca.po
+++ b/trytond/trytond/modules/stock_lot_sled/locale/ca.po
--- a/tryton/modules/stock_lot_sled/locale/ca.po
+++ b/tryton/modules/stock_lot_sled/locale/ca.po
@@ -101,7 +101,7 @@ msgid ""
"You cannot close periods before the expiration of lot \"%(lot)s\" "
"(%(date)s)."

4
stock_quantity_to_zero.diff
View File

@ -1,6 +1,6 @@
diff -r 56fa7c97d5b7 move.py
--- a/trytond/trytond/modules/stock/move.py Thu Jun 06 10:24:15 2019 +0200
+++ b/trytond/trytond/modules/stock/move.py Thu Jun 06 10:25:02 2019 +0200
--- a/tryton/modules/stock/move.py Thu Jun 06 10:24:15 2019 +0200
+++ b/tryton/modules/stock/move.py Thu Jun 06 10:25:02 2019 +0200
@@ -1346,7 +1346,7 @@
location = line[0]
key = tuple(line[1:-1])

18
stock_quantity_to_zero_pass_test.diff
View File

@ -1,7 +1,7 @@
diff --git a/trytond/trytond/modules/stock/tests/scenario_stock_shipment_out.rst b/trytond/trytond/modules/stock/tests/scenario_stock_shipment_out.rst
diff --git a/tryton/modules/stock/tests/scenario_stock_shipment_out.rst b/tryton/trytond/trytond/modules/stock/tests/scenario_stock_shipment_out.rst
index 52d5b22..09a29ae 100644
--- a/trytond/trytond/modules/stock/tests/scenario_stock_shipment_out.rst
+++ b/trytond/trytond/modules/stock/tests/scenario_stock_shipment_out.rst
--- a/tryton/modules/stock/tests/scenario_stock_shipment_out.rst
+++ b/tryton/modules/stock/tests/scenario_stock_shipment_out.rst
@@ -172,7 +172,7 @@ Delete the draft move, assign and pack shipment::
>>> all(m.state == 'assigned' for m in shipment_out.outgoing_moves)
True
@ -29,10 +29,10 @@ index 52d5b22..09a29ae 100644
1
>>> shipment_out.inventory_moves[0].state
diff --git a/trytond/trytond/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst b/trytond/trytond/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
diff --git a/tryton/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst b/tryton/trytond/trytond/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
index ea2b371..edaba40 100644
--- a/trytond/trytond/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
+++ b/trytond/trytond/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
--- a/tryton/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
+++ b/tryton/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
@@ -118,13 +118,13 @@ Pack the shipment::
>>> shipment_out.state
'packed'
@ -51,10 +51,10 @@ index ea2b371..edaba40 100644
- [('', 0.0), ('00001', 3.0), ('00002', 7.0)]
+ [('00001', 3.0), ('00002', 7.0)]
diff --git a/trytond/trytond/modules/stock_partial_shipment_out/ests/scenario_stock_shipment_out.rst b/trytond/trytond/modules/stock_partial_shipment_out/tests/scenario_stock_shipment_out.rst
diff --git a/tryton/modules/stock_partial_shipment_out/ests/scenario_stock_shipment_out.rst b/tryton/trytond/trytond/modules/stock_partial_shipment_out/tests/scenario_stock_shipment_out.rst
index 321b6a9..4991c9d 100644
--- a/trytond/trytond/modules/stock_partial_shipment_out/tests/scenario_stock_shipment_out.rst
+++ b/trytond/trytond/modules/stock_partial_shipment_out/tests/scenario_stock_shipment_out.rst
--- a/tryton/modules/stock_partial_shipment_out/tests/scenario_stock_shipment_out.rst
+++ b/tryton/modules/stock_partial_shipment_out/tests/scenario_stock_shipment_out.rst
@@ -127,7 +127,3 @@ Create Shipment Out::
1
>>> len(shipment_out.outgoing_moves)

4
trytond_test_database.diff
View File

@ -1,6 +1,6 @@
diff -r bbae9fd78f9e trytond/backend/postgresql/database.py
--- a/trytond/trytond/backend/postgresql/database.py Thu Mar 28 19:22:49 2019 +0100
+++ b/trytond/trytond/backend/postgresql/database.py Mon Apr 01 14:39:22 2019 +0200
--- a/tryton/trytond/trytond/backend/postgresql/database.py Thu Mar 28 19:22:49 2019 +0100
+++ b/tryton/trytond/trytond/backend/postgresql/database.py Mon Apr 01 14:39:22 2019 +0200
@@ -291,7 +291,7 @@
def _test(cls, connection, hostname=None):
cursor = connection.cursor()

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 854d1fc4..3442a97b 100644
--- a/trytond/trytond/worker.py
+++ b/trytond/trytond/worker.py
--- a/tryton/trytond/trytond/worker.py
+++ b/tryton/trytond/trytond/worker.py
@@ -120,6 +120,9 @@ def run_task(pool, task_id):
transaction.rollback()
continue