From cd275b7f95591efa1ba934ec43d9f8ddc388ba31 Mon Sep 17 00:00:00 2001 From: Denis Leemann Date: Thu, 12 Jan 2017 18:39:30 +0100 Subject: [PATCH 01/49] base module & sales_team Add base for wizard wizard for manual procurements Update base computation update to OCA guidelines --- sale_manual_delivery/README.md | 55 ++++++++++++ sale_manual_delivery/__init__.py | 5 ++ sale_manual_delivery/__manifest__.py | 23 +++++ sale_manual_delivery/models/__init__.py | 8 ++ sale_manual_delivery/models/crm_team.py | 13 +++ sale_manual_delivery/models/procurement.py | 13 +++ sale_manual_delivery/models/sale_order.py | 17 ++++ .../models/sale_order_line.py | 50 +++++++++++ sale_manual_delivery/models/stock_move.py | 45 ++++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/icon.svg | 79 ++++++++++++++++++ sale_manual_delivery/views/crm_team_view.xml | 13 +++ .../views/sale_order_view.xml | 17 ++++ sale_manual_delivery/wizard/__init__.py | 5 ++ sale_manual_delivery/wizard/line.py | 36 ++++++++ sale_manual_delivery/wizard/manual_proc.py | 57 +++++++++++++ .../wizard/manual_proc_view.xml | 50 +++++++++++ 17 files changed, 486 insertions(+) create mode 100644 sale_manual_delivery/README.md create mode 100644 sale_manual_delivery/__init__.py create mode 100644 sale_manual_delivery/__manifest__.py create mode 100644 sale_manual_delivery/models/__init__.py create mode 100644 sale_manual_delivery/models/crm_team.py create mode 100644 sale_manual_delivery/models/procurement.py create mode 100644 sale_manual_delivery/models/sale_order.py create mode 100644 sale_manual_delivery/models/sale_order_line.py create mode 100644 sale_manual_delivery/models/stock_move.py create mode 100644 sale_manual_delivery/static/description/icon.png create mode 100644 sale_manual_delivery/static/description/icon.svg create mode 100644 sale_manual_delivery/views/crm_team_view.xml create mode 100644 sale_manual_delivery/views/sale_order_view.xml create mode 100644 sale_manual_delivery/wizard/__init__.py create mode 100644 sale_manual_delivery/wizard/line.py create mode 100644 sale_manual_delivery/wizard/manual_proc.py create mode 100644 sale_manual_delivery/wizard/manual_proc_view.xml diff --git a/sale_manual_delivery/README.md b/sale_manual_delivery/README.md new file mode 100644 index 00000000000..49f8541aef5 --- /dev/null +++ b/sale_manual_delivery/README.md @@ -0,0 +1,55 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +====================== +{Sale Manual Delivery} +====================== + +The goal of this module is to allow the manual creation of delivery slips. If activated, +a sale order won't direcly impact directly the stock. It will not make a reservation on the stock. +It allows the delivery and the impact on stock to be done manually when needed. +The goal is to be used on long term projects where not all the material is shipped at once. + + +Known issues / Roadmap +====================== +* Add Screenshots +* Add tests + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. + + +Credits +======= + +* Odoo Community Association: `Icon `_. + + +Contributors +------------ + +* Denis Leemann + + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/sale_manual_delivery/__init__.py b/sale_manual_delivery/__init__.py new file mode 100644 index 00000000000..2eb723313db --- /dev/null +++ b/sale_manual_delivery/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models +from . import wizard diff --git a/sale_manual_delivery/__manifest__.py b/sale_manual_delivery/__manifest__.py new file mode 100644 index 00000000000..d7397ad538a --- /dev/null +++ b/sale_manual_delivery/__manifest__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + 'name': 'Sale Manual Delivery', + 'category': 'Sale', + 'author': 'Camptocamp SA, Odoo Community Association (OCA)', + 'version': '10.0.1.0.0', + 'website': 'http://camptocamp.com', + 'summary': "Sale product set", + 'depends': [ + 'delivery', + 'sale', + 'sales_team', + ], + 'data': [ + 'views/crm_team_view.xml', + 'views/sale_order_view.xml', + 'wizard/manual_proc_view.xml', + ], + 'installable': True, + 'application': False, + 'auto_install': False, +} diff --git a/sale_manual_delivery/models/__init__.py b/sale_manual_delivery/models/__init__.py new file mode 100644 index 00000000000..ff03cefe71b --- /dev/null +++ b/sale_manual_delivery/models/__init__.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import crm_team +from . import procurement +from . import sale_order +from . import sale_order_line +from . import stock_move diff --git a/sale_manual_delivery/models/crm_team.py b/sale_manual_delivery/models/crm_team.py new file mode 100644 index 00000000000..7ebc2316f11 --- /dev/null +++ b/sale_manual_delivery/models/crm_team.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Denis Leemann, Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import fields, models + + +class CrmTeam(models.Model): + _inherit = 'crm.team' + + manual_procurement = fields.Boolean( + string='Manual Procurement', + default=False + ) diff --git a/sale_manual_delivery/models/procurement.py b/sale_manual_delivery/models/procurement.py new file mode 100644 index 00000000000..4ad2170cc31 --- /dev/null +++ b/sale_manual_delivery/models/procurement.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Denis Leemann, Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import models, fields + + +class ProcurementOrder(models.Model): + _inherit = 'procurement.order' + + carrier_id = fields.Many2one( + "delivery.carrier", + string="Delivery Method", + ) diff --git a/sale_manual_delivery/models/sale_order.py b/sale_manual_delivery/models/sale_order.py new file mode 100644 index 00000000000..f7da5608462 --- /dev/null +++ b/sale_manual_delivery/models/sale_order.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Denis Leemann, Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import fields, models, api + + +class SaleOrder(models.Model): + _inherit = 'sale.order' + + manual_procurement = fields.Boolean( + string='Manual Procurement', + default=False + ) + + @api.onchange('team_id') + def _onchange_team_id(self): + self.manual_procurement = False # "TODO copy sale team value" diff --git a/sale_manual_delivery/models/sale_order_line.py b/sale_manual_delivery/models/sale_order_line.py new file mode 100644 index 00000000000..546f5ed511c --- /dev/null +++ b/sale_manual_delivery/models/sale_order_line.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Denis Leemann, Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import models, api + + +class SaleOrderLine(models.Model): + _inherit = 'sale.order.line' + + @api.multi + def _action_procurement_create(self): + for line in self: + if (line.order_id.manual_procurement and + line.product_id.type != 'service'): + return self.env['procurement.order'].browse() + else: + return super(SaleOrderLine, self)._action_procurement_create() + + @api.multi + def _action_manual_procurement_create(self, product_qty, date_planned, + carrier): + + new_procs = self.env['procurement.order'] # Empty recordset + for line in self: + # if line.state != 'sale' or not + # line.product_id._need_procurement(): + # continue + qty = 0.0 + for proc in line.procurement_ids: + qty += proc.product_qty + + if not line.order_id.procurement_group_id: + vals = line.order_id._prepare_procurement_group() + line.order_id.procurement_group_id = self.env[ + "procurement.group"].create(vals) + + vals = line._prepare_order_line_procurement( + group_id=line.order_id.procurement_group_id.id) + vals['date_planned'] = date_planned # line added + vals['product_qty'] = product_qty # line added + vals['carrier_id'] = carrier.id # line added + new_proc = self.env["procurement.order"].create(vals) + new_proc.message_post_with_view('mail.message_origin_link', + values={'self': new_proc, + 'origin': line.order_id}, + subtype_id=self.env.ref( + 'mail.mt_note').id) + new_procs += new_proc + new_procs.run() + return new_procs diff --git a/sale_manual_delivery/models/stock_move.py b/sale_manual_delivery/models/stock_move.py new file mode 100644 index 00000000000..21180883e7e --- /dev/null +++ b/sale_manual_delivery/models/stock_move.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Denis Leemann, Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models, api + + +class StockMove(models.Model): + _inherit = "stock.move" + + def _get_new_picking_values(self): + res = super(StockMove, self)._get_new_picking_values() + if self.procurement_id.carrier_id: + res['carrier_id'] = self.procurement_id.carrier_id.id + res = super(StockMove, self)._get_new_picking_values() + return res + + # Below comment is from Odoo sources + # TDE DECORATOR: remove that api.multi when action_confirm is migrated + @api.multi + def assign_picking(self): + + Picking = self.env['stock.picking'] + self.recompute() + + for move in self: + picking = Picking.search([ + ('group_id', '=', move.group_id.id), + ('location_id', '=', move.location_id.id), + ('location_dest_id', '=', move.location_dest_id.id), + ('picking_type_id', '=', move.picking_type_id.id), + ('printed', '=', False), + ('state', 'in', ['draft', + 'confirmed', + 'waiting', + 'partially_available', + 'assigned'])], limit=1) + if not picking: + picking = Picking.create(move._get_new_picking_values()) + move.write({'picking_id': picking.id}) + return True + # return super(StockMove, self).assign_picking() + # ELSE return super + # +# move.procurement_id.sale_line_id.order_id.carrier_id diff --git a/sale_manual_delivery/static/description/icon.png b/sale_manual_delivery/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/sale_manual_delivery/static/description/icon.svg b/sale_manual_delivery/static/description/icon.svg new file mode 100644 index 00000000000..a7a26d0932a --- /dev/null +++ b/sale_manual_delivery/static/description/icon.svg @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/sale_manual_delivery/views/crm_team_view.xml b/sale_manual_delivery/views/crm_team_view.xml new file mode 100644 index 00000000000..be545d27d63 --- /dev/null +++ b/sale_manual_delivery/views/crm_team_view.xml @@ -0,0 +1,13 @@ + + + + crm.team.form + crm.team + + + + + + + + diff --git a/sale_manual_delivery/views/sale_order_view.xml b/sale_manual_delivery/views/sale_order_view.xml new file mode 100644 index 00000000000..46748a63bc3 --- /dev/null +++ b/sale_manual_delivery/views/sale_order_view.xml @@ -0,0 +1,17 @@ + + + + sale.order.form + sale.order + + + + + + + + + diff --git a/sale_manual_delivery/wizard/__init__.py b/sale_manual_delivery/wizard/__init__.py new file mode 100644 index 00000000000..d1cbe3fc5e4 --- /dev/null +++ b/sale_manual_delivery/wizard/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import manual_proc +from . import line diff --git a/sale_manual_delivery/wizard/line.py b/sale_manual_delivery/wizard/line.py new file mode 100644 index 00000000000..830643b721d --- /dev/null +++ b/sale_manual_delivery/wizard/line.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Denis Leemann, Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models, fields, api + + +class ManualLine(models.TransientModel): + _name = "manual.line" + + manual_proc_id = fields.Many2one( + 'manual.procurement', + string='Wizard manual procurement', + ) + order_line_id = fields.Many2one( + 'sale.order.line', + string='Sale Order Line', + ) + ordered_qty = fields.Float( + 'Ordered Quantity', + readonly=True, + ) + remaining = fields.Float( + 'Remaining', + compute='compute_remaining', + readonly=True, + ) + product_qty = fields.Float( + 'Quantity to Ship', + ) + + @api.multi + @api.depends('product_qty') + def compute_remaining(self): + for line in self: + line.remaining = line.ordered_qty - line.product_qty diff --git a/sale_manual_delivery/wizard/manual_proc.py b/sale_manual_delivery/wizard/manual_proc.py new file mode 100644 index 00000000000..3890d802faa --- /dev/null +++ b/sale_manual_delivery/wizard/manual_proc.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Denis Leemann, Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models, fields, api +from odoo.tools import float_compare + + +class ManualProcurement(models.TransientModel): + """Creates procurements manually""" + _name = "manual.procurement" + _order = 'create_date desc' + + def _set_order_id(self): + return self.env['sale.order'].browse(self._context['active_ids']) + + @api.onchange('order_id') + def onchange_order_id(self): + lines = [] + if self.order_id: + for line in self.order_id.order_line: + + vals = { + 'order_line_id': line.id, + 'ordered_qty': line.product_uom_qty + } + lines.append((0, 0, vals)) + self.update({'line_ids': lines}) + + date_planned = fields.Date( + string='Date Planned' + ) + order_id = fields.Many2one( + 'sale.order', + string='Sale Order', # TODO HIDE + default=_set_order_id + ) + line_ids = fields.One2many( + 'manual.line', + 'manual_proc_id', + string='Lines to validate', + ) + carrier_id = fields.Many2one( + 'delivery.carrier', + string='Delivery Method', + ) + + @api.multi + def record_picking(self): + for wizard in self: + carrier_id = wizard.carrier_id + date_planned = wizard.date_planned + for line in wizard.line_ids: + if float_compare(line.product_qty, 0, 2): + product_qty = line.product_qty + so_line = line.order_line_id._action_manual_procurement_create( + product_qty, date_planned, carrier_id) diff --git a/sale_manual_delivery/wizard/manual_proc_view.xml b/sale_manual_delivery/wizard/manual_proc_view.xml new file mode 100644 index 00000000000..f8e75ba5622 --- /dev/null +++ b/sale_manual_delivery/wizard/manual_proc_view.xml @@ -0,0 +1,50 @@ + + + + + + manual.procurement + + +
+ + + + + + + + + + + + + + +
+
+
+ + + + + + + + + Manual Procurement + client_action_multi + + action + sale.order + + + From 09a0d577bfc034fff088582edf6b20eabb92cf2f Mon Sep 17 00:00:00 2001 From: jcoux Date: Tue, 14 Feb 2017 16:24:10 +0100 Subject: [PATCH 02/49] Add action_manual_procurement_wizard Add action_manual_procurement_wizard in view --- sale_manual_delivery/models/sale_order.py | 13 +++++++++++++ sale_manual_delivery/views/sale_order_view.xml | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/sale_manual_delivery/models/sale_order.py b/sale_manual_delivery/models/sale_order.py index f7da5608462..4530de2b60b 100644 --- a/sale_manual_delivery/models/sale_order.py +++ b/sale_manual_delivery/models/sale_order.py @@ -15,3 +15,16 @@ class SaleOrder(models.Model): @api.onchange('team_id') def _onchange_team_id(self): self.manual_procurement = False # "TODO copy sale team value" + + @api.multi + def action_manual_procurement_wizard(self): + self.ensure_one() + wizard = self.env['manual.procurement'].create({ + 'order_id': self.id, + }) + wizard.onchange_order_id() + action = self.env.ref( + 'sale_manual_delivery.action_wizard_manual_procurement' + ).read()[0] + action['res_id'] = wizard.id + return action diff --git a/sale_manual_delivery/views/sale_order_view.xml b/sale_manual_delivery/views/sale_order_view.xml index 46748a63bc3..cbcf8193fd9 100644 --- a/sale_manual_delivery/views/sale_order_view.xml +++ b/sale_manual_delivery/views/sale_order_view.xml @@ -5,10 +5,10 @@ sale.order - + + + + + +