diff --git a/employee_purchase_requisition/README.rst b/employee_purchase_requisition/README.rst old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/__init__.py b/employee_purchase_requisition/__init__.py old mode 100644 new mode 100755 index 22ac9fbe1..4566510af --- a/employee_purchase_requisition/__init__.py +++ b/employee_purchase_requisition/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +# Part of Odoo. See LICENSE file for full copyright and licensing details. ############################################################################# # # Cybrosys Technologies Pvt. Ltd. diff --git a/employee_purchase_requisition/__manifest__.py b/employee_purchase_requisition/__manifest__.py old mode 100644 new mode 100755 index 1662de034..9b1d98a9a --- a/employee_purchase_requisition/__manifest__.py +++ b/employee_purchase_requisition/__manifest__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +# Part of Odoo. See LICENSE file for full copyright and licensing details. ############################################################################# # # Cybrosys Technologies Pvt. Ltd. @@ -23,7 +23,7 @@ { 'name': 'Employee Purchase Requisition', - 'version': '16.0.1.1.0', + 'version': '16.0.1.0.1', 'category': 'Purchases', 'summary': 'Employee Purchase Requisition', 'description': 'Employee Purchase Requisition', diff --git a/employee_purchase_requisition/data/ir_sequence_data.xml b/employee_purchase_requisition/data/ir_sequence_data.xml old mode 100644 new mode 100755 index d424c5135..37f97a28d --- a/employee_purchase_requisition/data/ir_sequence_data.xml +++ b/employee_purchase_requisition/data/ir_sequence_data.xml @@ -1,5 +1,5 @@ - + Employee Purchase Requisition diff --git a/employee_purchase_requisition/doc/RELEASE_NOTES.md b/employee_purchase_requisition/doc/RELEASE_NOTES.md old mode 100644 new mode 100755 index 66b5074b1..ae07d94ff --- a/employee_purchase_requisition/doc/RELEASE_NOTES.md +++ b/employee_purchase_requisition/doc/RELEASE_NOTES.md @@ -4,8 +4,3 @@ #### Version 16.0.1.0.0 #### ADD - Initial commit for Employee Purchase Requisition - -#### 20.05.2023 -#### Version 16.0.1.1.0 -#### FIX -- Given employee module access to "Requisition Users". diff --git a/employee_purchase_requisition/models/__init__.py b/employee_purchase_requisition/models/__init__.py old mode 100644 new mode 100755 index 07ababd47..13a4e012c --- a/employee_purchase_requisition/models/__init__.py +++ b/employee_purchase_requisition/models/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +# Part of Odoo. See LICENSE file for full copyright and licensing details. ############################################################################# # # Cybrosys Technologies Pvt. Ltd. diff --git a/employee_purchase_requisition/models/hr_department.py b/employee_purchase_requisition/models/hr_department.py old mode 100644 new mode 100755 index 018fc25ce..20cdde5eb --- a/employee_purchase_requisition/models/hr_department.py +++ b/employee_purchase_requisition/models/hr_department.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +# Part of Odoo. See LICENSE file for full copyright and licensing details. ############################################################################# # # Cybrosys Technologies Pvt. Ltd. diff --git a/employee_purchase_requisition/models/hr_employee.py b/employee_purchase_requisition/models/hr_employee.py old mode 100644 new mode 100755 index d44db6f1f..c71947fa9 --- a/employee_purchase_requisition/models/hr_employee.py +++ b/employee_purchase_requisition/models/hr_employee.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +# Part of Odoo. See LICENSE file for full copyright and licensing details. ############################################################################# # # Cybrosys Technologies Pvt. Ltd. diff --git a/employee_purchase_requisition/models/purchase_order.py b/employee_purchase_requisition/models/purchase_order.py old mode 100644 new mode 100755 index 8ab5e03f1..ed9e5f22c --- a/employee_purchase_requisition/models/purchase_order.py +++ b/employee_purchase_requisition/models/purchase_order.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +# Part of Odoo. See LICENSE file for full copyright and licensing details. ############################################################################# # # Cybrosys Technologies Pvt. Ltd. diff --git a/employee_purchase_requisition/models/purchase_requisition.py b/employee_purchase_requisition/models/purchase_requisition.py old mode 100644 new mode 100755 index b21e38708..966f1af94 --- a/employee_purchase_requisition/models/purchase_requisition.py +++ b/employee_purchase_requisition/models/purchase_requisition.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +# Part of Odoo. See LICENSE file for full copyright and licensing details. ############################################################################# # # Cybrosys Technologies Pvt. Ltd. @@ -85,8 +85,12 @@ class PurchaseRequisition(models.Model): internal_picking_id = fields.Many2one('stock.picking.type', string="Internal Picking") requisition_description = fields.Text(string="Reason For Requisition") - purchase_count = fields.Integer(string='Purchase Count') - internal_transfer_count = fields.Integer(string='Internal Transfer count') + purchase_count = fields.Integer(string='Purchase Count', + help='Purchase Count', + compute='_compute_purchase_count') + internal_transfer_count = fields.Integer(string='Internal Transfer count', + help='Internal Transfer count', + compute='_compute_internal_transfer_count') state = fields.Selection( [('new', 'New'), ('waiting_department_approval', 'Waiting Department Approval'), @@ -160,18 +164,23 @@ class PurchaseRequisition(models.Model): }) else: self.env['purchase.order'].create({ - 'partner_id': self.employee_id.work_contact_id.id, + 'partner_id': rec.partner_id.id, 'requisition_order': self.name, "order_line": [(0, 0, { 'product_id': rec.product_id.id, 'product_qty': rec.quantity, })]}) self.write({'state': 'purchase_order_created'}) - self.purchase_count = self.env['purchase.order'].search_count([ - ('requisition_order', '=', self.name)]) + + def _compute_internal_transfer_count(self): + # self.internal_active = 0 self.internal_transfer_count = self.env['stock.picking'].search_count([ ('requisition_order', '=', self.name)]) + def _compute_purchase_count(self): + self.purchase_count = self.env['purchase.order'].search_count([ + ('requisition_order', '=', self.name)]) + def action_receive(self): """receive purchase requisition""" self.write({'state': 'received'}) diff --git a/employee_purchase_requisition/models/stock_picking.py b/employee_purchase_requisition/models/stock_picking.py old mode 100644 new mode 100755 index 42efb6f2c..87d449941 --- a/employee_purchase_requisition/models/stock_picking.py +++ b/employee_purchase_requisition/models/stock_picking.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +# Part of Odoo. See LICENSE file for full copyright and licensing details. ############################################################################# # # Cybrosys Technologies Pvt. Ltd. diff --git a/employee_purchase_requisition/report/purchase_requisition_report.xml b/employee_purchase_requisition/report/purchase_requisition_report.xml old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/report/purchase_requisition_template.xml b/employee_purchase_requisition/report/purchase_requisition_template.xml old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/security/ir.model.access.csv b/employee_purchase_requisition/security/ir.model.access.csv old mode 100644 new mode 100755 index 10d3dbb3b..f3e08cd4e --- a/employee_purchase_requisition/security/ir.model.access.csv +++ b/employee_purchase_requisition/security/ir.model.access.csv @@ -2,4 +2,4 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink access_employee_purchase_requisition_manager,employee.purchase.requisition,model_employee_purchase_requisition,employee_purchase_requisition.employee_requisition_manager,1,1,0,0 access_employee_purchase_requisition_requisition_head,employee.purchase.requisition,model_employee_purchase_requisition,employee_purchase_requisition.employee_requisition_head,1,1,0,0 access_employee_purchase_requisition_user,employee.purchase.requisition,model_employee_purchase_requisition,employee_purchase_requisition.employee_requisition_user,1,1,1,1 -access_requisition_order,employee.purchase.requisition,model_requisition_order,base.group_user,1,1,1,1 +access_requisition_order,employee.purchase.requisition,model_requisition_order,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/employee_purchase_requisition/security/security_access.xml b/employee_purchase_requisition/security/security_access.xml old mode 100644 new mode 100755 index 08c7f33b0..427d138eb --- a/employee_purchase_requisition/security/security_access.xml +++ b/employee_purchase_requisition/security/security_access.xml @@ -12,7 +12,6 @@ Requisition Users - diff --git a/employee_purchase_requisition/static/description/assets/icons/check.png b/employee_purchase_requisition/static/description/assets/icons/check.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/chevron.png b/employee_purchase_requisition/static/description/assets/icons/chevron.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/cogs.png b/employee_purchase_requisition/static/description/assets/icons/cogs.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/consultation.png b/employee_purchase_requisition/static/description/assets/icons/consultation.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/ecom-black.png b/employee_purchase_requisition/static/description/assets/icons/ecom-black.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/education-black.png b/employee_purchase_requisition/static/description/assets/icons/education-black.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/hotel-black.png b/employee_purchase_requisition/static/description/assets/icons/hotel-black.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/license.png b/employee_purchase_requisition/static/description/assets/icons/license.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/lifebuoy.png b/employee_purchase_requisition/static/description/assets/icons/lifebuoy.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/manufacturing-black.png b/employee_purchase_requisition/static/description/assets/icons/manufacturing-black.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/pos-black.png b/employee_purchase_requisition/static/description/assets/icons/pos-black.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/puzzle.png b/employee_purchase_requisition/static/description/assets/icons/puzzle.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/restaurant-black.png b/employee_purchase_requisition/static/description/assets/icons/restaurant-black.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/service-black.png b/employee_purchase_requisition/static/description/assets/icons/service-black.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/trading-black.png b/employee_purchase_requisition/static/description/assets/icons/trading-black.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/training.png b/employee_purchase_requisition/static/description/assets/icons/training.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/update.png b/employee_purchase_requisition/static/description/assets/icons/update.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/user.png b/employee_purchase_requisition/static/description/assets/icons/user.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/icons/wrench.png b/employee_purchase_requisition/static/description/assets/icons/wrench.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/categories.png b/employee_purchase_requisition/static/description/assets/misc/categories.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/check-box.png b/employee_purchase_requisition/static/description/assets/misc/check-box.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/compass.png b/employee_purchase_requisition/static/description/assets/misc/compass.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/corporate.png b/employee_purchase_requisition/static/description/assets/misc/corporate.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/customer-support.png b/employee_purchase_requisition/static/description/assets/misc/customer-support.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/cybrosys-logo.png b/employee_purchase_requisition/static/description/assets/misc/cybrosys-logo.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/features.png b/employee_purchase_requisition/static/description/assets/misc/features.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/logo.png b/employee_purchase_requisition/static/description/assets/misc/logo.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/pictures.png b/employee_purchase_requisition/static/description/assets/misc/pictures.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/pie-chart.png b/employee_purchase_requisition/static/description/assets/misc/pie-chart.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/right-arrow.png b/employee_purchase_requisition/static/description/assets/misc/right-arrow.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/star.png b/employee_purchase_requisition/static/description/assets/misc/star.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/support.png b/employee_purchase_requisition/static/description/assets/misc/support.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/misc/whatsapp.png b/employee_purchase_requisition/static/description/assets/misc/whatsapp.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/modules/1.png b/employee_purchase_requisition/static/description/assets/modules/1.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/modules/2.png b/employee_purchase_requisition/static/description/assets/modules/2.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/modules/3.png b/employee_purchase_requisition/static/description/assets/modules/3.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/modules/4.png b/employee_purchase_requisition/static/description/assets/modules/4.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/modules/5.gif b/employee_purchase_requisition/static/description/assets/modules/5.gif old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/modules/6.png b/employee_purchase_requisition/static/description/assets/modules/6.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_101.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_101.png new file mode 100644 index 000000000..f4e596268 Binary files /dev/null and b/employee_purchase_requisition/static/description/assets/screenshots/EPR_101.png differ diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_action_print_report_19.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_action_print_report_19.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_approved_13.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_approved_13.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_approved_14.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_approved_14.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_department_location_05.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_department_location_05.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_employee_location_04.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_employee_location_04.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_internal_trasnfer_17.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_internal_trasnfer_17.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_new_state_07.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_new_state_07.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_pdf_report_20.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_pdf_report_20.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_purchase_created_15.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_purchase_created_15.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_purchase_order_16.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_purchase_order_16.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_purchase_requisition_06.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_purchase_requisition_06.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_received_18.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_received_18.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_settings_department_head_02.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_settings_department_head_02.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_settings_manager_01.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_settings_manager_01.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_settings_requisition_user_03.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_settings_requisition_user_03.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_department_approval_08.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_department_approval_08.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_department_approval_09.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_department_approval_09.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_department_approval_10.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_department_approval_10.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_head_approval_11.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_head_approval_11.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_head_approval_12.png b/employee_purchase_requisition/static/description/assets/screenshots/EPR_waiting_head_approval_12.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/assets/screenshots/epr_100.png b/employee_purchase_requisition/static/description/assets/screenshots/epr_100.png new file mode 100644 index 000000000..d0217682f Binary files /dev/null and b/employee_purchase_requisition/static/description/assets/screenshots/epr_100.png differ diff --git a/employee_purchase_requisition/static/description/assets/screenshots/epr_102.png b/employee_purchase_requisition/static/description/assets/screenshots/epr_102.png new file mode 100644 index 000000000..fbf711813 Binary files /dev/null and b/employee_purchase_requisition/static/description/assets/screenshots/epr_102.png differ diff --git a/employee_purchase_requisition/static/description/assets/screenshots/hero.gif b/employee_purchase_requisition/static/description/assets/screenshots/hero.gif old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/banner.png b/employee_purchase_requisition/static/description/banner.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/icon.png b/employee_purchase_requisition/static/description/icon.png old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/static/description/index.html b/employee_purchase_requisition/static/description/index.html old mode 100644 new mode 100755 index 0e521b8cd..0978181be --- a/employee_purchase_requisition/static/description/index.html +++ b/employee_purchase_requisition/static/description/index.html @@ -311,7 +311,7 @@

After clicking "CREATE PICKING/PO" button state changes to "Purchase Order Created".Here can see Smart Tabs for Created Purchase order and Internal transfer.

- @@ -340,7 +340,7 @@

Requisition Head can Receive the Purchase Requisition by clicking "Received" button,after clicking state changes to "Received"

- @@ -350,7 +350,7 @@

Employee Can generate Purchase Requisition Report by clicking Actions ->Print Requisition Report

- diff --git a/employee_purchase_requisition/views/action_print_requisition.xml b/employee_purchase_requisition/views/action_print_requisition.xml old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/views/hr_department_view.xml b/employee_purchase_requisition/views/hr_department_view.xml old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/views/hr_employee_view.xml b/employee_purchase_requisition/views/hr_employee_view.xml old mode 100644 new mode 100755 diff --git a/employee_purchase_requisition/views/menu.xml b/employee_purchase_requisition/views/menu.xml old mode 100644 new mode 100755 index 06788f297..3a566747b --- a/employee_purchase_requisition/views/menu.xml +++ b/employee_purchase_requisition/views/menu.xml @@ -3,6 +3,7 @@ + attrs="{'invisible': [('purchase_count', '=', 0)]}">
diff --git a/employee_purchase_requisition/views/stock_picking_view.xml b/employee_purchase_requisition/views/stock_picking_view.xml old mode 100644 new mode 100755