diff --git a/hr_payroll_rate/__init__.py b/hr_payroll_rate/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/hr_payroll_rate/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/hr_payroll_rate/__manifest__.py b/hr_payroll_rate/__manifest__.py new file mode 100755 index 00000000..83fc44aa --- /dev/null +++ b/hr_payroll_rate/__manifest__.py @@ -0,0 +1,16 @@ +{ + 'name': 'Payroll Rates', + 'description': 'Payroll Rates', + 'version': '12.0.1.0.1', + 'website': 'https://hibou.io/', + 'author': 'Hibou Corp. ', + 'license': 'AGPL-3', + 'category': 'Human Resources', + 'data': [ + 'security/ir.model.access.csv', + 'views/payroll_views.xml', + ], + 'depends': [ + 'hr_payroll', + ], +} diff --git a/hr_payroll_rate/models/__init__.py b/hr_payroll_rate/models/__init__.py new file mode 100644 index 00000000..2fc9ea9f --- /dev/null +++ b/hr_payroll_rate/models/__init__.py @@ -0,0 +1 @@ +from . import payroll diff --git a/hr_payroll_rate/models/payroll.py b/hr_payroll_rate/models/payroll.py new file mode 100644 index 00000000..66a89963 --- /dev/null +++ b/hr_payroll_rate/models/payroll.py @@ -0,0 +1,37 @@ +from odoo import api, fields, models + + +class PayrollRate(models.Model): + _name = 'hr.payroll.rate' + _description = 'Payroll Rate' + + active = fields.Boolean(string='Active', default=True) + name = fields.Char(string='Name') + date_from = fields.Date(string='Date From', required=True) + date_to = fields.Date(string='Date To') + company_id = fields.Many2one('res.company', string='Company', copy=False, + default=False) + rate = fields.Float(string='Rate', digits=(12, 6), required=True) + code = fields.Char(string='Code', required=True) + + limit_payslip = fields.Float(string='Payslip Limit') + limit_year = fields.Float(string='Year Limit') + wage_limit_payslip = fields.Float(string='Payslip Wage Limit') + wage_limit_year = fields.Float(string='Year Wage Limit') + + +class Payslip(models.Model): + _inherit = 'hr.payslip' + + def _get_rate_domain(self, code): + return [ + '|', ('date_to', '=', False), ('date_to', '>=', self.date_to), + '|', ('company_id', '=', False), ('company_id', '=', self.company_id.id), + ('code', '=', code), + ('date_from', '<=', self.date_from), + ] + + def get_rate(self, code): + self.ensure_one() + return self.env['hr.payroll.rate'].search( + self._get_rate_domain(code), limit=1, order='date_from DESC, company_id ASC') diff --git a/hr_payroll_rate/security/ir.model.access.csv b/hr_payroll_rate/security/ir.model.access.csv new file mode 100644 index 00000000..95825fe5 --- /dev/null +++ b/hr_payroll_rate/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_hr_payroll_rate,access_hr_payroll_rate,model_hr_payroll_rate,hr_payroll.group_hr_payroll_manager,1,1,1,1 \ No newline at end of file diff --git a/hr_payroll_rate/tests/__init__.py b/hr_payroll_rate/tests/__init__.py new file mode 100755 index 00000000..817a9058 --- /dev/null +++ b/hr_payroll_rate/tests/__init__.py @@ -0,0 +1 @@ +from . import test_payroll_rate diff --git a/hr_payroll_rate/tests/test_payroll_rate.py b/hr_payroll_rate/tests/test_payroll_rate.py new file mode 100644 index 00000000..c86fe446 --- /dev/null +++ b/hr_payroll_rate/tests/test_payroll_rate.py @@ -0,0 +1,101 @@ +from odoo.tests import common +from odoo import fields + + +class TestPayrollRate(common.TransactionCase): + + def setUp(self): + super(TestPayrollRate, self).setUp() + self.employee = self.env['hr.employee'].create({ + 'birthday': '1985-03-14', + 'country_id': self.ref('base.us'), + 'department_id': self.ref('hr.dep_rd'), + 'gender': 'male', + 'name': 'Jared' + }) + self.contract = self.env['hr.contract'].create({ + 'name': 'test', + 'employee_id': self.employee.id, + 'type_id': self.ref('hr_contract.hr_contract_type_emp'), + 'struct_id': self.ref('hr_payroll.structure_base'), + 'resource_calendar_id': self.ref('resource.resource_calendar_std'), + 'wage': 21.50, + 'date_start': '2018-01-01', + 'state': 'open', + 'schedule_pay': 'monthly', + }) + self.payslip = self.env['hr.payslip'].create({ + 'employee_id': self.employee.id, + }) + self.company_other = self.env['res.company'].create({ + 'name': 'Other' + }) + + def test_payroll_rate_basic(self): + rate = self.payslip.get_rate('TEST') + self.assertFalse(rate) + test_rate = self.env['hr.payroll.rate'].create({ + 'name': 'Test Rate', + 'code': 'TEST', + 'rate': 1.65, + 'date_from': '2018-01-01', + }) + + rate = self.payslip.get_rate('TEST') + self.assertEqual(rate, test_rate) + + def test_payroll_rate_multicompany(self): + test_rate_other = self.env['hr.payroll.rate'].create({ + 'name': 'Test Rate', + 'code': 'TEST', + 'rate': 1.65, + 'date_from': '2018-01-01', + 'company_id': self.company_other.id, + }) + rate = self.payslip.get_rate('TEST') + self.assertFalse(rate) + test_rate = self.env['hr.payroll.rate'].create({ + 'name': 'Test Rate', + 'code': 'TEST', + 'rate': 1.65, + 'date_from': '2018-01-01', + }) + + rate = self.payslip.get_rate('TEST') + self.assertEqual(rate, test_rate) + + test_rate_more_specific = self.env['hr.payroll.rate'].create({ + 'name': 'Test Rate Specific', + 'code': 'TEST', + 'rate': 1.65, + 'date_from': '2018-01-01', + 'company_id': self.payslip.company_id.id, + }) + rate = self.payslip.get_rate('TEST') + self.assertEqual(rate, test_rate_more_specific) + + def test_payroll_rate_newer(self): + test_rate_old = self.env['hr.payroll.rate'].create({ + 'name': 'Test Rate', + 'code': 'TEST', + 'rate': 1.65, + 'date_from': '2018-01-01', + }) + test_rate = self.env['hr.payroll.rate'].create({ + 'name': 'Test Rate', + 'code': 'TEST', + 'rate': 2.65, + 'date_from': '2019-01-01', + }) + + rate = self.payslip.get_rate('TEST') + self.assertEqual(rate, test_rate) + + def test_payroll_rate_precision(self): + test_rate = self.env['hr.payroll.rate'].create({ + 'name': 'Test Rate', + 'code': 'TEST', + 'rate': 2.65001, + 'date_from': '2019-01-01', + }) + self.assertEqual(round(test_rate.rate * 100000), 265001.0) diff --git a/hr_payroll_rate/views/payroll_views.xml b/hr_payroll_rate/views/payroll_views.xml new file mode 100644 index 00000000..4132846e --- /dev/null +++ b/hr_payroll_rate/views/payroll_views.xml @@ -0,0 +1,74 @@ + + + + hr.payroll.rate.tree + hr.payroll.rate + + + + + + + + + + + + + + hr.payroll.rate.form + hr.payroll.rate + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + hr.payroll.rate.search + hr.payroll.rate + + + + + + + + + + Payroll Rates + hr.payroll.rate + form + tree,form + +

+ No rates +

+ + + + + \ No newline at end of file diff --git a/purchase_by_sale_history/__init__.py b/purchase_by_sale_history/__init__.py new file mode 100755 index 00000000..40272379 --- /dev/null +++ b/purchase_by_sale_history/__init__.py @@ -0,0 +1 @@ +from . import wizard diff --git a/purchase_by_sale_history/__manifest__.py b/purchase_by_sale_history/__manifest__.py new file mode 100755 index 00000000..482c45bb --- /dev/null +++ b/purchase_by_sale_history/__manifest__.py @@ -0,0 +1,21 @@ +{ + 'name': 'Purchase by Sale History', + 'author': 'Hibou Corp. ', + 'version': '12.0.1.0.0', + 'category': 'Purchases', + 'sequence': 95, + 'summary': 'Fill Purchase Orders by Sales History', + 'description': """ +Adds wizard to Purchase Orders that will fill the purchase order with products based on sales history. + """, + 'website': 'https://hibou.io/', + 'depends': [ + 'sale_stock', + 'purchase', + ], + 'data': [ + 'wizard/purchase_by_sale_history_views.xml', + ], + 'installable': True, + 'application': False, +} diff --git a/purchase_by_sale_history/tests/__init__.py b/purchase_by_sale_history/tests/__init__.py new file mode 100644 index 00000000..6cc4addf --- /dev/null +++ b/purchase_by_sale_history/tests/__init__.py @@ -0,0 +1 @@ +from . import test_purchase_by_sale_history diff --git a/purchase_by_sale_history/tests/test_purchase_by_sale_history.py b/purchase_by_sale_history/tests/test_purchase_by_sale_history.py new file mode 100644 index 00000000..8640929c --- /dev/null +++ b/purchase_by_sale_history/tests/test_purchase_by_sale_history.py @@ -0,0 +1,180 @@ +from odoo import fields +from odoo.tests import common +from datetime import datetime, timedelta + + +class TestPurchaseBySaleHistory(common.TransactionCase): + + def test_00_wizard(self): + wh1 = self.env.ref('stock.warehouse0') + wh2 = self.env['stock.warehouse'].create({ + 'name': 'WH2', + 'code': 'twh2', + }) + + sale_partner = self.env.ref('base.res_partner_2') + purchase_partner = self.env['res.partner'].create({ + 'name': 'Purchase Partner', + }) + + product11 = self.env['product.product'].create({ + 'name': 'Product 1', + 'type': 'product', + }) + product12 = self.env['product.product'].create({ + 'name': 'Product 1.1', + 'type': 'product', + 'product_tmpl_id': product11.product_tmpl_id.id, + }) + product2 = self.env['product.product'].create({ + 'name': 'Product 2', + 'type': 'product', + }) + + po1 = self.env['purchase.order'].create({ + 'partner_id': purchase_partner.id, + }) + + # Create initial wizard, it won't apply to any products because the PO is empty, and the vendor + # doesn't supply any products yet. + wiz = self.env['purchase.sale.history.make'].create({ + 'purchase_id': po1.id, + }) + + self.assertEqual(wiz.product_count, 0.0, 'There shouldn\'t be any products for this vendor yet.') + + # Assign vendor to products created earlier. + self.env['product.supplierinfo'].create({ + 'name': purchase_partner.id, + 'product_tmpl_id': product11.product_tmpl_id.id, + 'product_id': product11.id, + }) + self.env['product.supplierinfo'].create({ + 'name': purchase_partner.id, + 'product_tmpl_id': product2.product_tmpl_id.id, + }) + # New wizard picks up the correct number of products supplied by this vendor. + wiz = self.env['purchase.sale.history.make'].create({ + 'purchase_id': po1.id, + }) + self.assertEqual(wiz.product_count, 2) + + # Make some sales history... + sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=30)) + self.env['sale.order'].create({ + 'partner_id': sale_partner.id, + 'date_order': sale_date, + 'confirmation_date': sale_date, + 'picking_policy': 'direct', + 'order_line': [ + (0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}), + (0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}), + (0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}), + ], + }).action_confirm() + + days = 60 + history_start = fields.Date.to_string(datetime.now() - timedelta(days=days)) + history_end = fields.Date.today() + wiz.write({ + 'history_start': history_start, + 'history_end': history_end, + 'procure_days': days, + 'history_warehouse_ids': [(4, wh1.id, None)], + }) + self.assertEqual(wiz.history_days, days) + wiz.action_confirm() + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 3.0 + 3.0) # 3 from Sales History, 3 from Demand (from the sale) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 3.0 + 3.0) + + # Make additional sales history... + sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=15)) + self.env['sale.order'].create({ + 'partner_id': sale_partner.id, + 'date_order': sale_date, + 'confirmation_date': sale_date, + 'picking_policy': 'direct', + 'order_line': [ + (0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}), + (0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}), + (0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}), + ], + }).action_confirm() + + wiz.action_confirm() + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 6.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 6.0 + 6.0) + + # Make additional sales history in other warehouse + sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=15)) + self.env['sale.order'].create({ + 'partner_id': sale_partner.id, + 'date_order': sale_date, + 'confirmation_date': sale_date, + 'picking_policy': 'direct', + 'warehouse_id': wh2.id, + 'order_line': [ + (0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}), + (0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}), + (0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}), + ], + }).action_confirm() + + wiz.action_confirm() + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 6.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 6.0 + 6.0) + + # Make additional sales history that should NOT be counted... + sale_date = fields.Datetime.to_string(datetime.now() - timedelta(days=61)) + self.env['sale.order'].create({ + 'partner_id': sale_partner.id, + 'date_order': sale_date, + 'confirmation_date': sale_date, + 'picking_policy': 'direct', + 'order_line': [ + (0, 0, {'product_id': product11.id, 'product_uom_qty': 3.0}), + (0, 0, {'product_id': product12.id, 'product_uom_qty': 3.0}), + (0, 0, {'product_id': product2.id, 'product_uom_qty': 3.0}), + ], + }).action_confirm() + + wiz.action_confirm() + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 9.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 6.0 + 9.0) + + # Test that the wizard will only use the existing PO line products now that we have lines. + po1.order_line.filtered(lambda l: l.product_id == product2).unlink() + wiz.action_confirm() + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 6.0 + 9.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 0.0) + + # Plan for 1/2 the days of inventory + wiz.procure_days = days / 2.0 + wiz.action_confirm() + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 3.0 + 9.0) + + # Cause Inventory on existing product to make sure we don't order it. + adjust_product11 = self.env['stock.inventory'].create({ + 'name': 'Product11', + 'location_id': wh1.lot_stock_id.id, + 'product_id': product11.id, + 'filter': 'product', + }) + adjust_product11.action_start() + adjust_product11.line_ids.create({ + 'inventory_id': adjust_product11.id, + 'product_id': product11.id, + 'product_qty': 100.0, + 'location_id': wh1.lot_stock_id.id, + }) + adjust_product11.action_validate() + + wiz.action_confirm() + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product11).product_qty, 0.0) # Because we have so much in stock now. + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product12).product_qty, 0.0) + self.assertEqual(po1.order_line.filtered(lambda l: l.product_id == product2).product_qty, 0.0) diff --git a/purchase_by_sale_history/wizard/__init__.py b/purchase_by_sale_history/wizard/__init__.py new file mode 100644 index 00000000..bbdff949 --- /dev/null +++ b/purchase_by_sale_history/wizard/__init__.py @@ -0,0 +1 @@ +from . import purchase_by_sale_history diff --git a/purchase_by_sale_history/wizard/purchase_by_sale_history.py b/purchase_by_sale_history/wizard/purchase_by_sale_history.py new file mode 100644 index 00000000..2e9c91ae --- /dev/null +++ b/purchase_by_sale_history/wizard/purchase_by_sale_history.py @@ -0,0 +1,135 @@ +from odoo import api, fields, models +from math import ceil +from datetime import timedelta + + +class PurchaseBySaleHistory(models.TransientModel): + _name = 'purchase.sale.history.make' + + purchase_id = fields.Many2one('purchase.order', string='Purchase Order') + history_start = fields.Date(string='Sales History Start', default=lambda o: fields.Date.from_string(fields.Date.today()) - timedelta(days=30)) + history_end = fields.Date(string='Sales History End', default=fields.Date.today) + history_days = fields.Integer(string='Sales History Days', compute='_compute_history_days') + procure_days = fields.Integer(string='Days to Procure', + default=30, + help='History will be computed as an average per day, ' + 'and then multiplied by the days you wish to procure for.') + product_count = fields.Integer(string='Product Count', compute='_compute_product_count', + help='Products on the PO or that the Vendor provides.') + history_warehouse_ids = fields.Many2many('stock.warehouse', string='Warehouses', + help='Sales are calculated by these warehouses. ' + 'Current Inventory is summed from these warehouses. ' + 'If it is left blank then all warehouses and inventory ' + 'will be considered.') + + @api.multi + @api.depends('history_start', 'history_end') + def _compute_history_days(self): + for wiz in self: + if not all((wiz.history_end, wiz.history_start)): + wiz.history_days = 0 + else: + delta = fields.Date.from_string(wiz.history_end) - fields.Date.from_string(wiz.history_start) + wiz.history_days = delta.days + + @api.multi + @api.depends('purchase_id', 'purchase_id.order_line', 'purchase_id.partner_id') + def _compute_product_count(self): + for wiz in self: + if wiz.purchase_id.order_line: + wiz.product_count = len(set(wiz.purchase_id.order_line.mapped('product_id.id'))) + elif wiz.purchase_id.partner_id: + self.env.cr.execute("""SELECT COUNT(DISTINCT(psi.product_id)) + COUNT(DISTINCT(p.id)) + FROM product_supplierinfo psi + LEFT JOIN product_product p ON p.product_tmpl_id = psi.product_tmpl_id AND psi.product_id IS NULL + WHERE psi.name = %d;""" + % (wiz.purchase_id.partner_id.id, )) + wiz.product_count = self.env.cr.fetchall()[0][0] + + def _history_product_ids(self): + if self.purchase_id.order_line: + return self.purchase_id.order_line.mapped('product_id.id') + + self.env.cr.execute("""SELECT DISTINCT(COALESCE(psi.product_id, p.id)) + FROM product_supplierinfo psi + LEFT JOIN product_product p ON p.product_tmpl_id = psi.product_tmpl_id AND psi.product_id IS NULL + WHERE psi.name = %d;""" + % (self.purchase_id.partner_id.id, )) + rows = self.env.cr.fetchall() + return [r[0] for r in rows if r[0]] + + def _sale_history(self, product_ids): + p_ids = tuple(product_ids) + if self.history_warehouse_ids: + wh_ids = tuple(self.history_warehouse_ids.ids) + self.env.cr.execute("""SELECT product_id, sum(product_uom_qty) + FROM sale_report + WHERE date BETWEEN %s AND %s AND product_id IN %s AND warehouse_id IN %s + GROUP BY 1""", + (self.history_start, self.history_end, p_ids, wh_ids)) + else: + self.env.cr.execute("""SELECT product_id, sum(product_uom_qty) + FROM sale_report + WHERE date BETWEEN %s AND %s AND product_id IN %s + GROUP BY 1""", + (self.history_start, self.history_end, p_ids)) + return self.env.cr.fetchall() + + def _apply_history_product(self, product, history): + qty = ceil(history['sold_qty'] * self.procure_days / self.history_days) + history['buy_qty'] = max((0.0, qty - product.virtual_available)) + + def _apply_history(self, history, product_ids): + line_model = self.env['purchase.order.line'] + updated_lines = line_model.browse() + + # Collect stock to consider against the sales demand. + product_model = self.env['product.product'] + if self.history_warehouse_ids: + product_model = self.env['product.product']\ + .with_context({'location': [wh.lot_stock_id.id for wh in self.history_warehouse_ids]}) + products = product_model.browse(product_ids) + + #product_available_stock = {p.id: p.virtual_available for p in products} + history_dict = {pid: {'sold_qty': sold_qty} for pid, sold_qty in history} + for p in products: + if p.id not in history_dict: + history_dict[p.id] = {'sold_qty': 0.0} + self._apply_history_product(p, history_dict[p.id]) + + for pid, history in history_dict.items(): + # TODO: Should convert from Sale UOM to Purchase UOM + qty = history.get('buy_qty', 0.0) + + # Find line that already exists on PO + line = self.purchase_id.order_line.filtered(lambda l: l.product_id.id == pid) + if line: + line.write({'product_qty': qty}) + line._onchange_quantity() + else: + # Create new PO line + line = line_model.new({ + 'order_id': self.purchase_id.id, + 'product_id': pid, + 'product_qty': qty, + }) + line.onchange_product_id() + line_vals = line._convert_to_write(line._cache) + line_vals['product_qty'] = qty + line = line_model.create(line_vals) + updated_lines += line + + # Lines not touched should now not be ordered. + other_lines = self.purchase_id.order_line - updated_lines + other_lines.write({'product_qty': 0.0}) + for line in other_lines: + line._onchange_quantity() + + @api.multi + def action_confirm(self): + self.ensure_one() + history_product_ids = self._history_product_ids() + history = self._sale_history(history_product_ids) + self._apply_history(history, history_product_ids) + + diff --git a/purchase_by_sale_history/wizard/purchase_by_sale_history_views.xml b/purchase_by_sale_history/wizard/purchase_by_sale_history_views.xml new file mode 100644 index 00000000..41b2b3b3 --- /dev/null +++ b/purchase_by_sale_history/wizard/purchase_by_sale_history_views.xml @@ -0,0 +1,53 @@ + + + + purchase.sale.history.make.form + purchase.sale.history.make + +
+ + + + + + + + + + + + + + + + +
+
+
+ + + + + Fill PO From Sales History + purchase.sale.history.make + form + form + + new + {'default_purchase_id': active_id} + + + + + purchase.order.form.inherit + purchase.order + + + +