Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
A
afac_account_fee
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
AFAC
afac_account_fee
Validations
93eabb6f
Valider
93eabb6f
rédigé
Il y a 1 an
par
Benjamin - Le Filament
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
[UPD] add pivot view and end reason fee field
parent
0c5e136c
Branches
Branches contenant la validation
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
2
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
models/account_move.py
+9
-1
9 ajouts, 1 suppression
models/account_move.py
views/account_move.xml
+31
-4
31 ajouts, 4 suppressions
views/account_move.xml
avec
40 ajouts
et
5 suppressions
models/account_move.py
+
9
−
1
Voir le fichier @
93eabb6f
...
@@ -17,7 +17,7 @@ class AccountMove(models.Model):
...
@@ -17,7 +17,7 @@ class AccountMove(models.Model):
# Fields declaration
# Fields declaration
# ------------------------------------------------------
# ------------------------------------------------------
is_fee
=
fields
.
Boolean
(
is_fee
=
fields
.
Boolean
(
string
=
"
R
edevance
"
,
string
=
"
Est une r
edevance
"
,
related
=
"
journal_id.is_fee
"
,
related
=
"
journal_id.is_fee
"
,
readonly
=
True
,
readonly
=
True
,
store
=
True
,
store
=
True
,
...
@@ -39,6 +39,7 @@ class AccountMove(models.Model):
...
@@ -39,6 +39,7 @@ class AccountMove(models.Model):
compute
=
"
_compute_fee_state
"
,
compute
=
"
_compute_fee_state
"
,
store
=
True
,
store
=
True
,
)
)
end_fee_reason
=
fields
.
Char
(
string
=
"
Raison du non renouvellement
"
)
# ------------------------------------------------------
# ------------------------------------------------------
# Computed fields / Search Fields
# Computed fields / Search Fields
...
@@ -77,6 +78,7 @@ class AccountMove(models.Model):
...
@@ -77,6 +78,7 @@ class AccountMove(models.Model):
"""
"""
Create new invoice with start and end fee dates
Create new invoice with start and end fee dates
"""
"""
self
.
ensure_one
()
new_start_fee
=
self
.
end_fee
+
relativedelta
(
days
=
1
)
new_start_fee
=
self
.
end_fee
+
relativedelta
(
days
=
1
)
new_end_fee
=
self
.
end_fee
+
relativedelta
(
years
=
1
)
new_end_fee
=
self
.
end_fee
+
relativedelta
(
years
=
1
)
next_fee_id
=
self
.
copy
(
next_fee_id
=
self
.
copy
(
...
@@ -98,6 +100,12 @@ class AccountMove(models.Model):
...
@@ -98,6 +100,12 @@ class AccountMove(models.Model):
"
target
"
:
"
current
"
,
"
target
"
:
"
current
"
,
}
}
def
action_not_renewed
(
self
):
self
.
ensure_one
()
if
self
.
next_fee_id
:
self
.
next_fee_id
.
unlink
()
self
.
fee_state
=
"
not_renewed
"
# ------------------------------------------------------
# ------------------------------------------------------
# Business methods
# Business methods
# ------------------------------------------------------
# ------------------------------------------------------
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
views/account_move.xml
+
31
−
4
Voir le fichier @
93eabb6f
...
@@ -42,16 +42,16 @@
...
@@ -42,16 +42,16 @@
<group>
<group>
<field
<field
name=
"is_fee"
name=
"is_fee"
attrs=
"{'readonly': [('
move_typ
e', '=', 'posted')]}"
attrs=
"{'readonly': [('
stat
e', '=', 'posted')]}"
groups=
"base.group_no_one"
groups=
"base.group_no_one"
/>
/>
<field
<field
name=
"start_fee"
name=
"start_fee"
attrs=
"{'invisible': [('is_fee', '=', False)], 'required': [('is_fee', '=', True)], 'readonly': [('
move_typ
e', '=', 'posted')]}"
attrs=
"{'invisible': [('is_fee', '=', False)], 'required': [('is_fee', '=', True)], 'readonly': [('
stat
e', '=', 'posted')]}"
/>
/>
<field
<field
name=
"end_fee"
name=
"end_fee"
attrs=
"{'invisible': [('is_fee', '=', False)], 'required': [('is_fee', '=', True)], 'readonly': [('
move_typ
e', '=', 'posted')]}"
attrs=
"{'invisible': [('is_fee', '=', False)], 'required': [('is_fee', '=', True)], 'readonly': [('
stat
e', '=', 'posted')]}"
/>
/>
</group>
</group>
<group>
<group>
...
@@ -64,6 +64,19 @@
...
@@ -64,6 +64,19 @@
name=
"fee_state"
name=
"fee_state"
attrs=
"{'invisible': [('state', '!=', 'posted')]}"
attrs=
"{'invisible': [('state', '!=', 'posted')]}"
/>
/>
<div
colspan=
"2"
>
<button
name=
"action_not_renewed"
type=
"object"
string=
"Non renouvellement"
attrs=
"{'invisible': [('fee_state', 'not in', ['to_renew', 'renewing'])]}"
confirm=
"Valider le non renouvellement de cette redevance ?"
/>
</div>
<field
name=
"end_fee_reason"
attrs=
"{'invisible': [('fee_state', '!=', 'not_renewed')]}"
/>
</group>
</group>
</group>
</group>
</xpath>
</xpath>
...
@@ -119,7 +132,21 @@
...
@@ -119,7 +132,21 @@
</record>
</record>
<!-- Pivot view -->
<!-- Pivot view -->
<record
id=
"afac_fee_account_invoice_view_pivot"
model=
"ir.ui.view"
>
<field
name=
"name"
>
account.invoice.pivot
</field>
<field
name=
"model"
>
account.move
</field>
<field
name=
"arch"
type=
"xml"
>
<pivot
string=
"Factures"
>
<field
name=
"is_fee"
type=
"col"
/>
<field
name=
"invoice_date"
type=
"row"
/>
<field
name=
"amount_total_signed"
type=
"measure"
/>
</pivot>
</field>
</record>
<!-- Action view -->
<!-- Action view : add pivot view -->
<record
id=
"account.action_move_out_invoice_type"
model=
"ir.actions.act_window"
>
<field
name=
"view_mode"
>
tree,kanban,pivot,form
</field>
</record>
</data>
</data>
</odoo>
</odoo>
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter