diff --git a/models/acc_operation.py b/models/acc_operation.py
index 9bd1e6ae710075d007000bfbe92ba6daf4592443..92c2217e3386636c99bfdfdf79c7325f5a5ac460 100644
--- a/models/acc_operation.py
+++ b/models/acc_operation.py
@@ -25,17 +25,20 @@ class AccOperation(models.Model):
"acc.price.conf",
"acc_operation_id",
domain=[("type", "=", "sale")],
- string="Liste des Prix de Vente")
+ string="Liste des Prix de Vente",
+ )
acc_buyer_price_conf_ids = fields.One2many(
"acc.price.conf",
"acc_operation_id",
domain=[("type", "=", "buyer")],
- string="Liste des Prix d'Achat")
+ string="Liste des Prix d'Achat",
+ )
acc_accise_price_conf_ids = fields.One2many(
"acc.price.conf",
"acc_operation_id",
domain=[("type", "=", "accise")],
- string="Liste des Tarifs ACCISE")
+ string="Liste des Tarifs ACCISE",
+ )
acc_sale_price_surplus_ids = fields.One2many(
"acc.sale.price.buyer", "acc_operation_id"
diff --git a/models/acc_price_conf.py b/models/acc_price_conf.py
index 7224be13f309f1aaa6edb1c366571a5ead4dd9e0..8441ace40e527d205cbf083ede0cac74cb9155d6 100644
--- a/models/acc_price_conf.py
+++ b/models/acc_price_conf.py
@@ -17,8 +17,7 @@ class AccPriceConf(models.Model):
# ------------------------------------------------------
# Fields declaration
# ------------------------------------------------------
- acc_operation_id = fields.Many2one(
- "acc.operation", "Opération", ondelete="cascade")
+ acc_operation_id = fields.Many2one("acc.operation", "Opération", ondelete="cascade")
acc_injection_id = fields.Many2one(
"acc.counter",
domain=[("is_injection", "=", True)],
@@ -45,11 +44,10 @@ class AccPriceConf(models.Model):
price = fields.Float("Tarif", digits="Sale Price")
power_delivery = fields.Float(related="acc_delivery_id.power_delivery", store=True)
zip = fields.Char(related="acc_delivery_id.zip", store=True)
- type = fields.Selection([
- ("sale", "Vente"),
- ("buyer", "Achat"),
- ("accise", "ACCISE")
- ], string="Type de prix")
+ type = fields.Selection(
+ [("sale", "Vente"), ("buyer", "Achat"), ("accise", "ACCISE")],
+ string="Type de prix",
+ )
@api.model_create_multi
def create(self, vals_list):
@@ -143,9 +141,7 @@ class AccPriceConf(models.Model):
message = "Un prix d'achat existe déjà pour cette date là"
else:
message = "Un tarif ACCISE existe déjà pour cette date là"
- raise ValidationError(
- _(message)
- )
+ raise ValidationError(_(message))
if type == "buyer":
price_id = self.env["acc.price.conf"].search(
diff --git a/views/acc_counter_views.xml b/views/acc_counter_views.xml
index 702e8bc3384ed06b46ef2ebed21cfed2d9f5c08d..064ceb40f751918167c657d2ab3fcb7e66cf483f 100644
--- a/views/acc_counter_views.xml
+++ b/views/acc_counter_views.xml
@@ -58,8 +58,14 @@
</div>
<group name="infos" position="after">
<group>
- <field name="sale_price" attrs="{'invisible': [('is_delivery', '!=', True)]}"/>
- <field name="price_accise" attrs="{'invisible': [('is_delivery', '!=', True)]}"/>
+ <field
+ name="sale_price"
+ attrs="{'invisible': [('is_delivery', '!=', True)]}"
+ />
+ <field
+ name="price_accise"
+ attrs="{'invisible': [('is_delivery', '!=', True)]}"
+ />
</group>
<notebook>
<page
diff --git a/views/acc_operation_views.xml b/views/acc_operation_views.xml
index e120dc7dad81253bd24ced7e0475d8beb368ee9a..e5a93f125c0a55fc2dca2232aa9cfa8e4b00fa67 100644
--- a/views/acc_operation_views.xml
+++ b/views/acc_operation_views.xml
@@ -61,8 +61,8 @@
<group>
<group>
<field name="is_account_active" widget="boolean_toggle" />
- <field name="sale_price"/>
- <field name="price_accise"/>
+ <field name="sale_price" />
+ <field name="price_accise" />
</group>
<group>
<field name="is_surplus_active" widget="boolean_toggle" />
diff --git a/views/menu_views.xml b/views/menu_views.xml
index 32c818bfaff5a5ddbb7dafd65f443a076a9e5c76..567839b9ee644a911ab80c451729f948adb436f0 100644
--- a/views/menu_views.xml
+++ b/views/menu_views.xml
@@ -17,22 +17,6 @@
action="acc_account.action_acc_account"
/>
-<!-- <menuitem-->
-<!-- id="acc_sale_price_menu"-->
-<!-- parent="menu_account"-->
-<!-- name="Prix de vente"-->
-<!-- sequence="20"-->
-<!-- action="acc_sale_price_act_window"-->
-<!-- />-->
-
-<!-- <menuitem-->
-<!-- id="acc_sale_price_buyer_menu"-->
-<!-- parent="menu_account"-->
-<!-- name="Prix de vente Acheteur"-->
-<!-- sequence="30"-->
-<!-- action="acc_sale_price_buyer_act_window"-->
-<!-- />-->
-
<menuitem
id="acc_sale_price_conf_menu"
parent="menu_account"
@@ -56,14 +40,6 @@
sequence="20"
action="acc_buyer_price_conf_act_window"
/>
-<!-- -->
-<!-- <menuitem-->
-<!-- id="acc_sale_price_buyer_menu"-->
-<!-- parent="menu_account"-->
-<!-- name="Prix de vente Acheteur"-->
-<!-- sequence="30"-->
-<!-- action="acc_sale_price_buyer_act_window"-->
-<!-- />-->
<menuitem
id="acc_acc_account_menu"
diff --git a/wizard/acc_price_conf_wizard.py b/wizard/acc_price_conf_wizard.py
index 1bb1c35ecc06411c7a0877ffeff920899eb86bc3..a94d9458d2ec83916c2d1a8c0af3275743e9121e 100644
--- a/wizard/acc_price_conf_wizard.py
+++ b/wizard/acc_price_conf_wizard.py
@@ -32,7 +32,7 @@ class AccPriceConfWizard(models.TransientModel):
"acc_buyer_id": inj.buyer_id.id,
"acc_injection_id": inj.id,
"acc_operation_id": self.env.context.get("active_id"),
- "type": type
+ "type": type,
},
)
for inj in inj_ids
@@ -60,7 +60,7 @@ class AccPriceConfWizard(models.TransientModel):
"acc_injection_id": inj.id,
"acc_operation_id": self.env.context.get("active_id"),
"type": type,
- "price": rec.sale_price if type == "sale" else rec.price_accise
+ "price": rec.sale_price if type == "sale" else rec.price_accise,
},
)
for rec in recs
@@ -68,20 +68,23 @@ class AccPriceConfWizard(models.TransientModel):
]
else:
# Objects selected from list view
- active_ids = self._context.get('active_ids')
+ active_ids = self._context.get("active_ids")
if active_ids:
return [
(
0,
0,
{
- "acc_delivery_id": self.env["acc.price.conf"].browse(
- rec).acc_delivery_id.id,
- "acc_injection_id": self.env["acc.price.conf"].browse(
- rec).acc_injection_id.id,
- "acc_operation_id": self.env["acc.price.conf"].browse(
- rec).acc_operation_id.id,
- "type": self.env["acc.price.conf"].browse(rec).type
+ "acc_delivery_id": self.env["acc.price.conf"]
+ .browse(rec)
+ .acc_delivery_id.id,
+ "acc_injection_id": self.env["acc.price.conf"]
+ .browse(rec)
+ .acc_injection_id.id,
+ "acc_operation_id": self.env["acc.price.conf"]
+ .browse(rec)
+ .acc_operation_id.id,
+ "type": self.env["acc.price.conf"].browse(rec).type,
},
)
for rec in active_ids
@@ -92,11 +95,10 @@ class AccPriceConfWizard(models.TransientModel):
)
start_date = fields.Date("Début de période", default=fields.Date.context_today)
acc_operation_id = fields.Many2one("acc.operation", default=_default_operation_id)
- type = fields.Selection([
- ("sale", "Vente"),
- ("buyer", "Achat"),
- ("accise", "ACCISE")
- ], default=_default_type)
+ type = fields.Selection(
+ [("sale", "Vente"), ("buyer", "Achat"), ("accise", "ACCISE")],
+ default=_default_type,
+ )
@api.onchange("start_date")
def _onchange_start_date(self):
diff --git a/wizard/acc_price_conf_wizard_views.xml b/wizard/acc_price_conf_wizard_views.xml
index 9f7ee28d751e1d2cca46c0079e6f8717ad3c3e22..3d655fe6bf09accedb8b74750acd09baa8de621b 100644
--- a/wizard/acc_price_conf_wizard_views.xml
+++ b/wizard/acc_price_conf_wizard_views.xml
@@ -10,7 +10,7 @@
<group>
<group>
<field name="start_date" />
- <field name="type" invisible="1"/>
+ <field name="type" invisible="1" />
</group>
</group>
<field
diff --git a/wizard/acc_update_price_conf_wizard.py b/wizard/acc_update_price_conf_wizard.py
index 3570cec1e5a41e786636be9f9690a07c4def6e67..56a3da1973443d13f5184d53b40461b2d3732f6f 100644
--- a/wizard/acc_update_price_conf_wizard.py
+++ b/wizard/acc_update_price_conf_wizard.py
@@ -9,6 +9,8 @@ class AccUpdatePriceConfWizard(models.TransientModel):
price = fields.Float("Tarif à mettre à jour", digits="Sale Price")
def update_price(self):
- acc_price_ids = self.env["acc.price.conf"].browse(self._context.get('active_ids'))
+ acc_price_ids = self.env["acc.price.conf"].browse(
+ self._context.get("active_ids")
+ )
for price in acc_price_ids:
price.price = self.price