This repository has been archived by the owner on Mar 21, 2021. It is now read-only.
10.0 17012018 #95
Open
10.0 17012018 #95
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
added 6 commits
January 26, 2018 18:02
yelizariev
suggested changes
Jan 30, 2018
| @@ -466,9 +471,17 @@ def _em_add_record(self, | |||
|
|
|||
| journal = self.env.ref(journal_ref) | |||
|
|
|||
| currency_id = currency and self.env['res.currency'].search([('name', '=', currency)], limit=1) | |||
There was a problem hiding this comment.
We need a way to use different currency names, e.g.
RUB
РУБ
рублей
рубля
рубль
руб
руб.
р.
| currency_ids = all_currencies_line_ids.mapped('currency_id') | ||
| for currency_id in currency_ids: | ||
| balance += sum(all_currencies_line_ids.filtered(lambda r: r.currency_id == currency_id).mapped('balance')) * currency_id.rate | ||
| balance += self.get_currency_balance(currency=base_currency) |
There was a problem hiding this comment.
base_currency might not have rate 1, so you need to dived after computing sum,
e.g
base_currency = RUB, rate = 0.017
EUR = 1.2
USD = 1
Then without dividing you will get sum in USD rather than in base_currency
added 6 commits
January 30, 2018 10:30
…ls then search in aliases
|
@yelizariev , done |
yelizariev
reviewed
Jan 30, 2018
| @@ -85,7 +85,8 @@ def get_currency_balance(self, currency=None): | |||
| all_currencies_line_ids = AccountMoveLine.search(domain) | |||
| currency_ids = all_currencies_line_ids.mapped('currency_id') | |||
| for currency_id in currency_ids: | |||
| balance += sum(all_currencies_line_ids.filtered(lambda r: r.currency_id == currency_id).mapped('balance')) * currency_id.rate | |||
| rate = self.env['res.currency']._get_conversion_rate(base_currency, currency_id) | |||
| balance += sum(all_currencies_line_ids.filtered(lambda r: r.currency_id == currency_id).mapped('balance')) * rate | |||
yelizariev
reviewed
Jan 30, 2018
| class Currency(models.Model): | ||
| _inherit = "res.currency" | ||
|
|
||
| alias_ids = fields.One2many('res.currency.alias', 'currency_id', string='Aliases') |
yelizariev
suggested changes
Jan 30, 2018
| @@ -472,6 +472,8 @@ def _em_add_record(self, | |||
| journal = self.env.ref(journal_ref) | |||
|
|
|||
| currency_id = currency and self.env['res.currency'].search([('name', '=', currency)], limit=1) | |||
| currency_alias = currency and self.env['res.currency.alias'].sudo().search([('name', '=', currency)], limit=1) | |||
There was a problem hiding this comment.
You should not make search if currency_id is already known
|
@yelizariev , done |
yelizariev
suggested changes
Feb 1, 2018
| currency_alias = currency and self.env['res.currency.alias'].sudo().search([('name', '=', currency)], limit=1) | ||
| currency_id = currency_id or currency_alias and currency_alias.currency_id | ||
| currency_id = currency and (self.env['res.currency'].search([('name', '=', currency)], limit=1) \ | ||
| or self.env['res.currency.alias'].sudo().search([('name', '=', currency)], limit=1)) |
There was a problem hiding this comment.
currency_id is res.currency or res.currency.alias?
added 4 commits
February 6, 2018 13:53
…no currency found
…t.move.line - all lines without currency_id are concidered as in base currency
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.