Skip to content

Commit 593697a

Browse files
committed
[REF+IMP] l10n_br_account_payment_order: Allow Payment Lines associate with multiple CNAB Log Events and refactoring CNAB Log Event Form view.
1 parent 1c33c8f commit 593697a

File tree

3 files changed

+57
-12
lines changed

3 files changed

+57
-12
lines changed

l10n_br_account_payment_order/models/account_payment_line.py

-8
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,6 @@ class AccountPaymentLine(models.Model):
189189
# com a account.invoice referente, já que a AML pode ser apagada
190190
move_id = fields.Many2one(comodel_name="account.move", string="Fatura")
191191

192-
cnab_log_event_id = fields.Many2one(
193-
comodel_name="l10n_br_cnab.return.event",
194-
string="CNAB Log Event",
195-
ondelete="restrict",
196-
check_company=True,
197-
readonly=True,
198-
)
199-
200192
@api.depends("percent_interest", "amount_currency", "currency_id")
201193
def _compute_interest(self):
202194
for record in self:

l10n_br_account_payment_order/models/l10n_br_cnab_event.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ class L10nBrCNABReturnEvent(models.Model):
2323
lot_id = fields.Many2one(
2424
string="Lote", comodel_name="l10n_br_cnab.return.lot", ondelete="cascade"
2525
)
26-
payment_line_ids = fields.One2many(
26+
payment_line_ids = fields.Many2many(
2727
comodel_name="account.payment.line",
28-
inverse_name="cnab_log_event_id",
28+
relation="l10n_br_cnab_log_event_payment_lines_rel",
29+
column1="cnab_log_event_payment_line_id",
30+
column2="payment_line_id",
2931
string="Payment lines",
30-
check_company=True,
3132
)
3233
real_payment_date = fields.Date(string="Data do Crédito")
3334
occurrence_date = fields.Date(string="Data da Ocorrência")

l10n_br_account_payment_order/views/l10n_br_cnab_return_log_view.xml

+53-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</group>
5151

5252
<notebook>
53-
<page name="log_tab" string="Invoice Lines">
53+
<page name="log_tab" string="Event Lines">
5454
<field name="event_ids" readonly="1" />
5555
<group
5656
class="oe_subtotal_footer oe_right"
@@ -144,6 +144,58 @@
144144
</field>
145145
</record>
146146

147+
<record id="l10n_br_cnab_return_event_form_view" model="ir.ui.view">
148+
<field name="name">l10n_br_cnab.return.event.form</field>
149+
<field name="model">l10n_br_cnab.return.event</field>
150+
<field name="arch" type="xml">
151+
<form>
152+
<sheet>
153+
<group>
154+
<group>
155+
<field name="invoice_id" />
156+
<field name="your_number" />
157+
<field name="own_number" />
158+
<field name="title_value" />
159+
<field name="occurrences" />
160+
<field name="occurrence_date" />
161+
</group>
162+
<group>
163+
<field name="is_cnab_lot" invisible="1" />
164+
<field name="move_line_id" />
165+
<field name="favored_id" />
166+
<field name="favored_bank_account_id" />
167+
<field name="partner_id" />
168+
<field name="currency_type" />
169+
<field name="lot_id" />
170+
<field name="segment" />
171+
</group>
172+
<group>
173+
<field name="real_payment_date" />
174+
<field name="payment_value" />
175+
<field name="tariff_charge" />
176+
<field name="interest_fee_value" />
177+
<field name="other_credits" />
178+
<field name="rebate_value" />
179+
<field name="iof_value" />
180+
<field name="discount_value" />
181+
</group>
182+
<group>
183+
<field name="str_motiv_a" />
184+
<field name="str_motiv_b" />
185+
<field name="str_motiv_c" />
186+
<field name="str_motiv_d" />
187+
<field name="str_motiv_e" />
188+
</group>
189+
</group>
190+
<group string="Linhas de Ordem de Pagamentos">
191+
<field name="payment_line_ids" nolabel="1" widget="many2many" />
192+
</group>
193+
</sheet>
194+
</form>
195+
</field>
196+
</record>
197+
198+
147199
<record id="l10n_br_cnab_return_lot_form_view" model="ir.ui.view">
148200
<field name="name">l10n_br_cnab.return.lot.form.view</field>
149201
<field name="model">l10n_br_cnab.return.lot</field>

0 commit comments

Comments
 (0)