Merged from upstream 14 221008 01 #341
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[14.0][OU-ADD] sale_mrp: Nothing to do
[14.0][FIX] base: assure existing users can export
…lculation to sale.
…_percent [14.0][OU-ADD] sale_order_margin_percent: Merged sale_order_margin_percent to sale_margin.
…recalculation [14.0][OU-ADD] sale_order_price_recalculation: Merged sale_order_price_recalculation to sale.
[14.0][OU-FIX] website: Allow cookiebar in multi-websites
[14.0][FIX] pre-commit
Steps: 1. Create a customer invoice with USD 2. Register payment with EUR 3. A payment with EUR and move with USD are created 4. When migrated to add move_id field to account_payment, then payment's currency is not correct, because payment's currency is inherit from move
…econcile [14.0][FIX] account: consider amount_currency in account.partial.reconcile
[14.0][FIX] account: correct move's currency
Currency is now mandatory for all the account.move.line records, so there's certain part of the reconcile logic that relies on amount_residual_currency when currency_id is set (independently of which currency it is). Example: https://github.com/odoo/odoo/blob/1569441f15adb0b6b2920483ba8a43ccc7845e61/addons/account/models/account_move.py#L4401 so we copy the residual amount as well as the currency on the filling. TT35896
…al_currency [14.0][OU-FIX] account: Fill amount_residual_currency as well
statement lines with no move Steps for account payment: 1. Create a payment that is in draft state 2. Run migration 3. The payment that has been linked with journal entry, but journal entry contains 4 journal items Expeted: journal entry contains 2 journal items Steps for statement lines: 1. Create a statement line that is in draft state 2. Run migration 3. The statement line that has been linked with journal entry, but journal entry contains 4 journal items Expeted: journal entry contains 2 journal items
When migrating from Odoo 13.0 to Odoo 14.0, we need: 1. mapping payment_type from 'transfer' to 'inbound'/'outbound' for account payment tranfer, because key `transfer` of `payment_type` is deleted. So we need set `is_internal_transfer` as `true` on account payment transfer to indicate that it was an account payment transfer 2. On Odoo 13.0, when validating a account payment transfer, so 2 journal entries is created, equivalent to 1 receipt payment, and 1 send payment on Odoo 14.0 So, on Odoo 14.0, we need create new counterpart payment with account payment transfer
[FIX][14.0] account: process account payment transfer
…al_items [FIX][14.0] account: duplicate journal items when filling account payment / statement line with no move
…nt_currency [14.0][FIX] account: amount_currency being 0.0 in partial reconcile
JocelynVN
force-pushed
the
merged_from_upstream_14_221008_01
branch
19 times, most recently
from
ead6a89 to
843b86a
Compare
JocelynVN
changed the title
JocelynVN
force-pushed
the
merged_from_upstream_14_221008_01
branch
3 times, most recently
from
d2e255c to
f165e55
Compare
JocelynVN
force-pushed
the
merged_from_upstream_14_221008_01
branch
3 times, most recently
from
14dbd2d to
029f45d
Compare
JocelynVN
force-pushed
the
merged_from_upstream_14_221008_01
branch
from
029f45d to
13c5fc6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts: