Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[12.0][REF] Delivery Costs( Freight, Insurance and Other Value ) #1301

Merged
merged 37 commits into from
Aug 24, 2021

Conversation

mbcosta
Copy link
Contributor

@mbcosta mbcosta commented Apr 19, 2021

Refectoring Delivery Costs( Freight, Insurance and Other Value )

Alterações:

cc @renatonlima @rvalyi @mileo @gabrielcardoso21

@mbcosta mbcosta force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from 7026b78 to 78fb431 Compare April 19, 2021 21:37
@renatonlima renatonlima force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from 521db78 to ef6c9fe Compare April 24, 2021 21:02
@renatonlima renatonlima force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from ef6c9fe to 5a9e8d8 Compare April 24, 2021 21:50
Copy link
Member

@renatonlima renatonlima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mbcosta

Eu testei e se a opção do lançamento dos valores por linha e esta dando um erro ao criar um novo pedido de venda em loop

@mbcosta mbcosta force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from 5a9e8d8 to 8b4b3c2 Compare April 30, 2021 15:44
@mbcosta
Copy link
Contributor Author

mbcosta commented May 3, 2021

Corrigido o erro de recursividade e foram incluídas as seguintes alterações e melhorias:

  • O name_get do objeto account.incoterms retornar o "Codigo - Descrição", muitas pessoas no Brasil conhecem mais os tipos de Frete pela sigla em inglês do que pela descrição tanto em inglês quanto português, antes:

image

depois:
image

  • Incluído dois campos tipo 'compute' com o Total de Peso e Volume no Pedido de Venda/sale.order em muitos casos a empresa usa essa informação para fazer a cotação do valor do frete, mesmo antes de gerar a nota fiscal

image

l10n_br_delivery/__manifest__.py Outdated Show resolved Hide resolved
@rvalyi rvalyi force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from dd6e602 to f0e4b62 Compare May 20, 2021 13:52
@renatonlima renatonlima force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from 80aa6ad to 23649ab Compare May 28, 2021 14:10
@renatonlima
Copy link
Member

@mbcosta,

Você pode fazer o rebase desta branch?

@mbcosta mbcosta force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch 2 times, most recently from bcc0c5a to c73c25d Compare June 10, 2021 19:42
@mileo mileo added the blocked label Jun 11, 2021
@renatonlima renatonlima force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from c73c25d to 0826fef Compare July 6, 2021 16:54
@mbcosta mbcosta force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch 2 times, most recently from f1bd4b9 to 574899d Compare July 14, 2021 15:32
@renatonlima
Copy link
Member

@mbcosta,

Você pode dá uma olhada no erro do travis? https://app.travis-ci.com/github/OCA/l10n-brazil/jobs/524473845#L4366

@mbcosta
Copy link
Contributor Author

mbcosta commented Jul 15, 2021

ola @renatonlima , pelo o que entendi do erro isso está acontecendo devido a alteração que ocorre no campo price_unit da stock.move ao Confirmar o stock.picking devido aos métodos de Valorização de Estoque do core eu procurei resolver esse problema aqui #1523

@mbcosta mbcosta force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from 574899d to 66f2e07 Compare July 21, 2021 16:21
@renatonlima
Copy link
Member

@mileo,

You added "blocked" label in this PR, but it is important that you comment and explain the reason that you added this and we debate about changes of this PR.

@renatonlima
Copy link
Member

@mbcosta please can you rebase?

Copy link
Member

@rvalyi rvalyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

almost OK, Excellent work! Please also remove the models/stock_picking.py file entirely as it is not used anywhere at all anymore.

'website': 'https://github.com/OCA/l10n-brazil',
'version': '12.0.3.0.0',
'depends': [
'l10n_br_fiscal',
'l10n_br_account',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove l10n_br_account, this is implied by l10n_br_sale_stock already

@mbcosta mbcosta force-pushed the 12.0-l10n_br_delivery-carrier-vehicle branch from a8b00e9 to 6e51974 Compare August 23, 2021 21:01
Copy link
Member

@rvalyi rvalyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ola @mbcosta vc esqueceu de remover o arquivo models/stock_picking.py isso não esta usado em lugar nenhum.

Copy link
Member

@rvalyi rvalyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Falei besteira, o override no stock_picking.py tá sendo chamado no módulo delivery. Portanto tá tudo OK.

@renatonlima
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

@renatonlima The merge process could not start, because command git push origin 12.0-ocabot-merge-pr-1301-by-renatonlima-bump-nobump failed with output:

To https://github.com/OCA/l10n-brazil
 ! [remote rejected]     12.0-ocabot-merge-pr-1301-by-renatonlima-bump-nobump -> 12.0-ocabot-merge-pr-1301-by-renatonlima-bump-nobump (cannot lock ref 'refs/heads/12.0-ocabot-merge-pr-1301-by-renatonlima-bump-nobump': reference already exists)
error: failed to push some refs to 'https://[email protected]/OCA/l10n-brazil'

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 12.0-ocabot-merge-pr-1301-by-renatonlima-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit b583900 into OCA:12.0 Aug 24, 2021
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 1773fa0. 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants