[13.0][MIG]pos_margin #669
Merged
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
HaraldPanten
approved these changes
Jun 15, 2021
|
@legalsylvain I think this one can be merged. THX! |
|
Can you please integrate the latest changes recently merged in 12.0? |
73d25a0 to
f9dca2b
Compare
|
Thanks for the reaction @manuelregidor In fact we want to cherry-pick the missing commits instead, in order to respect authors and to keep the proper commit history. In this case, I believe these 3 commits are missing: |
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pos-11.0/pos-11.0-pos_margin Translate-URL: https://translation.odoo-community.org/projects/pos-11-0/pos-11-0-pos_margin/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pos-12.0/pos-12.0-pos_margin Translate-URL: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_margin/
Currently translated at 100.0% (8 of 8 strings) Translation: pos-12.0/pos-12.0-pos_margin Translate-URL: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_margin/pt/
…logic as OCA/margin-analysis/account_invoice_margin module ; [ADD] margin and margin percent on tree pos order view ; [UPD] Description and translation
…g same logic as OCA/margin-analysis/account_invoice_margin module ; [ADD] margin and margin percent on tree pos order view ; [UPD] Description and translation
Co-Authored-By: Denis Roussel (ACSONE) <rousseldenis@users.noreply.github.com>
Currently translated at 75.0% (6 of 8 strings) Translation: pos-12.0/pos-12.0-pos_margin Translate-URL: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_margin/it/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pos-12.0/pos-12.0-pos_margin Translate-URL: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_margin/
Currently translated at 100.0% (10 of 10 strings) Translation: pos-12.0/pos-12.0-pos_margin Translate-URL: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_margin/es/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pos-12.0/pos-12.0-pos_margin Translate-URL: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_margin/
f9dca2b to
0030839
Compare
ivantodorovich
requested changes
Jul 21, 2021
e518fc5 to
ba4fb01
Compare
ivantodorovich
requested changes
Jul 23, 2021
ba4fb01 to
8edeac7
Compare
|
@ivantodorovich Done! Thank you! |
ivantodorovich
approved these changes
Jul 23, 2021
|
/ocabot merge nobump |
|
What a great day to merge this nice PR. Let's do it! |
This was referenced Jul 23, 2021
Closed
|
This PR has the |
|
Congratulations, your PR was merged at c7e51ed. Thanks a lot for contributing to OCA. ❤️ |
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.
Standard migration
Supersedes #399