diff --git a/sale_recovery_moment/ROADMAP.rst b/sale_recovery_moment/ROADMAP.rst deleted file mode 100644 index ebed2e1f..00000000 --- a/sale_recovery_moment/ROADMAP.rst +++ /dev/null @@ -1 +0,0 @@ -This module displays some totals of Sale Orders; This amount will be wrong in a multicurrencies context for the instance. diff --git a/sale_recovery_moment/__manifest__.py b/sale_recovery_moment/__manifest__.py index 4bba122d..fa710a83 100644 --- a/sale_recovery_moment/__manifest__.py +++ b/sale_recovery_moment/__manifest__.py @@ -11,7 +11,9 @@ "website": "https://github.com/grap/grap-odoo-business", "license": "AGPL-3", "depends": [ + # Odoo "sale_stock", + # OCA "stock_picking_report_summary", ], "data": [ diff --git a/sale_recovery_moment/models/sale_recovery_moment.py b/sale_recovery_moment/models/sale_recovery_moment.py index 5527df72..6147fa2c 100644 --- a/sale_recovery_moment/models/sale_recovery_moment.py +++ b/sale_recovery_moment/models/sale_recovery_moment.py @@ -24,14 +24,9 @@ class SaleRecoveryMoment(models.Model): ] # Columns Section - code = fields.Char( - string="Code", - readonly=True, - required=True, - default="/", - ) + code = fields.Char(readonly=True, required=True, default="/") - name = fields.Char(string="Name", compute="_compute_name", store=True) + name = fields.Char(compute="_compute_name", store=True) place_id = fields.Many2one( comodel_name="sale.recovery.place", string="Place", required=True @@ -59,15 +54,11 @@ class SaleRecoveryMoment(models.Model): ) min_sale_date = fields.Datetime( - string="Minimum date for the Sale", - compute="_compute_sale_date", - store=True, + string="Minimum date for the Sale", compute="_compute_sale_date", store=True ) max_sale_date = fields.Datetime( - string="Maximum date for the Sale", - compute="_compute_sale_date", - store=True, + string="Maximum date for the Sale", compute="_compute_sale_date", store=True ) min_recovery_date = fields.Datetime( @@ -78,77 +69,54 @@ class SaleRecoveryMoment(models.Model): string="Maximum date for the Recovery", required=True ) - description = fields.Text(string="Description") + description = fields.Text() - max_order_qty = fields.Integer("Max Order Quantity") + max_order_qty = fields.Integer(string="Max Order Quantity") order_ids = fields.One2many( + string="Sale Orders", comodel_name="sale.order", inverse_name="recovery_moment_id", - string="Sale Orders", readonly=True, ) order_qty = fields.Integer( - compute="_compute_order_multi", - multi="order", - store=True, - string="Sale Orders Quantity", + string="Sale Orders Quantity", compute="_compute_order_multi", store=True ) valid_order_qty = fields.Integer( - compute="_compute_order_multi", - multi="order", - store=True, - string="Valid Sale Orders Quantity", + string="Valid Sale Orders Quantity", compute="_compute_order_multi", store=True ) - is_complete = fields.Boolean( - compute="_compute_order_multi", - multi="order", - store=True, - string="Is Complete", - ) + is_complete = fields.Boolean(compute="_compute_order_multi", store=True) - quota_description = fields.Char( - compute="_compute_order_multi", - multi="order", - store=True, - string="Quota Description", - ) + quota_description = fields.Char(compute="_compute_order_multi", store=True) picking_ids = fields.One2many( + string="Delivery Orders", comodel_name="stock.picking", inverse_name="recovery_moment_id", - string="Delivery Orders", readonly=True, ) picking_qty = fields.Integer( - compute="_compute_picking_multi", - multi="picking", - store=True, - string="Delivery Orders Quantity", + string="Delivery Orders Quantity", compute="_compute_picking_multi", store=True ) valid_picking_qty = fields.Integer( + string="Valid Delivery Orders Quantity", compute="_compute_picking_multi", - multi="picking", store=True, - string="Valid Delivery Orders Quantity", ) state = fields.Selection( - compute="_compute_state", - string="State", - search="_search_state", - selection=_STATE_SELECTION, + compute="_compute_state", search="_search_state", selection=_STATE_SELECTION ) # Defaults Section @api.model def _default_company_id(self): - return self.env.user.company_id + return self.env.company # Overload Section @api.model_create_multi diff --git a/sale_recovery_moment/models/sale_recovery_moment_group.py b/sale_recovery_moment/models/sale_recovery_moment_group.py index 5e2c9e5a..b776f622 100644 --- a/sale_recovery_moment/models/sale_recovery_moment_group.py +++ b/sale_recovery_moment/models/sale_recovery_moment_group.py @@ -9,7 +9,6 @@ from odoo.exceptions import Warning as UserError - class SaleRecoveryMomentGroup(models.Model): _name = "sale.recovery.moment.group" _description = "Recovery Groups" @@ -37,14 +36,12 @@ class SaleRecoveryMomentGroup(models.Model): min_recovery_date = fields.Datetime( compute="_compute_recovery_date", - multi="recovery_date", string="Minimum date for the Recovery", store=True, ) max_recovery_date = fields.Datetime( compute="_compute_recovery_date", - multi="recovery_date", string="Maximum date for the Recovery", store=True, ) @@ -64,35 +61,30 @@ class SaleRecoveryMomentGroup(models.Model): order_qty = fields.Integer( compute="_compute_order_multi", - multi="order", store=True, string="Sale Orders Quantity", ) valid_order_qty = fields.Integer( compute="_compute_order_multi", - multi="order", store=True, string="Valid Sale Orders Quantity", ) picking_qty = fields.Integer( compute="_compute_picking_multi", - multi="picking", store=True, string="Delivery Orders Quantity", ) valid_picking_qty = fields.Integer( compute="_compute_picking_multi", - multi="picking", store=True, string="Valid Delivery Orders Quantity", ) excl_total = fields.Float( compute="_compute_total_multi", - multi="total", store=True, digits="Account", string="Total (VAT Excluded)", @@ -100,7 +92,6 @@ class SaleRecoveryMomentGroup(models.Model): incl_total = fields.Float( compute="_compute_total_multi", - multi="total", store=True, digits="Account", string="Total (VAT Included)", @@ -116,7 +107,7 @@ class SaleRecoveryMomentGroup(models.Model): # Defaults Section @api.model def _default_company_id(self): - return self.env.user.company_id.id + return self.env.company # Overload Section @api.model_create_multi diff --git a/sale_recovery_moment/models/sale_recovery_place.py b/sale_recovery_moment/models/sale_recovery_place.py index 2a53a87d..df683441 100644 --- a/sale_recovery_moment/models/sale_recovery_place.py +++ b/sale_recovery_moment/models/sale_recovery_place.py @@ -12,7 +12,7 @@ class SaleRecoveryPlace(models.Model): @api.model def _default_company_id(self): - return self.env.user.company_id.id + return self.env.company # Columns Section name = fields.Char("Name", required=True) diff --git a/sale_recovery_moment/models/stock_picking.py b/sale_recovery_moment/models/stock_picking.py index 2c8163c0..db30d074 100644 --- a/sale_recovery_moment/models/stock_picking.py +++ b/sale_recovery_moment/models/stock_picking.py @@ -2,7 +2,7 @@ # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import _, api, fields, models +from odoo import _, fields, models class StockPicking(models.Model): diff --git a/sale_recovery_moment/readme/ROADMAP.rst b/sale_recovery_moment/readme/ROADMAP.rst index c284275b..f1497387 100644 --- a/sale_recovery_moment/readme/ROADMAP.rst +++ b/sale_recovery_moment/readme/ROADMAP.rst @@ -1,2 +1,2 @@ -Could be great to make this module working with the `` delivery_dropoff_site`` -``delivery-carrier`` OCA module. +* This module displays some totals of Sale Orders; This amount will be wrong in a multicurrencies context for the instance. +* Could be great to make this module working with the `` delivery_dropoff_site`` / ``delivery-carrier`` OCA module.