diff --git a/merge_picking_orders/README.rst b/merge_picking_orders/README.rst new file mode 100644 index 000000000..43e058788 --- /dev/null +++ b/merge_picking_orders/README.rst @@ -0,0 +1,48 @@ +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.svg + :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +Merge Picking Orders +==================== +This module provides an option to manage the different types of Picking orders, When large number of Delivery,Receipts, Returns we can Merge the similar type Pickings simply by selecting the Picking orders. + +Configuration +============= +* No additional configuration needed + +License +------- +Affero General Public License v3.0 (AGPL v3) +(https://www.gnu.org/licenses/agpl-3.0-standalone.html) + +Company +------- +* `Cybrosys Techno Solutions `__ + +Credits +------- +Developer : V16 Vishnuraj P , + V17 Gayathri V , +Contact: odoo@cybrosys.com + +Contacts +-------- +* Mail Contact : odoo@cybrosys.com +* Website : https://cybrosys.com + +Bug Tracker +----------- +Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. + +Maintainer +========== +.. image:: https://cybrosys.com/images/logo.png + :target: https://cybrosys.com + +This module is maintained by Cybrosys Technologies. + +For support and more information, please visit `Our Website `__ + +Further information +=================== +HTML Description: ``__ diff --git a/merge_picking_orders/__init__.py b/merge_picking_orders/__init__.py new file mode 100644 index 000000000..45cc94a40 --- /dev/null +++ b/merge_picking_orders/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Author: Gayathri V(odoo@cybrosys.com) +# +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################### +from . import models +from . import wizard diff --git a/merge_picking_orders/__manifest__.py b/merge_picking_orders/__manifest__.py new file mode 100644 index 000000000..eff3f3319 --- /dev/null +++ b/merge_picking_orders/__manifest__.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Author: Gayathri V(odoo@cybrosys.com) +# +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################### +{ + 'name': 'Merge Picking Orders', + 'version': '17.0.1.0.0', + 'category': 'Warehouse', + 'summary': "With This Module, You Can Easily Merge Pickings such as " + "Receipts, Delivery Orders and Returns", + 'description': """This module provides an option to manage the different + types of Picking orders, When large number of Delivery,Receipts, Returns we + can Merge the similar type Pickings simply by selecting the Picking orders.""", + 'author': 'Cybrosys Techno Solutions', + 'company': 'Cybrosys Techno Solutions', + 'maintainer': 'Cybrosys Techno Solutions', + 'website': "https://www.cybrosys.com", + 'depends': ['stock'], + 'data': [ + 'security/ir.model.access.csv', + 'data/stock_picking_data.xml', + 'wizard/merge_picking_views.xml', + ], + 'images': ['static/description/banner.jpg'], + 'license': 'AGPL-3', + 'installable': True, + 'auto_install': False, + 'application': False +} diff --git a/merge_picking_orders/data/stock_picking_data.xml b/merge_picking_orders/data/stock_picking_data.xml new file mode 100644 index 000000000..1ce4418c3 --- /dev/null +++ b/merge_picking_orders/data/stock_picking_data.xml @@ -0,0 +1,14 @@ + + + + + Merge Records + + + list + code + + action = records.action_merge_picking() + + + diff --git a/merge_picking_orders/doc/RELEASE_NOTES.md b/merge_picking_orders/doc/RELEASE_NOTES.md new file mode 100644 index 000000000..229d255ff --- /dev/null +++ b/merge_picking_orders/doc/RELEASE_NOTES.md @@ -0,0 +1,7 @@ +## Module + +#### 11.01.2024 +#### Version 17.0.1.0.0 +##### ADD + +- Initial Commit for Merge Picking Orders diff --git a/merge_picking_orders/models/__init__.py b/merge_picking_orders/models/__init__.py new file mode 100644 index 000000000..f3b18a5dc --- /dev/null +++ b/merge_picking_orders/models/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Author: Gayathri V(odoo@cybrosys.com) +# +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################### +from . import stock_picking diff --git a/merge_picking_orders/models/stock_picking.py b/merge_picking_orders/models/stock_picking.py new file mode 100644 index 000000000..e21cf1c11 --- /dev/null +++ b/merge_picking_orders/models/stock_picking.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Author: Gayathri V (odoo@cybrosys.com) +# +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################### +from odoo import fields, models, _ + + +class StockPicking(models.Model): + """ + Inherit Pickings class for add merge orders action function, + Method: + action_merge_picking(self): + Create new wizard with selected records + """ + _inherit = 'stock.picking' + + def action_merge_picking(self): + """ Method create wizard for select pickings """ + merge_picking = self.env['merge.picking'].create({ + 'merge_picking_ids': [fields.Command.set(self.ids)], + }) + return { + 'name': _('Merge Picking Orders'), + 'type': 'ir.actions.act_window', + 'res_model': 'merge.picking', + 'view_mode': 'form', + 'res_id': merge_picking.id, + 'target': 'new' + } diff --git a/merge_picking_orders/security/ir.model.access.csv b/merge_picking_orders/security/ir.model.access.csv new file mode 100644 index 000000000..2c76cf630 --- /dev/null +++ b/merge_picking_orders/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_merge_picking_user,access.merge.picking.user,model_merge_picking,base.group_user,1,1,1,1 diff --git a/merge_picking_orders/static/description/assets/icons/capture (1).png b/merge_picking_orders/static/description/assets/icons/capture (1).png new file mode 100644 index 000000000..8824deafc Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/capture (1).png differ diff --git a/merge_picking_orders/static/description/assets/icons/check.png b/merge_picking_orders/static/description/assets/icons/check.png new file mode 100644 index 000000000..c8e85f51d Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/check.png differ diff --git a/merge_picking_orders/static/description/assets/icons/chevron.png b/merge_picking_orders/static/description/assets/icons/chevron.png new file mode 100644 index 000000000..2089293d6 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/chevron.png differ diff --git a/merge_picking_orders/static/description/assets/icons/cogs.png b/merge_picking_orders/static/description/assets/icons/cogs.png new file mode 100644 index 000000000..95d0bad62 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/cogs.png differ diff --git a/merge_picking_orders/static/description/assets/icons/consultation.png b/merge_picking_orders/static/description/assets/icons/consultation.png new file mode 100644 index 000000000..8319d4baa Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/consultation.png differ diff --git a/merge_picking_orders/static/description/assets/icons/ecom-black.png b/merge_picking_orders/static/description/assets/icons/ecom-black.png new file mode 100644 index 000000000..a9385ff13 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/ecom-black.png differ diff --git a/merge_picking_orders/static/description/assets/icons/education-black.png b/merge_picking_orders/static/description/assets/icons/education-black.png new file mode 100644 index 000000000..3eb09b27b Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/education-black.png differ diff --git a/merge_picking_orders/static/description/assets/icons/hotel-black.png b/merge_picking_orders/static/description/assets/icons/hotel-black.png new file mode 100644 index 000000000..130f613be Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/hotel-black.png differ diff --git a/merge_picking_orders/static/description/assets/icons/img.png b/merge_picking_orders/static/description/assets/icons/img.png new file mode 100644 index 000000000..70197f477 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/img.png differ diff --git a/merge_picking_orders/static/description/assets/icons/license.png b/merge_picking_orders/static/description/assets/icons/license.png new file mode 100644 index 000000000..a5869797e Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/license.png differ diff --git a/merge_picking_orders/static/description/assets/icons/lifebuoy.png b/merge_picking_orders/static/description/assets/icons/lifebuoy.png new file mode 100644 index 000000000..658d56ccc Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/lifebuoy.png differ diff --git a/merge_picking_orders/static/description/assets/icons/manufacturing-black.png b/merge_picking_orders/static/description/assets/icons/manufacturing-black.png new file mode 100644 index 000000000..697eb0e9f Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/manufacturing-black.png differ diff --git a/merge_picking_orders/static/description/assets/icons/photo-capture.png b/merge_picking_orders/static/description/assets/icons/photo-capture.png new file mode 100644 index 000000000..06c111758 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/photo-capture.png differ diff --git a/merge_picking_orders/static/description/assets/icons/pos-black.png b/merge_picking_orders/static/description/assets/icons/pos-black.png new file mode 100644 index 000000000..97c0f90c1 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/pos-black.png differ diff --git a/merge_picking_orders/static/description/assets/icons/puzzle.png b/merge_picking_orders/static/description/assets/icons/puzzle.png new file mode 100644 index 000000000..65cf854e7 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/puzzle.png differ diff --git a/merge_picking_orders/static/description/assets/icons/restaurant-black.png b/merge_picking_orders/static/description/assets/icons/restaurant-black.png new file mode 100644 index 000000000..4a35eb939 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/restaurant-black.png differ diff --git a/merge_picking_orders/static/description/assets/icons/service-black.png b/merge_picking_orders/static/description/assets/icons/service-black.png new file mode 100644 index 000000000..301ab51cb Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/service-black.png differ diff --git a/merge_picking_orders/static/description/assets/icons/trading-black.png b/merge_picking_orders/static/description/assets/icons/trading-black.png new file mode 100644 index 000000000..9398ba2f1 Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/trading-black.png differ diff --git a/merge_picking_orders/static/description/assets/icons/training.png b/merge_picking_orders/static/description/assets/icons/training.png new file mode 100644 index 000000000..884ca024d Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/training.png differ diff --git a/merge_picking_orders/static/description/assets/icons/update.png b/merge_picking_orders/static/description/assets/icons/update.png new file mode 100644 index 000000000..ecbc5a01a Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/update.png differ diff --git a/merge_picking_orders/static/description/assets/icons/user.png b/merge_picking_orders/static/description/assets/icons/user.png new file mode 100644 index 000000000..6ffb23d9f Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/user.png differ diff --git a/merge_picking_orders/static/description/assets/icons/wrench.png b/merge_picking_orders/static/description/assets/icons/wrench.png new file mode 100644 index 000000000..6c04dea0f Binary files /dev/null and b/merge_picking_orders/static/description/assets/icons/wrench.png differ diff --git a/merge_picking_orders/static/description/assets/misc/Cybrosys R.png b/merge_picking_orders/static/description/assets/misc/Cybrosys R.png new file mode 100644 index 000000000..da4058087 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/Cybrosys R.png differ diff --git a/merge_picking_orders/static/description/assets/misc/categories.png b/merge_picking_orders/static/description/assets/misc/categories.png new file mode 100644 index 000000000..bedf1e0b1 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/categories.png differ diff --git a/merge_picking_orders/static/description/assets/misc/check-box.png b/merge_picking_orders/static/description/assets/misc/check-box.png new file mode 100644 index 000000000..42caf24b9 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/check-box.png differ diff --git a/merge_picking_orders/static/description/assets/misc/compass.png b/merge_picking_orders/static/description/assets/misc/compass.png new file mode 100644 index 000000000..d5fed8faa Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/compass.png differ diff --git a/merge_picking_orders/static/description/assets/misc/corporate.png b/merge_picking_orders/static/description/assets/misc/corporate.png new file mode 100644 index 000000000..2eb13edbf Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/corporate.png differ diff --git a/merge_picking_orders/static/description/assets/misc/customer-support.png b/merge_picking_orders/static/description/assets/misc/customer-support.png new file mode 100644 index 000000000..79efc72ed Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/customer-support.png differ diff --git a/merge_picking_orders/static/description/assets/misc/cybrosys-logo.png b/merge_picking_orders/static/description/assets/misc/cybrosys-logo.png new file mode 100644 index 000000000..cc3cc0ccf Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/cybrosys-logo.png differ diff --git a/merge_picking_orders/static/description/assets/misc/email.svg b/merge_picking_orders/static/description/assets/misc/email.svg new file mode 100644 index 000000000..15291cdc3 --- /dev/null +++ b/merge_picking_orders/static/description/assets/misc/email.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/merge_picking_orders/static/description/assets/misc/features.png b/merge_picking_orders/static/description/assets/misc/features.png new file mode 100644 index 000000000..b41769f77 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/features.png differ diff --git a/merge_picking_orders/static/description/assets/misc/logo.png b/merge_picking_orders/static/description/assets/misc/logo.png new file mode 100644 index 000000000..478462d3e Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/logo.png differ diff --git a/merge_picking_orders/static/description/assets/misc/phone.svg b/merge_picking_orders/static/description/assets/misc/phone.svg new file mode 100644 index 000000000..b7bd7f251 --- /dev/null +++ b/merge_picking_orders/static/description/assets/misc/phone.svg @@ -0,0 +1,3 @@ + + + diff --git a/merge_picking_orders/static/description/assets/misc/pictures.png b/merge_picking_orders/static/description/assets/misc/pictures.png new file mode 100644 index 000000000..56d255fe9 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/pictures.png differ diff --git a/merge_picking_orders/static/description/assets/misc/pie-chart.png b/merge_picking_orders/static/description/assets/misc/pie-chart.png new file mode 100644 index 000000000..426e05244 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/pie-chart.png differ diff --git a/merge_picking_orders/static/description/assets/misc/right-arrow.png b/merge_picking_orders/static/description/assets/misc/right-arrow.png new file mode 100644 index 000000000..730984a06 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/right-arrow.png differ diff --git a/merge_picking_orders/static/description/assets/misc/star (1) 2.svg b/merge_picking_orders/static/description/assets/misc/star (1) 2.svg new file mode 100644 index 000000000..5ae9f507a --- /dev/null +++ b/merge_picking_orders/static/description/assets/misc/star (1) 2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/merge_picking_orders/static/description/assets/misc/star.png b/merge_picking_orders/static/description/assets/misc/star.png new file mode 100644 index 000000000..2eb9ab29f Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/star.png differ diff --git a/merge_picking_orders/static/description/assets/misc/support (1) 1.svg b/merge_picking_orders/static/description/assets/misc/support (1) 1.svg new file mode 100644 index 000000000..7d37a8f30 --- /dev/null +++ b/merge_picking_orders/static/description/assets/misc/support (1) 1.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/merge_picking_orders/static/description/assets/misc/support-email.svg b/merge_picking_orders/static/description/assets/misc/support-email.svg new file mode 100644 index 000000000..eb70370d6 --- /dev/null +++ b/merge_picking_orders/static/description/assets/misc/support-email.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/merge_picking_orders/static/description/assets/misc/support.png b/merge_picking_orders/static/description/assets/misc/support.png new file mode 100644 index 000000000..4f18b8b82 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/support.png differ diff --git a/merge_picking_orders/static/description/assets/misc/tick-mark.svg b/merge_picking_orders/static/description/assets/misc/tick-mark.svg new file mode 100644 index 000000000..2dbb40187 --- /dev/null +++ b/merge_picking_orders/static/description/assets/misc/tick-mark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/merge_picking_orders/static/description/assets/misc/whatsapp 1.svg b/merge_picking_orders/static/description/assets/misc/whatsapp 1.svg new file mode 100644 index 000000000..0bfaf8fc6 --- /dev/null +++ b/merge_picking_orders/static/description/assets/misc/whatsapp 1.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/merge_picking_orders/static/description/assets/misc/whatsapp.png b/merge_picking_orders/static/description/assets/misc/whatsapp.png new file mode 100644 index 000000000..d513a5356 Binary files /dev/null and b/merge_picking_orders/static/description/assets/misc/whatsapp.png differ diff --git a/merge_picking_orders/static/description/assets/misc/whatsapp.svg b/merge_picking_orders/static/description/assets/misc/whatsapp.svg new file mode 100644 index 000000000..b618aea1d --- /dev/null +++ b/merge_picking_orders/static/description/assets/misc/whatsapp.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/merge_picking_orders/static/description/assets/modules/1.png b/merge_picking_orders/static/description/assets/modules/1.png new file mode 100644 index 000000000..656c99e14 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/1.png differ diff --git a/merge_picking_orders/static/description/assets/modules/2.png b/merge_picking_orders/static/description/assets/modules/2.png new file mode 100644 index 000000000..2210167b9 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/2.png differ diff --git a/merge_picking_orders/static/description/assets/modules/3.png b/merge_picking_orders/static/description/assets/modules/3.png new file mode 100644 index 000000000..0964b3ac5 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/3.png differ diff --git a/merge_picking_orders/static/description/assets/modules/4.png b/merge_picking_orders/static/description/assets/modules/4.png new file mode 100644 index 000000000..f39c113fa Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/4.png differ diff --git a/merge_picking_orders/static/description/assets/modules/5.gif b/merge_picking_orders/static/description/assets/modules/5.gif new file mode 100644 index 000000000..2a5f8e659 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/5.gif differ diff --git a/merge_picking_orders/static/description/assets/modules/5.png b/merge_picking_orders/static/description/assets/modules/5.png new file mode 100644 index 000000000..72203aea8 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/5.png differ diff --git a/merge_picking_orders/static/description/assets/modules/6.png b/merge_picking_orders/static/description/assets/modules/6.png new file mode 100644 index 000000000..5c18ba233 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/6.png differ diff --git a/merge_picking_orders/static/description/assets/modules/advanced_dynamic_dashboard.png b/merge_picking_orders/static/description/assets/modules/advanced_dynamic_dashboard.png new file mode 100644 index 000000000..f0e8c3a16 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/advanced_dynamic_dashboard.png differ diff --git a/merge_picking_orders/static/description/assets/modules/odoo_dynamic_dashboard.png b/merge_picking_orders/static/description/assets/modules/odoo_dynamic_dashboard.png new file mode 100644 index 000000000..f3c986fc1 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/odoo_dynamic_dashboard.png differ diff --git a/merge_picking_orders/static/description/assets/modules/odoo_website_helpdesk_dashboard.png b/merge_picking_orders/static/description/assets/modules/odoo_website_helpdesk_dashboard.png new file mode 100644 index 000000000..fa478cd14 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/odoo_website_helpdesk_dashboard.png differ diff --git a/merge_picking_orders/static/description/assets/modules/product_management_app.png b/merge_picking_orders/static/description/assets/modules/product_management_app.png new file mode 100644 index 000000000..b145c7a29 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/product_management_app.png differ diff --git a/merge_picking_orders/static/description/assets/modules/project_dashboard_odoo.png b/merge_picking_orders/static/description/assets/modules/project_dashboard_odoo.png new file mode 100644 index 000000000..6c8c8adc3 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/project_dashboard_odoo.png differ diff --git a/merge_picking_orders/static/description/assets/modules/salon_management.png b/merge_picking_orders/static/description/assets/modules/salon_management.png new file mode 100644 index 000000000..2a666bf79 Binary files /dev/null and b/merge_picking_orders/static/description/assets/modules/salon_management.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/1.png b/merge_picking_orders/static/description/assets/screenshots/1.png new file mode 100644 index 000000000..02b496c5a Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/1.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/10.png b/merge_picking_orders/static/description/assets/screenshots/10.png new file mode 100644 index 000000000..f7e4f1ae6 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/10.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/11.png b/merge_picking_orders/static/description/assets/screenshots/11.png new file mode 100644 index 000000000..42faaa1e0 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/11.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/12.png b/merge_picking_orders/static/description/assets/screenshots/12.png new file mode 100644 index 000000000..b328ecc50 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/12.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/13.png b/merge_picking_orders/static/description/assets/screenshots/13.png new file mode 100644 index 000000000..9d4cdfaf6 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/13.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/14.png b/merge_picking_orders/static/description/assets/screenshots/14.png new file mode 100644 index 000000000..660e8132d Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/14.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/15.png b/merge_picking_orders/static/description/assets/screenshots/15.png new file mode 100644 index 000000000..c0b342baf Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/15.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/16.png b/merge_picking_orders/static/description/assets/screenshots/16.png new file mode 100644 index 000000000..f8719ea95 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/16.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/2.png b/merge_picking_orders/static/description/assets/screenshots/2.png new file mode 100644 index 000000000..917873d0c Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/2.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/3.png b/merge_picking_orders/static/description/assets/screenshots/3.png new file mode 100644 index 000000000..3fe0b71dc Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/3.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/4.png b/merge_picking_orders/static/description/assets/screenshots/4.png new file mode 100644 index 000000000..a7d8de9ef Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/4.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/5.png b/merge_picking_orders/static/description/assets/screenshots/5.png new file mode 100644 index 000000000..6c306d936 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/5.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/6.png b/merge_picking_orders/static/description/assets/screenshots/6.png new file mode 100644 index 000000000..e9aa9487b Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/6.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/7.png b/merge_picking_orders/static/description/assets/screenshots/7.png new file mode 100644 index 000000000..2d2e47bac Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/7.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/8.png b/merge_picking_orders/static/description/assets/screenshots/8.png new file mode 100644 index 000000000..e8cd2b616 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/8.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/9.png b/merge_picking_orders/static/description/assets/screenshots/9.png new file mode 100644 index 000000000..34c7405d2 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/9.png differ diff --git a/merge_picking_orders/static/description/assets/screenshots/hero.gif b/merge_picking_orders/static/description/assets/screenshots/hero.gif new file mode 100644 index 000000000..0f3d18351 Binary files /dev/null and b/merge_picking_orders/static/description/assets/screenshots/hero.gif differ diff --git a/merge_picking_orders/static/description/banner.jpg b/merge_picking_orders/static/description/banner.jpg new file mode 100644 index 000000000..fbd154689 Binary files /dev/null and b/merge_picking_orders/static/description/banner.jpg differ diff --git a/merge_picking_orders/static/description/icon.png b/merge_picking_orders/static/description/icon.png new file mode 100644 index 000000000..14b8b7142 Binary files /dev/null and b/merge_picking_orders/static/description/icon.png differ diff --git a/merge_picking_orders/static/description/icons/check.png b/merge_picking_orders/static/description/icons/check.png new file mode 100644 index 000000000..c8e85f51d Binary files /dev/null and b/merge_picking_orders/static/description/icons/check.png differ diff --git a/merge_picking_orders/static/description/icons/chevron.png b/merge_picking_orders/static/description/icons/chevron.png new file mode 100644 index 000000000..2089293d6 Binary files /dev/null and b/merge_picking_orders/static/description/icons/chevron.png differ diff --git a/merge_picking_orders/static/description/icons/cogs.png b/merge_picking_orders/static/description/icons/cogs.png new file mode 100644 index 000000000..95d0bad62 Binary files /dev/null and b/merge_picking_orders/static/description/icons/cogs.png differ diff --git a/merge_picking_orders/static/description/icons/consultation.png b/merge_picking_orders/static/description/icons/consultation.png new file mode 100644 index 000000000..8319d4baa Binary files /dev/null and b/merge_picking_orders/static/description/icons/consultation.png differ diff --git a/merge_picking_orders/static/description/icons/ecom-black.png b/merge_picking_orders/static/description/icons/ecom-black.png new file mode 100644 index 000000000..a9385ff13 Binary files /dev/null and b/merge_picking_orders/static/description/icons/ecom-black.png differ diff --git a/merge_picking_orders/static/description/icons/education-black.png b/merge_picking_orders/static/description/icons/education-black.png new file mode 100644 index 000000000..3eb09b27b Binary files /dev/null and b/merge_picking_orders/static/description/icons/education-black.png differ diff --git a/merge_picking_orders/static/description/icons/hotel-black.png b/merge_picking_orders/static/description/icons/hotel-black.png new file mode 100644 index 000000000..130f613be Binary files /dev/null and b/merge_picking_orders/static/description/icons/hotel-black.png differ diff --git a/merge_picking_orders/static/description/icons/license.png b/merge_picking_orders/static/description/icons/license.png new file mode 100644 index 000000000..a5869797e Binary files /dev/null and b/merge_picking_orders/static/description/icons/license.png differ diff --git a/merge_picking_orders/static/description/icons/lifebuoy.png b/merge_picking_orders/static/description/icons/lifebuoy.png new file mode 100644 index 000000000..658d56ccc Binary files /dev/null and b/merge_picking_orders/static/description/icons/lifebuoy.png differ diff --git a/merge_picking_orders/static/description/icons/manufacturing-black.png b/merge_picking_orders/static/description/icons/manufacturing-black.png new file mode 100644 index 000000000..697eb0e9f Binary files /dev/null and b/merge_picking_orders/static/description/icons/manufacturing-black.png differ diff --git a/merge_picking_orders/static/description/icons/pos-black.png b/merge_picking_orders/static/description/icons/pos-black.png new file mode 100644 index 000000000..97c0f90c1 Binary files /dev/null and b/merge_picking_orders/static/description/icons/pos-black.png differ diff --git a/merge_picking_orders/static/description/icons/puzzle.png b/merge_picking_orders/static/description/icons/puzzle.png new file mode 100644 index 000000000..65cf854e7 Binary files /dev/null and b/merge_picking_orders/static/description/icons/puzzle.png differ diff --git a/merge_picking_orders/static/description/icons/restaurant-black.png b/merge_picking_orders/static/description/icons/restaurant-black.png new file mode 100644 index 000000000..4a35eb939 Binary files /dev/null and b/merge_picking_orders/static/description/icons/restaurant-black.png differ diff --git a/merge_picking_orders/static/description/icons/service-black.png b/merge_picking_orders/static/description/icons/service-black.png new file mode 100644 index 000000000..301ab51cb Binary files /dev/null and b/merge_picking_orders/static/description/icons/service-black.png differ diff --git a/merge_picking_orders/static/description/icons/trading-black.png b/merge_picking_orders/static/description/icons/trading-black.png new file mode 100644 index 000000000..9398ba2f1 Binary files /dev/null and b/merge_picking_orders/static/description/icons/trading-black.png differ diff --git a/merge_picking_orders/static/description/icons/training.png b/merge_picking_orders/static/description/icons/training.png new file mode 100644 index 000000000..884ca024d Binary files /dev/null and b/merge_picking_orders/static/description/icons/training.png differ diff --git a/merge_picking_orders/static/description/icons/update.png b/merge_picking_orders/static/description/icons/update.png new file mode 100644 index 000000000..ecbc5a01a Binary files /dev/null and b/merge_picking_orders/static/description/icons/update.png differ diff --git a/merge_picking_orders/static/description/icons/user.png b/merge_picking_orders/static/description/icons/user.png new file mode 100644 index 000000000..6ffb23d9f Binary files /dev/null and b/merge_picking_orders/static/description/icons/user.png differ diff --git a/merge_picking_orders/static/description/icons/wrench.png b/merge_picking_orders/static/description/icons/wrench.png new file mode 100644 index 000000000..6c04dea0f Binary files /dev/null and b/merge_picking_orders/static/description/icons/wrench.png differ diff --git a/merge_picking_orders/static/description/index.html b/merge_picking_orders/static/description/index.html new file mode 100644 index 000000000..cd53dbfad --- /dev/null +++ b/merge_picking_orders/static/description/index.html @@ -0,0 +1,961 @@ + + + + + + + Odoo App 3 Index + + + + + + + + +
+
+
+
+
+ +
+
+
+ Community +
+
+ Enterprise +
+
+ Odoo.sh +
+
+
+
+
+
+

+ Merge Picking Orders

+

+ This Module Will Help to Manage all Type of Pickings by + Merging. +

+
+ +
+
+
+
+
+

+ Key Highlights +

+
+
+
+
+
+ +
+
+

+ + Manage the different types of Picking + orders.

+
+
+
+
+
+
+ +
+
+

+ Large number of Delivery, Receipts, Returns we + can Merge the similar type Pickings simply by + selecting the Picking orders. +

+
+
+
+
+
+
+ +
+
+

+ Supports In Odoo Community And Enterprise.

+
+
+
+
+
+
+ +
+
+

+ Option to Merge to Existing Picking Order.

+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+

+ Can Choose any Picking Like Receipts, + Delivery Orders, Returns, etc.

+
+
+
+
+
+
+ +
+
+

+ Here Going to Merge the Same Partner's Same + State Pickings ie, WH/IN/00003 & WH/IN/00004 + .

+
+
+
+
+
+
+ +
+
+

+ The Details of WH/IN/00003 .

+
+
+
+
+
+
+ +
+
+

+ The Details of WH/IN/00004 .

+
+
+
+
+
+
+ +
+
+

+ Select the Picking Orders for Merging .

+
+
+
+
+
+
+ +
+
+

+ When Selected Pickings, There Will be an + Option for Merge Under The Action + Menu.

+ +
+
+
+
+
+
+ +
+
+

+ Merge Popup Window, Shows Selected Pickings + and How to Use it.

+ +
+
+
+
+
+
+ +
+
+

+ A New Picking Will be Created With Source + Document Detail as Merged Pickings and + Merged Picking Canceled.

+ +
+
+
+
+
+
+ +
+
+

+ The Newly Created Picking. The Source + Document Shows The Merged Pickings .

+ +
+
+
+
+
+
+ +
+
+

+ The Merging Window Also as an Option for + Merging to Selected Picking, Thus a New + Picking Will Not be Created, Instead of That + Picking Lines Merged to The Selected Picking + Order .

+ +
+
+
+
+
+
+ +
+
+

+ Except for The Selected Picking, All Other + Pickings Will be Canceled.

+ +
+
+
+
+
+
+ +
+
+

+ Details of Merged Picking Order. The Source + Document Field Shows The Names of The Merged + Records.

+ +
+
+
+
+
+
+ +
+
+

+ Access Error When Try To Merge Single Picking.

+ +
+
+
+
+
+
+ +
+
+

+ Error When Merging Done State Picking.

+ +
+
+
+
+
+
+ +
+
+

+ Error When Try to Merge Pickings in Different Stages.

+ +
+
+
+
+
+
+ +
+
+

+ Error When Try to Merge Different Type Pickings.

+ +
+
+
+
+
+
+
    +
  • + Easy to Manage Delivery Orders, Receipts, Returns etc... +
  • +
  • + Simply Select And Merge. +
  • +
  • + Create Single Picking from Existing Large Number of Pickings. +
  • + +
  • + Option to Merge to Existing Picking Order. +
  • +
  • + Track Merged Picking Using Source Document Field. +
  • +
+
+
+
+
+
+
Version + 17.0.1.0.0|Released on:11th Jan 2024 +
+

+ Initial Commit for Legal Case Management + Dashboard.

+
+
+
+
+
+
+
+

+ Related Products

+
+
+ +
+
+

+ Our Services

+ +
+
+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Customization

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Implementation

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Support

+
+
+
+
+
+
+ service-icon +
+
+

Hire + Odoo Developer

+
+
+
+
+ +
+
+ service-icon +
+
+

Odoo + Integration

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Migration

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Consultancy

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Implementation

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Licensing Consultancy

+
+
+
+
+
+
+

+ Our Industries

+ +
+
+
+
+
+
+ +

Trading

+

Easily procure and sell your products

+
+
+
+
+ +

POS

+

Easy configuration and convivial experience

+
+
+
+
+ +

+ Education

+

A platform for educational management

+
+
+
+
+ +

+ Manufacturing

+

Plan, track and schedule your operations

+
+
+
+
+ +

E-commerce & + Website

+

Mobile friendly, awe-inspiring product pages

+
+
+
+
+ +

Service + Management

+

Keep track of services and invoice

+
+
+
+
+ +

+ Restaurant

+

Run your bar or restaurant methodically

+
+
+
+
+ +

Hotel + Management

+

An all-inclusive hotel management application

+
+
+
+
+
+
+

+ Support

+
+
+
+
+
+
+
+ +
+ Need + Help? +

Got + questions or need help? Get in touch.

+
odoo@cybrosys.com +
+
+
+
+
+
+
+
+ +
+ WhatsApp +

Say hi to + us on WhatsApp!

+
+91 + 99456767686 +
+
+
+
+
+
+
+
+
+ + + + + + diff --git a/merge_picking_orders/wizard/__init__.py b/merge_picking_orders/wizard/__init__.py new file mode 100644 index 000000000..1d845af2b --- /dev/null +++ b/merge_picking_orders/wizard/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Author: Gayathri V(odoo@cybrosys.com) +# +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################### +from . import merge_picking diff --git a/merge_picking_orders/wizard/merge_picking.py b/merge_picking_orders/wizard/merge_picking.py new file mode 100644 index 000000000..88df98ef6 --- /dev/null +++ b/merge_picking_orders/wizard/merge_picking.py @@ -0,0 +1,89 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Author: Gayathri V(odoo@cybrosys.com) +# +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################### +from odoo import fields, models, _ +from odoo.exceptions import AccessError + + +class MergePicking(models.TransientModel): + """ + Class for wizard to show selected pickings to merge + Method: + action_merge(self): + Method to merge the selected pickings + """ + _name = 'merge.picking' + _description = "Merge Picking Wizard" + + merge_picking_ids = fields.Many2many('stock.picking', string='Orders', + help="Selected orders") + existing_pick_id = fields.Many2one( + 'stock.picking', string="Merge to existing", + help="Select a pick if you want to merge pickings to a existing picking" + " else leave it as empty") + + def action_merge(self): + """ + Main method to merge selected pickings + - If checked 'merge to existing' then the selected pickings will be + merged to last record + - Else a new record will be created with the existing picking lines + - The selected pickings will be moved to cancelled state + - The newly created picking will be in ready state + """ + # Checking for exceptions if exist raise corresponding messages + if len(list(set(x.partner_id if x.partner_id else None for x in + self.merge_picking_ids))) > 1: + raise AccessError(_("Merging is not allowed on Different partners," + " please add same partner's orders")) + if len(list(set(self.merge_picking_ids.mapped('picking_type_id')))) > 1: + raise AccessError( + _("Merging is not allowed on Different picking type," + " please choose same type")) + if any(state in ['done', 'cancel'] for state in + self.merge_picking_ids.mapped('state')): + raise AccessError(_('Merging is not allowed on Done/Cancelled ' + 'pickings, so please remove them and continue')) + if len(list(set(self.merge_picking_ids.mapped('state')))) > 1: + raise AccessError(_('Merging is not allowed on Different State ' + 'Pickings, please add orders in same State')) + if len(self.merge_picking_ids) == 1: + raise AccessError(_('Merging is not allowed on Single picking,' + ' please add minimum Two')) + # If there is no exception, continues with the merging process + source_document = [] + if self.existing_pick_id: + main_pick = self.existing_pick_id + orders = self.merge_picking_ids-main_pick + moves = main_pick.move_ids + source_document.append(main_pick.name) + else: + orders = self.merge_picking_ids + moves = self.env['stock.move'] + main_pick = orders[0].copy({'move_ids': None}) + for record in orders: + for line in record.move_ids: + moves += line.copy({'picking_id': main_pick.id}) + source_document.append(record.name) + record.action_cancel() + main_pick.write( + {'origin': f"Merged ({(', '.join(source_document))})"}) + main_pick.action_confirm() diff --git a/merge_picking_orders/wizard/merge_picking_views.xml b/merge_picking_orders/wizard/merge_picking_views.xml new file mode 100644 index 000000000..1d86b75ab --- /dev/null +++ b/merge_picking_orders/wizard/merge_picking_views.xml @@ -0,0 +1,40 @@ + + + + + merge.picking.view.form + merge.picking + +
+ +

When selecting pickings for merging, +
+ * Merging is not allowed in a single picking and Done + state picking +
+ * Pickings should be of the same partners, same types, + same states +

+ + + + + + + + + + + + + +
+
+
+
+