Skip to content
Extraits de code Groupes Projets
Valider 910fec26 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

[ADD] amount_lost field

parent 365632dc
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -27,6 +27,11 @@ repos:
entry: found forbidden files; remove them
language: fail
files: "\\.rej$"
- id: en-po-files
name: en.po files cannot exist
entry: found a en.po file
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
hooks:
......@@ -46,7 +51,7 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
......@@ -96,32 +101,28 @@ repos:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
rev: 5.5.1
rev: 5.12.0
hooks:
- id: isort
name: isort except __init__.py
args:
- --settings=.
exclude: /__init__\.py$
- repo: https://gitlab.com/PyCQA/flake8
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/PyCQA/pylint
rev: pylint-2.5.3
- repo: https://github.com/OCA/pylint-odoo
rev: 7.0.2
hooks:
- id: pylint
- id: pylint_odoo
name: pylint with optional checks
args:
- --rcfile=.pylintrc
- --exit-zero
verbose: true
additional_dependencies: &pylint_deps
- pylint-odoo==3.5.0
- id: pylint
name: pylint with mandatory checks
- id: pylint_odoo
args:
- --rcfile=.pylintrc-mandatory
additional_dependencies: *pylint_deps
......@@ -13,6 +13,7 @@ class ScopContributionRiga(models.Model):
date_contribution = fields.Date("Date Appel")
date_maturity = fields.Date("Date Echeance")
amount = fields.Float("Montant appelé")
amount_lost = fields.Float("Montant perdu")
amount_due = fields.Float("Montant restant", compute="_compute_amounts", store=True)
amount_paid = fields.Float("Montant réglé", compute="_compute_amounts", store=True)
quarter = fields.Selection(
......@@ -43,7 +44,7 @@ class ScopContributionRiga(models.Model):
inverse_name="contribution_id",
string="Règlements",
)
is_loss = fields.Boolean("Perte")
is_loss = fields.Boolean("Perte", compute="_compute_is_loss", store=True)
note = fields.Text("Commentaire")
# ------------------------------------------------------
......@@ -63,13 +64,19 @@ class ScopContributionRiga(models.Model):
@api.depends(
"amount",
"amount_lost",
"payment_ids",
"payment_ids.amount",
)
def _compute_amounts(self):
for c in self:
c.amount_paid = sum(c.payment_ids.mapped("amount"))
c.amount_due = c.amount - c.amount_paid
c.amount_due = c.amount - c.amount_paid - c.amount_lost
@api.depends("amount_lost")
def _compute_is_loss(self):
for c in self:
c.is_loss = True if c.amount_lost > 0 else False
# ------------------------------------------------------
# Override Parent
......
......@@ -30,8 +30,7 @@ class ScopContributionReport(models.Model):
}
source = fields.Selection(
selection_add=[("riga", "Riga")],
ondelete={"riga": "cascade"}
selection_add=[("riga", "Riga")], ondelete={"riga": "cascade"}
)
def _subquery(self):
......
......@@ -48,7 +48,6 @@
</field>
</record>
<!-- FORM VIEW -->
<record model="ir.ui.view" id="scop_contribution_riga_form">
<field name="name">scop.contribution.riga.form</field>
......@@ -59,18 +58,19 @@
<group>
<group string="Adhérent">
<field name="year" />
<field name='date_contribution' />
<field name='partner_ur_id' />
<field name='member_number' />
<field name='partner_id' />
<field name="date_contribution" />
<field name="partner_ur_id" />
<field name="member_number" />
<field name="partner_id" />
</group>
<group string="Cotisation">
<field name='quarter' />
<field name="date_maturity" />
<field name='type_contribution_id' />
<field name='amount' />
<field name="amount_due" />
<field name="amount_paid" />
<field name="date_maturity" />
<field name="amount_lost" />
<field name="amount_due" />
<field name="is_loss" />
</group>
</group>
......@@ -93,16 +93,17 @@
default_order="date_contribution desc"
>
<field name="year" />
<field name='date_contribution' />
<field name='partner_ur_id' />
<field name='member_number' />
<field name='partner_id' />
<field name='quarter' />
<field name='type_contribution_id' />
<field name='amount' sum="Total appelé" />
<field name="amount_due" sum="Total dû" />
<field name="amount_paid" sum="Total payé" />
<field name="date_contribution" />
<field name="partner_ur_id" />
<field name="member_number" />
<field name="partner_id" />
<field name="quarter" />
<field name="date_maturity" />
<field name="type_contribution_id" />
<field name="amount" sum="Total appelé" />
<field name="amount_paid" sum="Total payé" />
<field name="amount_lost" sum="Total perdu" />
<field name="amount_due" sum="Total dû" />
<field name="is_loss" />
</tree>
</field>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter