Skip to content

Commit

Permalink
[IMP] Imporved the code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Murtaza-OSI
Murtaza-OSI committed Jun 25, 2024
1 parent b7dfa06 commit 6d444d2
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 48 deletions.
2 changes: 1 addition & 1 deletion account_factoring_receivable_balance_factofrance/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"account_factoring_receivable_balance",
"l10n_fr",
],
"data": [],
"data": ["data/subrogation_seq.xml", "views/subrogation_receipt_views.xml"],
"demo": [],
}
8 changes: 8 additions & 0 deletions account_factoring_receivable_balance_factofrance/data/subrogation_seq.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<odoo noupdate="1">
<record id="factoring_receivable_seq" model="ir.sequence">
<field name="name">Factoring Receivable</field>
<field name="code">factoring.receivable</field>
<field name="padding">5</field>
<field name="company_id" eval="False" />
</record>
</odoo>
105 changes: 58 additions & 47 deletions account_factoring_receivable_balance_factofrance/models/subrogation_receipt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@
class SubrogationReceipt(models.Model):
_inherit = "subrogation.receipt"

name = fields.Char(
required=True,
copy=False,
readonly=False,
default=lambda self: _("New"),
)
file_type = fields.Selection(
[("101_102", "Only 101-102"), ("103_104", "Only 103-104"), ("both", "Both")]
)

@api.onchange("file_type")
def onchange_file_type(self):
self.line_ids = self.item_ids = [(6, 0, [])]

@api.model
def _get_domain_for_factor(self, factor_type, factor_journal, currency=None):
domain = super()._get_domain_for_factor(factor_type, factor_journal, currency)
Expand All @@ -27,9 +41,11 @@ def _prepare_factor_file_factofrance(self):
"Entry-point to generate the factor file"
self.ensure_one()
name = "F{}_{}_{}.txt".format( # TODO!
self._sanitize_filepath(self.name),
self._sanitize_filepath(
dict(self._fields["file_type"].selection).get(self.file_type)
),
self._sanitize_filepath(f"{fields.Date.today()}"),
self.id,
self._sanitize_filepath(self.company_id.name),
)
return {
"name": name,
Expand All @@ -39,28 +55,15 @@ def _prepare_factor_file_factofrance(self):
}

def action_confirm(self):
if self.name == _("New"):
self.name = self.env["ir.sequence"].next_by_code("factoring.receivable")
super().action_confirm()
if self.factor_type == "factofrance":
data = self._prepare_factor_file("factofrance_payment")
if data:
self.env["ir.attachment"].create(data)

def _prepare_factor_file_factofrance_payment(self):
self.ensure_one()
name = "F{}_{}_{}_{}.txt".format( # TODO!
self._sanitize_filepath(f"{fields.Date.today()}"),
self.id,
self._sanitize_filepath(self.company_id.name),
"payment",
)
return {
"name": name,
"res_id": self.id,
"res_model": self._name,
"datas": self.with_context(
is_payment=True
)._prepare_factor_file_data_factofrance(),
}
def action_draft(self):
self.state = "draft"
self.env["ir.attachment"].search(
[("res_id", "=", self.id), ("res_model", "=", self._name)]
).unlink()

def _prepare_factor_file_data_factofrance(self):
self.ensure_one()
Expand Down Expand Up @@ -189,35 +192,38 @@ def get_code(self, move, line):

def action_compute_lines(self):
res = super().action_compute_lines()
amls = self.env["account.move.line"].search(
[
("date", "<=", self.target_date),
("parent_state", "=", "posted"),
("payment_id", "!=", False),
(
"partner_id.commercial_partner_id.factor_journal_id",
"=",
self.factor_journal_id.id,
),
("partner_id.factor_journal_id", "=", self.factor_journal_id.id),
("subrogation_id", "=", False),
]
)
# Exclude lines with credit in bank journal
amls = amls.filtered(
lambda aml: aml.journal_id.type != "bank" or aml.credit == 0
)
self.write({"item_ids": [Command.link(aml.id) for aml in amls]})
amls.write({"subrogation_id": self.id})
if self.file_type != "101_102":
if self.file_type != "both":
self.item_ids.write({"subrogation_id": False})
self.line_ids = self.item_ids = [(6, 0, [])]

amls = self.env["account.move.line"].search(
[
("date", "<=", self.target_date),
("parent_state", "=", "posted"),
("payment_id", "!=", False),
(
"partner_id.commercial_partner_id.factor_journal_id",
"=",
self.factor_journal_id.id,
),
("partner_id.factor_journal_id", "=", self.factor_journal_id.id),
("subrogation_id", "=", False),
]
)
# Exclude lines with credit in bank journal
amls = amls.filtered(
lambda aml: aml.journal_id.type != "bank" or aml.credit == 0
)
self.write({"item_ids": [Command.link(aml.id) for aml in amls]})
amls.write({"subrogation_id": self.id})
return res

def _get_factofrance_body(self):
self = self.sudo()
rows = []
balance = 0
lines = self.line_ids.filtered(lambda l: not l.payment_id)
if self._context.get("is_payment"):
lines = self.line_ids.filtered(lambda l: l.payment_id)
lines = self.line_ids
for line in lines:
move = line.move_id
partner = line.move_id.partner_id.commercial_partner_id
Expand Down Expand Up @@ -254,8 +260,13 @@ def _get_factofrance_body(self):
"number": move.name[:15].ljust(15, " "),
"currency": self.company_id.currency_id.name or " ",
"account_sign": "+" if move.move_type == "out_invoice" else "-",
"amount": str(line.debit or line.credit).rjust(15, "0") or " ",
"invoice_date_due": factofrance_date(move.invoice_date_due) if move.move_type == "out_invoice" else "".ljust(11, " ") or " ",
"amount": (str(line.debit or line.credit).replace(".", "")).rjust(
15, "0"
)
or " ",
"invoice_date_due": factofrance_date(move.invoice_date_due)
if move.move_type == "out_invoice"
else "".ljust(11, " ") or " ",
"customer_order_reference": move.ref
and move.ref.ljust(40, " ")
or "".ljust(40, " "),
Expand Down
27 changes: 27 additions & 0 deletions account_factoring_receivable_balance_factofrance/views/subrogation_receipt_views.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<odoo>
<record id="subrogation_receipt_form_inherit" model="ir.ui.view">
<field name="name">subrogation_receipt_form_inherit</field>
<field name="model">subrogation.receipt</field>
<field name="inherit_id" ref="account_factoring_receivable_balance.subrogation_receipt_form"/>
<field name="arch" type="xml">
<xpath expr="//button[@name='action_confirm']" position="after">
<button name="action_draft" type="object" string="Draft" invisible="state == 'draft'"/>
</xpath>
<xpath expr="//field[@name='factor_type']" position="before">
<field name="name" readonly="1" string="Document No."/>
</xpath>
<xpath expr="//field[@name='factor_type']" position="after">
<field name="file_type" required="factor_type == 'factofrance'" readonly="state !='draft'"/>
</xpath>
<xpath expr="//button[@name='action_post']" position="attributes">
<attribute name="invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='item_ids']/tree/field[@name='partner_id']" position="attributes">
<attribute name="optional">show</attribute>
</xpath>
<xpath expr="//field[@name='item_ids']/tree/field[@name='partner_ref']" position="attributes">
<attribute name="optional">hide</attribute>
</xpath>
</field>
</record>
</odoo>

0 comments on commit 6d444d2

Please sign in to comment.