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] Fiscal events wizards #1300

Merged
merged 191 commits into from
May 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
da341bf
Remove document.cancel and document.correction
renatonlima Oct 3, 2020
c6575ab
[MIGR] document invalidate object
renatonlima Oct 3, 2020
4f646e8
Update model access file
renatonlima Oct 3, 2020
9ee5983
[REF] document event
renatonlima Oct 14, 2020
ed977ab
[REF] invalidate number
renatonlima Oct 14, 2020
4eae992
[REF] actions and menus
renatonlima Oct 14, 2020
a0f2789
[REF] Fiscal Wizards
renatonlima Oct 14, 2020
f744f52
[ADD] Basse Wizard Mixin
renatonlima Oct 14, 2020
0e62875
[REF] Fiscal Document cancel wizard
renatonlima Oct 14, 2020
920a2e8
Remove Document status wizard
renatonlima Oct 14, 2020
1e30650
[REF] Fiscal document Correction Wizard
renatonlima Oct 14, 2020
3145968
[REF] Fiscal document invalidate number
renatonlima Oct 14, 2020
25d4e38
Rename wizards files names
renatonlima Oct 14, 2020
088fddf
[ADD] Invalid number o2m field in document serie
renatonlima Oct 14, 2020
776bf7d
[FIX] Views descriptions, company_id always readonly
renatonlima Oct 14, 2020
39cccbf
Rename invalidate number fields
renatonlima Oct 14, 2020
7d66b87
[REF] remove document_section field
renatonlima Oct 14, 2020
50b4dea
[REF] remove document_section field in l10n_br_account
renatonlima Oct 14, 2020
9c44674
[REF] remove document_section field in l10n_br_nfse
renatonlima Oct 14, 2020
436a4b0
Removed duplicated field is_edoc_printed
renatonlima Oct 14, 2020
37f10a9
[REF] rename status code, name and description fields
renatonlima Oct 14, 2020
a084d35
[REF] rename authorization event fields in eletronic document
renatonlima Oct 14, 2020
ed16b43
[REF] rename fiscal document cancelation event fields
renatonlima Oct 14, 2020
1cb1c5a
[REF] rename fields labels
renatonlima Oct 14, 2020
10a979a
[REF] rename document related fields
renatonlima Oct 14, 2020
641d5e9
Update translations
renatonlima Dec 30, 2020
b9aa14c
[REF] Base Wizard Mixin
renatonlima Dec 30, 2020
f6d0e9e
[FIX] Update Fiscal document cancel wizard
renatonlima Dec 30, 2020
29015f6
[REF] Update Fiscal Invalidate Number wizard
renatonlima Dec 30, 2020
7531c39
Update xml id ref
renatonlima Dec 30, 2020
d07ac33
[REF] Invalidate Number object
renatonlima Dec 30, 2020
a1fa75f
[REF] Document Correction
renatonlima Dec 30, 2020
a72ae2d
Update fiscal document view buttons states attr
renatonlima Dec 30, 2020
52125c1
[FIX] Flake8 and recordset invalidate_number
mileo Apr 19, 2021
8037751
[REF] codigo_motivo_situacao -> status_description on view
mileo Apr 19, 2021
20fb78f
[REF] Related docs on l10n_br_nfe
mileo Apr 19, 2021
68bf4d4
[REM] fiscal_document_event_ids of l10n_br_nfe
mileo Apr 19, 2021
b5024cc
[REF] Rename invalidate number model on l10n_br_nfe
mileo Apr 19, 2021
a8c1cea
[REF] Disable import of document_cancel and document_correction
mileo Apr 19, 2021
b7b9ac4
[FIX] Compute display name
mileo Apr 19, 2021
4605c23
[REF] View of document event
mileo Apr 19, 2021
34bc6de
[FIX] Super() clean rollback
mileo Apr 19, 2021
55870ea
[REF] Events renaming
mileo Apr 19, 2021
861660e
[REF] Renaming NF-e Wizard refactor
mileo Apr 19, 2021
4928428
[REF] Renaming NFS-e Wizard refactor
mileo Apr 19, 2021
80880d4
[REF] Renaming GINFES Wizard refactor
mileo Apr 19, 2021
d6a0210
[REF] Renaming ISSNET Wizard refactor
mileo Apr 19, 2021
5428ec4
[REF] Renaming NF-e fields
mileo Apr 20, 2021
2966e74
[REF] Renaming GINFES fields
mileo Apr 20, 2021
f6cb6ba
[REF] Renaming ISSNET fields
mileo Apr 20, 2021
a0bb90d
[IMP] Evento, documento e seus atributos
mileo Apr 20, 2021
05da65a
[FIX] Cancelamento NF-E
mileo Apr 20, 2021
ad0219f
[FIX] Document number / document confirm and document date
mileo Apr 10, 2021
a944c25
[NEW] Add constants and fix flake8
mileo Apr 20, 2021
cb4050f
[REF] Event Sequence
mileo Apr 20, 2021
4df0774
[IMP] Correction letter sequence
mileo Apr 20, 2021
cf4eed8
[REF] Clean invalidate process
mileo Apr 20, 2021
0bb03c4
[REF] Invalidate number on l10n_br_nfe
mileo Apr 20, 2021
e9c6039
[REF] View and Make PDF
mileo Apr 10, 2021
d0c26bf
[WIP] Caminho empresa / monta_caminho
mileo Apr 10, 2021
11d259a
[FIX] Make PDF / View
mileo Apr 10, 2021
1d5a209
[FIX] Make PDF of nfse
mileo Apr 10, 2021
30e73ff
[WIP] Rever essse commit
mileo Apr 10, 2021
a3cfbe5
[IMP] Event file saving and usability
mileo Apr 20, 2021
463e826
[IMP] Event file saving / usability / danfe creating
mileo Apr 20, 2021
b703661
[FIX] flake8
mileo Apr 21, 2021
5300ad1
[FIX] Flake8
mileo Apr 21, 2021
64803a0
[REF] Disable document status wizard l10n_br_nfse
mileo Apr 21, 2021
d91ddce
[REF] Clean l10n_br_fiscal
mileo Apr 21, 2021
4466de6
[REF] Clean l10n_br_nfe event
mileo Apr 21, 2021
ecccfd9
[FIX] l10n_br_nfse_issnet: change name file_xml_id to send_file_id
marcelsavegnago Apr 21, 2021
398bc1a
[FIX] l10n_br_fiscal: remove key from nfse document demo
marcelsavegnago Apr 21, 2021
80d849d
[FIX] l10n_br_nfse: _create_event_save_xml error
marcelsavegnago Apr 21, 2021
0b4bd1c
[FIX] l10n_br_fiscal: folders on zipfile - fiscal closing
marcelsavegnago Apr 21, 2021
51e1beb
[FIX] l10n_br_fiscal: error when the folder exists
marcelsavegnago Apr 21, 2021
21bcee1
[IMP] Name of document and invalidate
mileo Apr 22, 2021
5417500
[FIX] l10n_br_fiscal: closing.py flake8
marcelsavegnago Apr 22, 2021
b3b3b03
[IMP] l10n_br_nfe: imp authorization_event on invalidate
marcelsavegnago Apr 22, 2021
21be204
[IMP] l10n_br_fiscal: imp corretion_event_ids and invalidate_event_id
marcelsavegnago Apr 22, 2021
d9c212f
[IMP] Fiscal Wizards
mileo Apr 22, 2021
448d209
[IMP] Invoice Cancel Wizard
mileo Apr 22, 2021
4e473cd
[WIP] Migration Script
mileo Apr 22, 2021
8a70536
[IMP] l10n_br_nfe: add correction justification on create event
marcelsavegnago Apr 22, 2021
b637206
[IMP] l10n_br_fiscal: add justificative(optional) on create event
marcelsavegnago Apr 22, 2021
8935608
[IMP] l10n_br_fiscal: add corrections group, add cancel_reason and ad…
marcelsavegnago Apr 22, 2021
5e9a16f
[FIX] l10n_br_fiscal: fix partner_name string
marcelsavegnago Apr 22, 2021
83e869e
[FIX] l10n_br_account: flake8
marcelsavegnago Apr 22, 2021
35dad0f
[FIX] l10n_br_fiscal: flake8
marcelsavegnago Apr 22, 2021
e8fe2dd
[FIX] l10n_br_fiscal: flake8
marcelsavegnago Apr 22, 2021
e3deb6d
[FIX] Tests
mileo Apr 22, 2021
b4b6f76
[REM] Document Section of l10n_br_nfe
mileo Apr 22, 2021
6d564d3
[REM] Document Section of l10n_br_contract
mileo Apr 22, 2021
26d3f3a
[FIX] Fiscal Document Workflow
mileo Apr 22, 2021
dc5a5e5
[IMP] l10n_br_fiscal: pre-migration.py
marcelsavegnago Apr 23, 2021
5e296dc
[IMP] l10n_br_contract: flake8
marcelsavegnago Apr 23, 2021
56572c2
[REF] Clean Document Workflow
mileo Apr 23, 2021
9f71393
[FIX] Closing tests and search
mileo Apr 23, 2021
cae41a6
[FIX] Disable creation from kanban operation
mileo Apr 23, 2021
81737eb
[IMP] Subsequent documents and send workflow
mileo Apr 23, 2021
9d9dba0
[IMP] l10n_br_fiscal: add xml files invalidade_number and correction …
marcelsavegnago Apr 23, 2021
ab3f161
[FIX] l10n_br_contract: remove commented code
marcelsavegnago Apr 24, 2021
fd6a265
[FIX] Runbot error
mileo Apr 24, 2021
cebed37
[IMP] Cancel/Invalidation/Correction validation
mileo Apr 24, 2021
4687992
[REM] Cancel/Invalidation/Correction already on fiscal
mileo Apr 24, 2021
76777d6
[NEW] Invalidade From Invoice
mileo Apr 24, 2021
e3223b6
[REF] Encapsulate invalidade document creation
mileo Apr 24, 2021
b223bb9
[REF] Encapsulate invalidation wizard
mileo Apr 24, 2021
cd7ecc8
[IMP] Invoice Wizards
mileo Apr 24, 2021
0b3a5b5
[IMP] l20n_br_fiscal: imp pre-migration.py
marcelsavegnago Apr 24, 2021
066ab9f
[FIX] Invalidate sequences next_number [ADD] Validation
mileo Apr 24, 2021
518b8da
[IMP] Event file names differentiation
mileo Apr 24, 2021
6938c5a
[IMP] Document tree view
mileo Apr 24, 2021
a14fe3d
[FIX] l10n_br_nfe return when try to transmit a inutilizate number
mileo Apr 24, 2021
0f8bd34
[FIX] Flake8
mileo Apr 24, 2021
47c3efb
[FIX] Show cancel fields on account view [REM] fiscal dashboard submenu
mileo Apr 25, 2021
53e3b13
[FIX] l10n_br_fiscal: closing view fix readonly fields
marcelsavegnago Apr 25, 2021
688b47d
[FIX] l10n_br_nfse_issnet: fix set_done()
marcelsavegnago Apr 25, 2021
b324f7a
[IMP] l10n_br_nfse_issnet: imp rejected event
marcelsavegnago Apr 25, 2021
0620694
[FIX] l10n_br_nfse_ginfes: fix set_done()
marcelsavegnago Apr 25, 2021
24b49ea
[IMP] l10n_br_nfse_ginfes: rejected event
marcelsavegnago Apr 25, 2021
45f9250
[FIX] l10n_br_nfse_ginfes: remove comment and translate messages
marcelsavegnago Apr 25, 2021
2f5b8d6
[IMP] l10n_br_nfse_issnet: imp UserError when documento cancel fail.
marcelsavegnago Apr 25, 2021
7a2af16
[IMP] l10n_br_nfse_ginfes: imp UserError when documento cancel fail.
marcelsavegnago Apr 25, 2021
34bbc8d
[IMP] l10n_br_nfse_issnet: change self > record
marcelsavegnago Apr 25, 2021
2a5d7d2
[IMP] l10n_br_nfse_ginfes: change self > record
marcelsavegnago Apr 25, 2021
cfccefd
[FIX] l10n_br_nfse: add cnae_id on document_line_form
marcelsavegnago Apr 26, 2021
f008388
[REF] Issnet _eletronic_document_send
mileo Apr 26, 2021
190e10b
[REF] Rename issnet serialize methods to avoid collision
mileo Apr 26, 2021
8e49d52
[REF] Rename ginfes serialize methods to avoid collision
mileo Apr 26, 2021
e4b4256
[REM] Duplicate code
mileo Apr 26, 2021
66a979a
[FIX] l10n_br_nfse: flake8
marcelsavegnago Apr 26, 2021
3d97ed9
[FIX] Change comodel name
gabrielcardoso21 Mar 25, 2021
a550961
[NEW] NFE NFSE menu and action on fiscal
mileo Apr 26, 2021
ac62181
[REF] l10n_br_nfe views
mileo Apr 26, 2021
79a2c38
[REF] l10n_br_nfse view
mileo Apr 26, 2021
83af6cd
[NEW] nf-e / nfs-e invoice view
mileo Apr 26, 2021
7d5d8fe
[REF] Adapt fiscal buttons to use state_edoc
mileo Apr 27, 2021
b980a5a
[REF] Adapt l10n_br_account buttons
mileo Apr 27, 2021
37d54d7
[IMP] NFS-e Document date
mileo Apr 27, 2021
2db6d63
[FIX] l10n_br_nfse_ginfes date / protocolo cancelamento
mileo Apr 27, 2021
ca33bb6
[FIX] l10n_br_nfse_issnet protocolo cancelamento
mileo Apr 27, 2021
f49267e
[FIX] RPS/NFS-e filename
mileo Apr 27, 2021
f8f6491
[IMP] Migration script
mileo Apr 27, 2021
1e331a0
[FIX] l10n_br_nfse_issnet: remove .decode('utf-8')
marcelsavegnago Apr 27, 2021
72c08cb
[REF] Base wizard
mileo Apr 27, 2021
d108673
[REF] Document status
mileo Apr 27, 2021
a69fdd4
[NEW] Invoice Document Status
mileo Apr 27, 2021
cc07193
[FIX] l10n_br_nfse: flake8
marcelsavegnago Apr 27, 2021
1972cc4
[REF] Event PROD/HML l10n_br_fiscal
mileo Apr 27, 2021
df52ad6
[REF] Event PROD/HML l10n_br_nfe
mileo Apr 27, 2021
7b6e253
[REF] Event PROD/HML l10n_br_nfse
mileo Apr 27, 2021
eea79e8
[REF] Event PROD/HML l10n_br_nfse_ginfes
mileo Apr 27, 2021
b4f196d
[REF] Event PROD/HML l10n_br_nfse_ginfes
mileo Apr 27, 2021
a43e4cb
[REF] RPS on event number
mileo Apr 27, 2021
a340473
[REM] Document Number on NFS-e
mileo Apr 27, 2021
ae32734
[REF] key -> document_key on l10n_br_fiscal
mileo Apr 27, 2021
9a37f9f
[REF] key -> document_key on l10n_br_nfe
mileo Apr 27, 2021
f693fa3
[REF] key -> document_key on l10n_br_account
mileo Apr 27, 2021
24823f8
[REF] number -> document_number on l10n_br_fiscal
mileo Apr 27, 2021
9178cbb
[REF] number -> document_number on l10n_br_nfe
mileo Apr 27, 2021
8595c82
[REF] number -> document_number on l10n_br_nfse
mileo Apr 27, 2021
95c4924
[REF] number -> document_number on l10n_br_nfe_ginfes
mileo Apr 27, 2021
e037f35
[REF] number -> document_number on l10n_br_nfse_issnet
mileo Apr 27, 2021
ff4a3c7
[REF] number -> document_number on l10n_br_account
mileo Apr 27, 2021
ebbb893
[REF] Force name empty string
mileo Apr 27, 2021
93ee817
[REF] Drop fiscal_number [REF] document_number l10n_br_account
mileo Apr 27, 2021
5b18ccb
[REF] Related serie -> document_serie
mileo Apr 27, 2021
ff2da3d
[REF] Protect methods of l10n_br_fiscal
mileo Apr 27, 2021
686e4f5
[REF] Protect methods of l10n_br_nfe
mileo Apr 27, 2021
13a3051
[REF] Protect methods of l10n_br_nfse
mileo Apr 27, 2021
10d9a14
[REF] Protect methods of l10n_br_account
mileo Apr 27, 2021
b7e702e
[REM] l10n_br_contract workaround
mileo Apr 27, 2021
50761a2
[FIX] Migration script
mileo Apr 27, 2021
3cc4489
[FIX] migration script l10n_br_nfse
mileo Apr 27, 2021
86b676a
[REF] Fiscal document name
mileo Apr 28, 2021
0d9b368
[FIX] Document Name on invoice finalize_invoice_move_lines
mileo Apr 28, 2021
4f02471
[FIX] partner cnpj cpf punctuation rm
mileo Apr 28, 2021
706cd3e
[REF] Wizard l10n_br_fiscal document status
mileo Apr 28, 2021
3bfc7b1
[REM] l10n_br_nfse document status wizard
mileo Apr 28, 2021
cfd3a03
[REF] l10n_br_nfse_ginfes _document_status
mileo Apr 28, 2021
baf9678
[REF] l10n_br_nfse_issnet _document_status
mileo Apr 28, 2021
288da70
[FIX] Close #1249
mileo Apr 19, 2021
c1e6701
[FIX] Monta processo completo nf-e
mileo May 5, 2021
a52b1c2
[RENAME] Document Date to avoid error when install l10n_br_account
mileo May 5, 2021
1e1de14
[REF] Document Date to avoid error when install l10n_br_account on nfe
mileo May 5, 2021
114f381
[REF] Document Date to avoid error when install l10n_br_account on nfse
mileo May 5, 2021
c4ee35b
[REF] Document Date to avoid error when install l10n_br_account on gi…
mileo May 5, 2021
da5061a
[REF] Document Date to avoid error when install l10n_br_account on is…
mileo May 5, 2021
158ee74
[IMP] erpbrasil.edoc==2.0.2 erpbrasil.edoc.pdf==1.0.1
mileo May 5, 2021
784bcc7
[IMP] l10n_br_nfe: add field nfe40_xEnder
marcelsavegnago May 6, 2021
db8ede7
[FIX] l10n_br_account: flake8
marcelsavegnago May 12, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions l10n_br_account/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

# Wizards
'wizards/account_invoice_refund_view.xml',
'wizards/wizard_document_status.xml',

# Actions
"views/l10n_br_account_action.xml",
Expand Down
54 changes: 31 additions & 23 deletions l10n_br_account/models/account_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
FISCAL_OUT,
DOCUMENT_ISSUER_COMPANY,
DOCUMENT_ISSUER_PARTNER,
SITUACAO_EDOC_AUTORIZADA,
SITUACAO_EDOC_CANCELADA,
SITUACAO_EDOC_EM_DIGITACAO,
)
Expand Down Expand Up @@ -90,11 +89,6 @@ class AccountInvoice(models.Model):
string='Electronic?',
)

fiscal_number = fields.Char(
string='Fiscal Number',
copy=False,
)

# this default should be overwritten to False in a module pretending to
# create fiscal documents from the invoices. But this default here
# allows to install the l10n_br_account module without creating issues
Expand All @@ -107,6 +101,16 @@ class AccountInvoice(models.Model):
ondelete='cascade',
)

document_type = fields.Char(
related='document_type_id.code',
stored=True,
)

@api.multi
def _get_amount_lines(self):
"""Get object lines instaces used to compute fields"""
return self.mapped('invoice_line_ids')

@api.multi
def _get_amount_lines(self):
"""Get object lines instaces used to compute fields"""
Expand Down Expand Up @@ -309,7 +313,9 @@ def finalize_invoice_move_lines(self, move_lines):
if l[2]['debit'] or l[2]['credit']:
if self.fiscal_document_id != dummy_doc:
l[2]['name'] = '{}/{}-{}'.format(
self.fiscal_number,
self.fiscal_document_id.with_context(
fiscal_document_no_company=True
)._compute_document_name(),
count,
len(financial_lines)
)
Expand Down Expand Up @@ -404,11 +410,8 @@ def action_date_assign(self):
for invoice in self:
if invoice.fiscal_document_id != dummy_doc:
if invoice.issuer == DOCUMENT_ISSUER_COMPANY:
invoice.fiscal_document_id.document_date()
invoice.fiscal_document_id.document_number()
invoice.fiscal_number = invoice.fiscal_document_id.number
else:
invoice.fiscal_document_id.number = invoice.fiscal_number
invoice.fiscal_document_id._document_date()
invoice.fiscal_document_id._document_number()

@api.multi
def action_move_create(self):
Expand All @@ -427,7 +430,7 @@ def action_invoice_draft(self):
raise UserError(_(
"You can't set this document number: {} to draft "
"because this document is cancelled in SEFAZ".format(
i.fiscal_number)))
i.document_number)))
if i.state_edoc != SITUACAO_EDOC_EM_DIGITACAO:
i.fiscal_document_id.action_document_back2draft()
return super().action_invoice_draft()
Expand All @@ -445,21 +448,19 @@ def action_document_send(self):
def action_document_cancel(self):
dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
for i in self.filtered(lambda d: d.fiscal_document_id != dummy_doc):
if i.state_edoc == SITUACAO_EDOC_AUTORIZADA:
return i.fiscal_document_id.action_document_cancel()
return i.fiscal_document_id.action_document_cancel()

@api.multi
def action_document_correction(self):
dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
for i in self.filtered(lambda d: d.fiscal_document_id != dummy_doc):
if i.state_edoc in SITUACAO_EDOC_AUTORIZADA:
if i.issuer == DOCUMENT_ISSUER_COMPANY:
return i.fiscal_document_id.action_document_correction()
else:
raise UserError(_(
"You cannot create a fiscal correction document if "
"this fical document you are not the document issuer"
))
return i.fiscal_document_id.action_document_correction()

@api.multi
def action_document_invalidate(self):
dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
for i in self.filtered(lambda d: d.fiscal_document_id != dummy_doc):
return i.fiscal_document_id.action_document_invalidate()

@api.multi
def action_document_back2draft(self):
Expand All @@ -470,6 +471,13 @@ def action_document_back2draft(self):
i.action_cancel()
i.action_invoice_draft()

@api.multi
def action_invoice_cancel(self):
dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
for i in self.filtered(lambda d: d.fiscal_document_id != dummy_doc):
return i.fiscal_document_id.action_document_cancel()
return super().action_invoice_cancel()

def view_xml(self):
self.ensure_one()
return self.fiscal_document_id.view_xml()
Expand Down
17 changes: 8 additions & 9 deletions l10n_br_account/views/account_invoice_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<field name="ie" string="State Tax Number"/>
</field>
<field name="number" position="attributes">
<attribute name="filter_domain">['|','|','|', '|', ('fiscal_number','ilike',self), ('number','ilike',self), ('origin','ilike',self), ('reference', 'ilike', self), ('partner_id', 'child_of', self)]</attribute>
<attribute name="filter_domain">['|','|','|', '|', ('document_number','ilike',self), ('number','ilike',self), ('origin','ilike',self), ('reference', 'ilike', self), ('partner_id', 'child_of', self)]</attribute>
<attribute name="string">Account Number</attribute>
</field>
</field>
Expand All @@ -25,7 +25,7 @@
<field name="arch" type="xml">
<field name="number" position="before">
<field name="document_type_id" invisible="1"/>
<field name="fiscal_number"/>
<field name="document_number"/>
<button name="open_fiscal_document" type="object" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible': [('document_type_id', '=', False)]}"/>
</field>
</field>
Expand All @@ -50,7 +50,7 @@
<div attrs="{'invisible': [('document_type_id', '=', False)]}">
<span class="oe_inline">
<field readonly="1" name="document_type_id"/>:
<field name="fiscal_number" readonly="1" attrs="{'invisible': [('state','in',('draft',))]}"/>
<field name="document_number" readonly="1" attrs="{'invisible': [('state','in',('draft',))]}"/>
</span>
</div>
</h1>
Expand All @@ -60,7 +60,6 @@
<field name="id" invisible="1"/>
<field name="document_electronic" invisible="1"/>
<field name="fiscal_operation_type" invisible="1"/>
<field name="document_section" invisible="1"/>
<field name="number" invisible="1"/>
<field name="edoc_purpose" invisible="1"/>
<field name="ind_final" invisible="1"/>
Expand All @@ -69,13 +68,14 @@
</group>
</xpath>
<field name="cash_rounding_id" position="after">
<field name="document_type" invisible="1"/>
<field name="document_type_id" attrs="{'invisible': [('fiscal_document_id', '=', %(l10n_br_fiscal.fiscal_document_dummy)d)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="fiscal_operation_id" attrs="{'invisible': [('document_type_id', '=', False)], 'required': [('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="issuer" attrs="{'invisible': [('document_type_id', '=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="document_serie_id" requied="0" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'partner')], 'required': [('issuer', '=', 'company'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="document_serie" requied="0" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="fiscal_number" readonly="0" force_save="1" attrs="{'invisible': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="key" attrs="{'invisible': [('document_electronic', '=', False)], 'readonly': ['|', ('issuer', '=', 'company'), ('state', '!=', 'draft')]}"/>
<field name="document_number" readonly="0" force_save="1" attrs="{'invisible': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="document_key" attrs="{'invisible': [('document_electronic', '=', False)], 'readonly': ['|', ('issuer', '=', 'company'), ('state', '!=', 'draft')]}"/>
</field>
<xpath expr="//field[@name='invoice_line_ids']/tree" position="attributes">
<attribute name="editable"/>
Expand Down Expand Up @@ -125,7 +125,6 @@
<field name="id" invisible="1"/>
<field name="document_electronic" invisible="1"/>
<field name="fiscal_operation_type" invisible="1"/>
<field name="document_section" invisible="1"/>
<field name="number" invisible="1"/>
<field name="edoc_purpose" invisible="1"/>
<field name="ind_final" invisible="1"/>
Expand All @@ -139,8 +138,8 @@
<field name="issuer" attrs="{'invisible': [('document_type_id', '=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="document_serie_id" requied="0" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'partner')], 'required': [('issuer', '=', 'company'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="document_serie" requied="0" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="fiscal_number" readonly="0" force_save="1" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="key" attrs="{'invisible': [('document_electronic', '=', False)], 'readonly': ['|', ('issuer', '=', 'company'), ('state', '!=', 'draft')]}"/>
<field name="document_number" readonly="0" force_save="1" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="document_key" attrs="{'invisible': [('document_electronic', '=', False)], 'readonly': ['|', ('issuer', '=', 'company'), ('state', '!=', 'draft')]}"/>
</field>
<xpath expr="//field[@name='invoice_line_ids']/tree" position="attributes">
<attribute name="editable"/>
Expand Down
46 changes: 9 additions & 37 deletions l10n_br_account/views/fiscal_invoice_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<field name="inherit_id" ref="l10n_br_fiscal.document_search"/>
<field name="mode">primary</field>
<field name="arch" type="xml">
<xpath expr="//field[@name='number']" position="replace">
<field name="fiscal_number" string="Number"/>
<xpath expr="//field[@name='document_number']" position="after">
<field name="number" string="Account Number" invisible="1"/>
<field name="legal_name" string="Legal Name"/>
<field name="cnpj_cpf" string="CNPJ/CPF"/>
Expand All @@ -23,8 +22,7 @@
<field name="inherit_id" ref="l10n_br_fiscal.document_tree"/>
<field name="mode">primary</field>
<field name="arch" type="xml">
<xpath expr="//field[@name='number']" position="replace">
<field name="fiscal_number" string="Number"/>
<xpath expr="//field[@name='document_number']" position="after">
<field name="number" string="Account Number" invisible="1"/>
<field name="commercial_partner_id" invisible="1"/>
<field name="reference" invisible="1"/>
Expand All @@ -43,44 +41,18 @@
<field name="inherit_id" ref="l10n_br_fiscal.document_form"/>
<field name="mode">primary</field>
<field name="arch" type="xml">
<xpath expr="//form/field[@name='state_edoc']" position="replace"/>
<xpath expr="//header/field[@name='state']" position="replace">
<xpath expr="//header" position="inside">
<field name="state" invisible="1"/>
<field name="state_edoc" widget="statusbar" statusbar_visible="em_digitacao,autorizada" readonly="1"/>
</xpath>
<xpath expr="//button[@name='action_document_send']" position="attributes">
<attribute name="states"/>
<attribute name="attrs">{'invisible': [('state_edoc', 'not in', ('a_enviar', 'rejeitada'))]}</attribute>
</xpath>
<xpath expr="//button[@name='action_document_correction']" position="attributes">
<attribute name="states"/>
<attribute name="attrs">{'invisible': [('state_edoc', '!=', 'autorizada')]}</attribute>
</xpath>
<xpath expr="//button[@name='action_document_invalidate']" position="attributes">
<attribute name="states"/>
<attribute name="attrs">{'invisible': ['|', ('state_edoc', 'in', ('autorizada', 'cancelada', 'denegada')), ('fiscal_number', '=', False)]}</attribute>
</xpath>
<xpath expr="//button[@name='view_pdf']" position="attributes">
<attribute name="states"/>
<attribute name="attrs">{'invisible': ['|', ('state_edoc', '=', 'em_digitacao'), ('document_electronic', '=', False)]}</attribute>
</xpath>
<xpath expr="//button[@name='view_xml']" position="attributes">
<attribute name="states"/>
<attribute name="attrs">{'invisible': ['|', ('state_edoc', '=', 'em_digitacao'), ('document_electronic', '=', False)]}</attribute>
</xpath>
<xpath expr="//button[@name='action_document_confirm']" position="before">
<field name="fiscal_document_id" required="0" invisible="1"/>
<button name="action_invoice_open" type="object" states="draft" string="Validate" class="oe_highlight o_invoice_validate" groups="account.group_account_invoice"/>
<button name="action_document_back2draft" type="object" string="Voltar para Digitação" groups="l10n_br_fiscal.group_user" attrs="{'invisible': ['|', ('state_edoc', 'not in', ('a_enviar', 'enviada', 'rejeitada')), ('document_electronic', '=', False)]}" class="btn-secondary"/>
</xpath>
<xpath expr="//button[@name='action_document_cancel']" position="attributes">
<attribute name="attrs">{'invisible': ['|', ('state_edoc', '!=', 'autorizada'), ('document_electronic', '=', False)]}</attribute>
<xpath expr="//button[@name='action_document_confirm']" position="replace">
<button name="action_invoice_open" type="object" states="draft" string="Validate" class="oe_highlight o_invoice_validate" groups="account.group_account_invoice"/>
</xpath>
<xpath expr="//h1/field[@name='number']" position="replace">
<field name="fiscal_number" class="oe_inline" readonly="1"/>
<xpath expr="//button[@name='action_document_back2draft']" position="replace">
<button name="action_document_back2draft" type="object" string="Voltar para Digitação" groups="l10n_br_fiscal.group_user" attrs="{'invisible': ['|', ('state_edoc', 'not in', ('a_enviar', 'enviada', 'rejeitada')), ('document_electronic', '=', False)]}" class="btn-secondary"/>
</xpath>
<xpath expr="//group/field[@name='number']" position="replace">
<field name="fiscal_number" class="oe_inline" force_save="1" attrs="{'invisible': [('issuer', '=', 'company')], 'readonly': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner')]}"/>
<xpath expr="//button[@name='action_create_return']" position="replace">
<button name="%(account.action_account_invoice_refund)d" type='action' string='Devolver' groups="account.group_account_invoice" attrs="{'invisible': ['|',('type', 'in', ['in_refund','out_refund']),('state','not in',('open','in_payment','paid'))]}"/>
</xpath>
<xpath expr="//page[@name='finance']" position="inside">
<group>
Expand Down
Loading