[10.0] Merge odoo brazil wip/l10n br base #542

rvalyi · 2017-06-06T20:33:12Z

see here for the extraction script #529 (comment)

…/l10n-brazil into kmee-migration10/l10n_br_account

…, views

…sem_rebase

…elop

…eiro

rvalyi

l10n_br_base should not depend on the product module, the code related to product should go in the l10n_br_product or l10n_br_account_product module instead

copy_views dependence module should make it in OCA/server-tools instead. I'm analyzing the concept though...

rvalyi · 2017-06-06T20:34:21Z

l10n_br_base/__manifest__.py

        'base_setup',
+        'decimal_precision',
+        'product',


l10n_br_base should not depend on the product module, the code related to product should go in the l10n_br_product module instead

rvalyi · 2017-06-06T20:34:52Z

l10n_br_base/__manifest__.py

+        'views/sped_produto_produto_view.xml',
+        'views/sped_unidade_produto_view.xml',
+        'views/sped_produto_servico_view.xml',
+        'views/sped_unidade_servico_view.xml',


l10n_br_base should not depend on the product module, the code related to product should go in the l10n_br_product module instead

rvalyi · 2017-06-06T20:35:16Z

l10n_br_base/models/__init__.py

+#
+from . import sped_produto
+from . import inherited_product_template
+from . import inherited_product_product


l10n_br_base should not depend on the product module, the code related to product should go in the l10n_br_product module instead

rvalyi

more code that should be part of the l10n_br_base module

rvalyi · 2017-06-06T20:42:22Z

l10n_br_base/models/inherited_mail_template.py

+    format_date,
+    format_tz,
+)
+from ..constante_tributaria import *


this is for the SPED or product based NFE, this should hence go to the l10n_br_account_product module instead

rvalyi · 2017-06-06T20:43:53Z

l10n_br_base/models/__init__.py

+#
+from . import copied_account_payment_term
+from . import copied_account_payment_term_line
+from . import inherited_account_payment_term


this code is dependent on the account module, it should go in the l10n_br_account module or even more terminal modules instead

rvalyi · 2017-06-06T20:45:44Z

l10n_br_base/models/__init__.py

+# Unidade é requisito para NCM e produtos
+#
+from . import sped_unidade
+from . import inherited_product_uom


again, this code is dependent on the product module and shoudl go to the l10n_br_product module instead at least

rvalyi · 2017-06-09T14:09:48Z

Hello contributors: so aside from my previous comments, I also identified the messy commit who lost the original files history and fuck the merge-ability of your WIP branch into the OCA:

First here is a list of the commits around the problem:

commit 9685798bc47b6168d80a5d8042070b75c60faa48
Author: Ari Caldeira <aristides.caldeira@tauga.com.br>
Date:   Mon Apr 10 15:31:12 2017 -0300

    [FEA] Movendo mais models para o base
rvalyi@rvalyi-laptop:~/DEV/OCA/l10n-brazil/wip-10$ git log | grep 6aef1aa1c9cdc4eb1445f5a016763f29f159aab7 -A20 -B20
    [FIX] Mais pylint

commit 3cf6e8d91ccbea4c2b87fac3c9738ebc2adac7b3
Author: Ari Caldeira <aristides.caldeira@tauga.com.br>
Date:   Sat Apr 22 10:49:24 2017 -0300

    [FIX] Mais pylint

commit 2f2385d8dfe3ca82598d557d3e70ef7f9aeb15ee
Author: Ari Caldeira <aristides.caldeira@tauga.com.br>
Date:   Sat Apr 22 10:47:53 2017 -0300

    [FIX] Erros e avisos pylint

commit 5c36864848ad49bed4c2f3ea47422b6390f84b6d
Author: Ari Caldeira <aristides.caldeira@tauga.com.br>
Date:   Sat Apr 22 09:14:21 2017 -0300

    [FEA] Movendo template de email para base

commit 6aef1aa1c9cdc4eb1445f5a016763f29f159aab7
Author: Ari Caldeira <aristides.caldeira@tauga.com.br>
Date:   Fri Apr 21 08:35:52 2017 -0300

    [FIX] Limpeza após rebase
    [FIX] Cópia de views agora mantém sincronia no caso de herança
    [FEA] Empresa movido para l10n_br_base
    [FEA] CNAE movido para sped

commit ae5f89c9040881bce627ad105cf330c96f2ff875
Merge: 9685798 1a35c41
Author: Ari Caldeira <aristides.caldeira@tauga.com.br>
Date:   Wed Apr 19 09:04:34 2017 -0300

    Merge branch '10.0-develop' of github.com:aricaldeira/l10n-brazil-wip into 10.0-develop

commit 9685798bc47b6168d80a5d8042070b75c60faa48
Author: Ari Caldeira <aristides.caldeira@tauga.com.br>
Date:   Mon Apr 10 15:31:12 2017 -0300

    [FEA] Movendo mais models para o base

The last correct commit is commit 9685798 "[FEA] Movendo mais models para o base" from @aricaldeira is OK:

all OCA original files of the l10n_br_base module are here:
https://github.com/odoo-brazil/l10n-brazil-wip/tree/9685798bc47b6168d80a5d8042070b75c60faa48/l10n_br_base/models

examples of proper history being kept:
https://github.com/odoo-brazil/l10n-brazil-wip/commits/9685798bc47b6168d80a5d8042070b75c60faa48/l10n_br_base/models/res_partner.py
https://github.com/odoo-brazil/l10n-brazil-wip/commits/9685798bc47b6168d80a5d8042070b75c60faa48/l10n_br_base/models/res_company.py
https://github.com/odoo-brazil/l10n-brazil-wip/commits/9685798bc47b6168d80a5d8042070b75c60faa48/l10n_br_base/views/res_partner_view.xml

But next commit 6aef1aa "[FIX] Limpeza após rebase" from @aricaldeira is KO:

original files aren't here anymore:
https://github.com/odoo-brazil/l10n-brazil-wip/tree/6aef1aa1c9cdc4eb1445f5a016763f29f159aab7/l10n_br_base/models

they are moved to the backup directory:
https://github.com/odoo-brazil/l10n-brazil-wip/tree/6aef1aa1c9cdc4eb1445f5a016763f29f159aab7/l10n_br_base/models/backup

But in a way that lost the history:

example: https://github.com/odoo-brazil/l10n-brazil-wip/commits/6aef1aa1c9cdc4eb1445f5a016763f29f159aab7/l10n_br_base/models/backup/res_partner.py

history of view files is lost too:
https://github.com/odoo-brazil/l10n-brazil-wip/commits/6aef1aa1c9cdc4eb1445f5a016763f29f159aab7/l10n_br_base/views/backup/res_partner_view.xml

I'll now do some git-filter branch magic to restore the files into the WIP branch history and make a PR against the WIP branch to restore the OCA merge-ability. Next we will still have a lot of work to achieve the merge but at least we will be back on track again.

cc @renatonlima @mileo @mbcosta @aricaldeira

mbcosta · 2017-06-09T20:37:01Z

Hi all,
I did this https://docs.google.com/spreadsheets/d/1EVTWXOW6c6gkJ_JyLTZSj4BJRr5u_MdehuwZ4EhX9D4/edit#gid=0 comparative analisys of the OCA classes and fields VS the WIP branch fields to help us converging the sped_* modules inside the OCA. Any help or tips are welcome
cc @rvalyi @renatonlima @mileo @aricaldeira

mbcosta · 2017-06-09T20:38:30Z

l10n_br_base/models/inherited_res_currency.py

+    is_uom = fields.Boolean(
+        string='Is UOM?',
+    )
+    is_currency = fields.Boolean(


I think is better extract the things not related to currency from this class

mileo · 2017-06-12T02:36:21Z

Olá

Lembrei de uma opção que podemos utilizar:

@aricaldeira @rvalyi

rvalyi · 2017-10-04T14:13:00Z

a inclusao desse modulo esta reportada na branch da versao 11

yk2kus and others added 30 commits December 12, 2016 14:17

migrate l10n_br_account to V 10.0

551ddd6

Merge branch 'migration10/l10n_br_account' of https://github.com/kmee…

6ec0da0

…/l10n-brazil into kmee-migration10/l10n_br_account

Merge branch 'feature/mig10aka' into develop

7f34c41

[FIX] flake8 errors

fd10831

pep8 in l10n_br_base/models/res_partner.py

a159ea8

[FIX] Estados Brasileiros com preenchimento do IBGE

d514875

starting move objects in sped module to l10n_br_base

63ca40f

move base menus and sped_pais object, view and data

52a1573

move base menus and sped_estado object, view and data

bf4686b

move base menus and sped_municipio object, view and data

057ade3

move base menus and sped_cnae object, view and data

dbbbcbc

move base menus, constante_tributaria.py and sped_participante object…

549cb35

…, views

remove from sped references of all resources migrated to l10n_br_base

d87cf23

[FIX] PEP8

975dcdb

[REF] Fix path of menus and path to country.

abf97d2

Merge branch 'develop' into feature/l10n_br_financial

24ba452

Merge branch 'develop' into feature/sped_documento

a4d8495

Merge branch 'develop' into feature/l10n_br_financial

957b42d

Merge branch '10.0-develop' into feature/sped_documento_l10n_br_base_…

25fe325

…sem_rebase

[REF] Sped empresa em l10n_br_base

1bb5bb9

[REF] View herdada de sped.empresa

bd503d4

Merge remote-tracking branch 'odoo-brazil/10.0-develop' into 10.0-dev…

a84e585

…elop

[FEA] Ajustando dados carregados e views

f4f4688

[FEA] Movendo mais models para o base

7e6a879

[FIX] Arquivos faltaram mover

0267cef

[FIX] Dados básicos de locais (países e estados)

cb28494

[FIX] Constante movida para o módulo l10n_br_base

00637b8

[FIX] Views movidas para o módulo l10n_br_base

0037733

[FEA] Separando a cópia de views em outro módulo, para usar no financ…

8de2cec

…eiro

[FIX] Removendo debug

12baace

mileo and others added 13 commits May 3, 2017 16:18

[REF] Revisao do flake8 e pytint do l10n_br_base

c626d16

[FIX] Removendo default=True de em_parcelas_mensais

9a4ed40

[FEA] Ajustando tratamento das moedas e índices

ac13705

[FIX] Ajustando busca das unidades

76c77a3

[FIX] Ajustando vínculo empresa/participante/partner

edfd7a3

[FEA] Ajustando tratamento das moedas e índices

ec7a0c0

[FIX] Ajustando vínculo empresa/participante/partner

e9779ed

[NEW] Dados de demonstração para empresas e parceiros

d8729b2

[FIX] Criacao de participantes em uma instalacao sem pt_BR

81fa9e6

[FEA] Novas constantes

1f52880

[WIP] Impostos na Invoice

731186b

[FIX] Corrigindo criação de empresa/company

5e18149

[IMP][l10n_br_base] Convert sped.base in a Python class

d3fb96b

rvalyi commented Jun 6, 2017

View reviewed changes

rvalyi requested review from renatonlima and mileo June 6, 2017 20:36

rvalyi mentioned this pull request Jun 6, 2017

Merge odoo brazil wip/l10n br base #536

Closed

rvalyi commented Jun 6, 2017

View reviewed changes

rvalyi added 10.0 help wanted needs fixing needs review labels Jun 8, 2017

rvalyi mentioned this pull request Jun 9, 2017

prototipo nova versão da localização brasileira v10 #529

Closed

3 tasks

mbcosta reviewed Jun 9, 2017

View reviewed changes

rvalyi closed this Oct 4, 2017

rvalyi mentioned this pull request Oct 17, 2017

Migration to version 11.0 #568

Closed

35 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[10.0] Merge odoo brazil wip/l10n br base #542

[10.0] Merge odoo brazil wip/l10n br base #542

rvalyi commented Jun 6, 2017 •

edited

rvalyi left a comment •

edited

rvalyi Jun 6, 2017

rvalyi Jun 6, 2017

rvalyi Jun 6, 2017

rvalyi left a comment

rvalyi Jun 6, 2017

rvalyi Jun 6, 2017

rvalyi Jun 6, 2017

rvalyi commented Jun 9, 2017

mbcosta commented Jun 9, 2017 •

edited

mbcosta Jun 9, 2017 •

edited

mileo commented Jun 12, 2017

rvalyi commented Oct 4, 2017

[10.0] Merge odoo brazil wip/l10n br base #542

[10.0] Merge odoo brazil wip/l10n br base #542

Conversation

rvalyi commented Jun 6, 2017 • edited

rvalyi left a comment • edited

Choose a reason for hiding this comment

rvalyi Jun 6, 2017

Choose a reason for hiding this comment

rvalyi Jun 6, 2017

Choose a reason for hiding this comment

rvalyi Jun 6, 2017

Choose a reason for hiding this comment

rvalyi left a comment

Choose a reason for hiding this comment

rvalyi Jun 6, 2017

Choose a reason for hiding this comment

rvalyi Jun 6, 2017

Choose a reason for hiding this comment

rvalyi Jun 6, 2017

Choose a reason for hiding this comment

rvalyi commented Jun 9, 2017

mbcosta commented Jun 9, 2017 • edited

mbcosta Jun 9, 2017 • edited

Choose a reason for hiding this comment

mileo commented Jun 12, 2017

rvalyi commented Oct 4, 2017

rvalyi commented Jun 6, 2017 •

edited

rvalyi left a comment •

edited

mbcosta commented Jun 9, 2017 •

edited

mbcosta Jun 9, 2017 •

edited