Remove patch issue10845.diff, applayed yet in 6.0
This commit is contained in:
parent
d75010849a
commit
525575ecd4
|
@ -1,19 +0,0 @@
|
|||
diff --git a/trytond/trytond/modules/commission/invoice.py b/trytond/trytond/modules/commission/invoice.py
|
||||
index 93d37be..60535e6 100644
|
||||
--- a/trytond/trytond/modules/commission/invoice.py
|
||||
+++ b/trytond/trytond/modules/commission/invoice.py
|
||||
@@ -77,11 +77,13 @@ class Invoice(metaclass=PoolMeta):
|
||||
pool = Pool()
|
||||
Commission = pool.get('commission')
|
||||
|
||||
+ invoices_to_revert_commission = [x for x in invoices if not x.move]
|
||||
+
|
||||
super(Invoice, cls).cancel(invoices)
|
||||
|
||||
to_delete = []
|
||||
to_save = []
|
||||
- for sub_invoices in grouped_slice(invoices):
|
||||
+ for sub_invoices in grouped_slice(invoices_to_revert_commission):
|
||||
ids = [i.id for i in sub_invoices]
|
||||
to_delete += Commission.search([
|
||||
('invoice_line', '=', None),
|
2
series
2
series
|
@ -36,5 +36,3 @@ account_asset.diff # [account_asset] issue9767: Add revisions when updating an a
|
|||
account_asset_update_asset.diff # [account_asset] decimals when updata asset #044767
|
||||
|
||||
sao_colors.diff # [sao] Use the same colors as 5.4 version
|
||||
|
||||
issue10845.diff # [commission] Do not reverse commission when canceling invoice with move
|
||||
|
|
Loading…
Reference in New Issue