diff --git a/invoice_merging/README.rst b/invoice_merging/README.rst new file mode 100644 index 000000000..39cfabac6 --- /dev/null +++ b/invoice_merging/README.rst @@ -0,0 +1,49 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +Merge Invoices +============== +This module helps to merge invoices, credit note, debit note and vendor bills by merging them. + +Configuration +============= +* No additional configuration is needed. + +Company +------- +* `Cybrosys Techno Solutions `__ + +License +------- +Affero General Public License v3.0 (AGPL v3) +(https://www.gnu.org/licenses/agpl-3.0-standalone.html) + +Credits +------- +* Developers: (V16) Vishnuraj P, + (V17) Akhil Ashok, + (V18) Aysha Shalin + 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/invoice_merging/__init__.py b/invoice_merging/__init__.py new file mode 100644 index 000000000..281effc1c --- /dev/null +++ b/invoice_merging/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2025-TODAY Cybrosys Technologies() +# Author: Aysha Shalin (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/invoice_merging/__manifest__.py b/invoice_merging/__manifest__.py new file mode 100644 index 000000000..3d9e38a7d --- /dev/null +++ b/invoice_merging/__manifest__.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2025-TODAY Cybrosys Technologies() +# Author: Aysha Shalin (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 Invoices', + 'version': '18.0.1.0.0', + 'category': 'Accounting', + 'summary': """Merge different Account moves.""", + 'description': """This module allows users to merge customer invoices, + credit notes, debit notes, and vendor bills into a single document. All + details from the merged documents are kept in the final one.""", + 'author': 'Cybrosys Techno Solutions', + 'company': 'Cybrosys Techno Solutions', + 'maintainer': 'Cybrosys Techno Solutions', + 'website': "https://www.cybrosys.com", + 'depends': ['account'], + 'data': [ + 'security/ir.model.access.csv', + 'data/ir_actions_server_data.xml', + 'wizard/merge_invoice_views.xml', + ], + 'images': ['static/description/banner.jpg'], + 'license': 'AGPL-3', + 'installable': True, + 'auto_install': False, + 'application': False +} diff --git a/invoice_merging/data/ir_actions_server_data.xml b/invoice_merging/data/ir_actions_server_data.xml new file mode 100644 index 000000000..15b62bbdb --- /dev/null +++ b/invoice_merging/data/ir_actions_server_data.xml @@ -0,0 +1,16 @@ + + + + + + Merge Invoices/Bills + + + list + code + + action = records.action_merge_invoice() + + + + diff --git a/invoice_merging/doc/RELEASE_NOTES.md b/invoice_merging/doc/RELEASE_NOTES.md new file mode 100644 index 000000000..20c7d6d7c --- /dev/null +++ b/invoice_merging/doc/RELEASE_NOTES.md @@ -0,0 +1,6 @@ +## Module + +#### 22.05.2025 +#### Version 18.0.1.0.0 +##### ADD +- Initial Commit for Merge Invoices diff --git a/invoice_merging/models/__init__.py b/invoice_merging/models/__init__.py new file mode 100644 index 000000000..016ff3ac2 --- /dev/null +++ b/invoice_merging/models/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2025-TODAY Cybrosys Technologies() +# Author: Aysha Shalin (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 account_move diff --git a/invoice_merging/models/account_move.py b/invoice_merging/models/account_move.py new file mode 100644 index 000000000..6f73a6636 --- /dev/null +++ b/invoice_merging/models/account_move.py @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2025-TODAY Cybrosys Technologies() +# Author: Aysha Shalin (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 api, fields, models, _ + + +class AccountMove(models.Model): + """ + Inherit AccountMove class for add merge invoice action function, + Method: action_merge_invoice(self): + Create new wizard with selected records + """ + _inherit = "account.move" + + @api.model + def name_search(self, name='', args=None, operator='ilike', limit=100): + """Displays partner name along with invoice name for merging purpose""" + args = args or [] + res = super().name_search(name, args, operator, limit) + + if self.env.context.get('display_invoice_with_partner'): + records = self.browse([r[0] for r in res]) + return [ + ( + rec.id, + f"{rec.name or ('Draft' if rec.state == 'draft' else '')} - " + f"{rec.partner_id.display_name or ''}" + ) + for rec in records + ] + return res + + def action_merge_invoice(self): + """ Method to create invoice merge wizard """ + merge_invoice = self.env['merge.invoice'].create({ + 'invoice_ids': [fields.Command.set(self.ids)], + }) + return { + 'name': _('Merge Invoices'), + 'type': 'ir.actions.act_window', + 'res_model': 'merge.invoice', + 'view_mode': 'form', + 'res_id': merge_invoice.id, + 'target': 'new' + } diff --git a/invoice_merging/security/ir.model.access.csv b/invoice_merging/security/ir.model.access.csv new file mode 100644 index 000000000..fc4db92af --- /dev/null +++ b/invoice_merging/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_invoice_user,access.merge.invoice.user,model_merge_invoice,base.group_user,1,1,1,1 diff --git a/invoice_merging/static/description/assets/icons/arrows-repeat.svg b/invoice_merging/static/description/assets/icons/arrows-repeat.svg new file mode 100644 index 000000000..1d7efabc5 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/arrows-repeat.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/banner-1.png b/invoice_merging/static/description/assets/icons/banner-1.png new file mode 100644 index 000000000..c180db172 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/banner-1.png differ diff --git a/invoice_merging/static/description/assets/icons/banner-2.svg b/invoice_merging/static/description/assets/icons/banner-2.svg new file mode 100644 index 000000000..e606d97d9 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/banner-2.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/banner-bg.png b/invoice_merging/static/description/assets/icons/banner-bg.png new file mode 100644 index 000000000..a8238d3c0 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/banner-bg.png differ diff --git a/invoice_merging/static/description/assets/icons/banner-bg.svg b/invoice_merging/static/description/assets/icons/banner-bg.svg new file mode 100644 index 000000000..b1378103e --- /dev/null +++ b/invoice_merging/static/description/assets/icons/banner-bg.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/banner-call.svg b/invoice_merging/static/description/assets/icons/banner-call.svg new file mode 100644 index 000000000..96c687e81 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/banner-call.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/invoice_merging/static/description/assets/icons/banner-mail.svg b/invoice_merging/static/description/assets/icons/banner-mail.svg new file mode 100644 index 000000000..cbf0d158d --- /dev/null +++ b/invoice_merging/static/description/assets/icons/banner-mail.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/invoice_merging/static/description/assets/icons/banner-pattern.svg b/invoice_merging/static/description/assets/icons/banner-pattern.svg new file mode 100644 index 000000000..9c1c7e101 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/banner-pattern.svg @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/banner-promo.svg b/invoice_merging/static/description/assets/icons/banner-promo.svg new file mode 100644 index 000000000..d52791b11 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/banner-promo.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/brand-pair.svg b/invoice_merging/static/description/assets/icons/brand-pair.svg new file mode 100644 index 000000000..d8db7fc1e --- /dev/null +++ b/invoice_merging/static/description/assets/icons/brand-pair.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/check.png b/invoice_merging/static/description/assets/icons/check.png new file mode 100644 index 000000000..c8e85f51d Binary files /dev/null and b/invoice_merging/static/description/assets/icons/check.png differ diff --git a/invoice_merging/static/description/assets/icons/chevron.png b/invoice_merging/static/description/assets/icons/chevron.png new file mode 100644 index 000000000..2089293d6 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/chevron.png differ diff --git a/invoice_merging/static/description/assets/icons/close-icon.svg b/invoice_merging/static/description/assets/icons/close-icon.svg new file mode 100644 index 000000000..df8cce37a --- /dev/null +++ b/invoice_merging/static/description/assets/icons/close-icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/invoice_merging/static/description/assets/icons/cogs.png b/invoice_merging/static/description/assets/icons/cogs.png new file mode 100644 index 000000000..95d0bad62 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/cogs.png differ diff --git a/invoice_merging/static/description/assets/icons/collabarate-icon.svg b/invoice_merging/static/description/assets/icons/collabarate-icon.svg new file mode 100644 index 000000000..dd4e10518 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/collabarate-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/invoice_merging/static/description/assets/icons/consultation.png b/invoice_merging/static/description/assets/icons/consultation.png new file mode 100644 index 000000000..8319d4baa Binary files /dev/null and b/invoice_merging/static/description/assets/icons/consultation.png differ diff --git a/invoice_merging/static/description/assets/icons/cybro-logo.png b/invoice_merging/static/description/assets/icons/cybro-logo.png new file mode 100644 index 000000000..ff4b78220 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/cybro-logo.png differ diff --git a/invoice_merging/static/description/assets/icons/down.svg b/invoice_merging/static/description/assets/icons/down.svg new file mode 100644 index 000000000..f21c36271 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/invoice_merging/static/description/assets/icons/ecom-black.png b/invoice_merging/static/description/assets/icons/ecom-black.png new file mode 100644 index 000000000..a9385ff13 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/ecom-black.png differ diff --git a/invoice_merging/static/description/assets/icons/education-black.png b/invoice_merging/static/description/assets/icons/education-black.png new file mode 100644 index 000000000..3eb09b27b Binary files /dev/null and b/invoice_merging/static/description/assets/icons/education-black.png differ diff --git a/invoice_merging/static/description/assets/icons/faq.png b/invoice_merging/static/description/assets/icons/faq.png new file mode 100644 index 000000000..4250b5b81 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/faq.png differ diff --git a/invoice_merging/static/description/assets/icons/feature-icon.svg b/invoice_merging/static/description/assets/icons/feature-icon.svg new file mode 100644 index 000000000..fa0ea6850 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/feature-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/feature.png b/invoice_merging/static/description/assets/icons/feature.png new file mode 100644 index 000000000..ac7a785c0 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/feature.png differ diff --git a/invoice_merging/static/description/assets/icons/gear.svg b/invoice_merging/static/description/assets/icons/gear.svg new file mode 100644 index 000000000..0cc66b6ea --- /dev/null +++ b/invoice_merging/static/description/assets/icons/gear.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/hero.gif b/invoice_merging/static/description/assets/icons/hero.gif new file mode 100644 index 000000000..380654dfe Binary files /dev/null and b/invoice_merging/static/description/assets/icons/hero.gif differ diff --git a/invoice_merging/static/description/assets/icons/hire-odoo.svg b/invoice_merging/static/description/assets/icons/hire-odoo.svg new file mode 100644 index 000000000..e1ac089b0 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/hire-odoo.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/hotel-black.png b/invoice_merging/static/description/assets/icons/hotel-black.png new file mode 100644 index 000000000..130f613be Binary files /dev/null and b/invoice_merging/static/description/assets/icons/hotel-black.png differ diff --git a/invoice_merging/static/description/assets/icons/license.png b/invoice_merging/static/description/assets/icons/license.png new file mode 100644 index 000000000..a5869797e Binary files /dev/null and b/invoice_merging/static/description/assets/icons/license.png differ diff --git a/invoice_merging/static/description/assets/icons/life-ring-icon.svg b/invoice_merging/static/description/assets/icons/life-ring-icon.svg new file mode 100644 index 000000000..3ae6e1d89 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/life-ring-icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/lifebuoy.png b/invoice_merging/static/description/assets/icons/lifebuoy.png new file mode 100644 index 000000000..658d56ccc Binary files /dev/null and b/invoice_merging/static/description/assets/icons/lifebuoy.png differ diff --git a/invoice_merging/static/description/assets/icons/mail.svg b/invoice_merging/static/description/assets/icons/mail.svg new file mode 100644 index 000000000..1eedde695 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/mail.svg @@ -0,0 +1,3 @@ + + + diff --git a/invoice_merging/static/description/assets/icons/manufacturing-black.png b/invoice_merging/static/description/assets/icons/manufacturing-black.png new file mode 100644 index 000000000..697eb0e9f Binary files /dev/null and b/invoice_merging/static/description/assets/icons/manufacturing-black.png differ diff --git a/invoice_merging/static/description/assets/icons/notes.png b/invoice_merging/static/description/assets/icons/notes.png new file mode 100644 index 000000000..ee5e95404 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/notes.png differ diff --git a/invoice_merging/static/description/assets/icons/notification icon.svg b/invoice_merging/static/description/assets/icons/notification icon.svg new file mode 100644 index 000000000..053189973 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/notification icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/odoo-consultancy.svg b/invoice_merging/static/description/assets/icons/odoo-consultancy.svg new file mode 100644 index 000000000..e05f65bde --- /dev/null +++ b/invoice_merging/static/description/assets/icons/odoo-consultancy.svg @@ -0,0 +1,4 @@ + + + + diff --git a/invoice_merging/static/description/assets/icons/odoo-licencing.svg b/invoice_merging/static/description/assets/icons/odoo-licencing.svg new file mode 100644 index 000000000..2606c88b0 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/odoo-licencing.svg @@ -0,0 +1,3 @@ + + + diff --git a/invoice_merging/static/description/assets/icons/odoo-logo.png b/invoice_merging/static/description/assets/icons/odoo-logo.png new file mode 100644 index 000000000..0e4d0eb5a Binary files /dev/null and b/invoice_merging/static/description/assets/icons/odoo-logo.png differ diff --git a/invoice_merging/static/description/assets/icons/patter.svg b/invoice_merging/static/description/assets/icons/patter.svg new file mode 100644 index 000000000..25c9c0a8f --- /dev/null +++ b/invoice_merging/static/description/assets/icons/patter.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/pattern1.png b/invoice_merging/static/description/assets/icons/pattern1.png new file mode 100644 index 000000000..09ab0fb2d Binary files /dev/null and b/invoice_merging/static/description/assets/icons/pattern1.png differ diff --git a/invoice_merging/static/description/assets/icons/pos-black.png b/invoice_merging/static/description/assets/icons/pos-black.png new file mode 100644 index 000000000..97c0f90c1 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/pos-black.png differ diff --git a/invoice_merging/static/description/assets/icons/puzzle-piece-icon.svg b/invoice_merging/static/description/assets/icons/puzzle-piece-icon.svg new file mode 100644 index 000000000..3e9ad9373 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/puzzle-piece-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/puzzle.png b/invoice_merging/static/description/assets/icons/puzzle.png new file mode 100644 index 000000000..65cf854e7 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/puzzle.png differ diff --git a/invoice_merging/static/description/assets/icons/replace-icon.svg b/invoice_merging/static/description/assets/icons/replace-icon.svg new file mode 100644 index 000000000..d0e3a7af1 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/replace-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/restaurant-black.png b/invoice_merging/static/description/assets/icons/restaurant-black.png new file mode 100644 index 000000000..4a35eb939 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/restaurant-black.png differ diff --git a/invoice_merging/static/description/assets/icons/screenshot-main.png b/invoice_merging/static/description/assets/icons/screenshot-main.png new file mode 100644 index 000000000..575f8e676 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/screenshot-main.png differ diff --git a/invoice_merging/static/description/assets/icons/screenshot.png b/invoice_merging/static/description/assets/icons/screenshot.png new file mode 100644 index 000000000..cef272529 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/screenshot.png differ diff --git a/invoice_merging/static/description/assets/icons/service-black.png b/invoice_merging/static/description/assets/icons/service-black.png new file mode 100644 index 000000000..301ab51cb Binary files /dev/null and b/invoice_merging/static/description/assets/icons/service-black.png differ diff --git a/invoice_merging/static/description/assets/icons/skype-fill.svg b/invoice_merging/static/description/assets/icons/skype-fill.svg new file mode 100644 index 000000000..c17423639 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/skype-fill.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/skype.png b/invoice_merging/static/description/assets/icons/skype.png new file mode 100644 index 000000000..51b409fb3 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/skype.png differ diff --git a/invoice_merging/static/description/assets/icons/skype.svg b/invoice_merging/static/description/assets/icons/skype.svg new file mode 100644 index 000000000..df3dad39b --- /dev/null +++ b/invoice_merging/static/description/assets/icons/skype.svg @@ -0,0 +1,3 @@ + + + diff --git a/invoice_merging/static/description/assets/icons/star-1.svg b/invoice_merging/static/description/assets/icons/star-1.svg new file mode 100644 index 000000000..7e55ab162 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/star-1.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/star-2.svg b/invoice_merging/static/description/assets/icons/star-2.svg new file mode 100644 index 000000000..5ae9f507a --- /dev/null +++ b/invoice_merging/static/description/assets/icons/star-2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/support.png b/invoice_merging/static/description/assets/icons/support.png new file mode 100644 index 000000000..4f18b8b82 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/support.png differ diff --git a/invoice_merging/static/description/assets/icons/test-1 - Copy.png b/invoice_merging/static/description/assets/icons/test-1 - Copy.png new file mode 100644 index 000000000..f6a902663 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/test-1 - Copy.png differ diff --git a/invoice_merging/static/description/assets/icons/test-1.png b/invoice_merging/static/description/assets/icons/test-1.png new file mode 100644 index 000000000..0908add2b Binary files /dev/null and b/invoice_merging/static/description/assets/icons/test-1.png differ diff --git a/invoice_merging/static/description/assets/icons/test-2.png b/invoice_merging/static/description/assets/icons/test-2.png new file mode 100644 index 000000000..4671fe91e Binary files /dev/null and b/invoice_merging/static/description/assets/icons/test-2.png differ diff --git a/invoice_merging/static/description/assets/icons/trading-black.png b/invoice_merging/static/description/assets/icons/trading-black.png new file mode 100644 index 000000000..9398ba2f1 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/trading-black.png differ diff --git a/invoice_merging/static/description/assets/icons/training.png b/invoice_merging/static/description/assets/icons/training.png new file mode 100644 index 000000000..884ca024d Binary files /dev/null and b/invoice_merging/static/description/assets/icons/training.png differ diff --git a/invoice_merging/static/description/assets/icons/translate.svg b/invoice_merging/static/description/assets/icons/translate.svg new file mode 100644 index 000000000..af9c8a1aa --- /dev/null +++ b/invoice_merging/static/description/assets/icons/translate.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/update.png b/invoice_merging/static/description/assets/icons/update.png new file mode 100644 index 000000000..ecbc5a01a Binary files /dev/null and b/invoice_merging/static/description/assets/icons/update.png differ diff --git a/invoice_merging/static/description/assets/icons/user.png b/invoice_merging/static/description/assets/icons/user.png new file mode 100644 index 000000000..6ffb23d9f Binary files /dev/null and b/invoice_merging/static/description/assets/icons/user.png differ diff --git a/invoice_merging/static/description/assets/icons/video.png b/invoice_merging/static/description/assets/icons/video.png new file mode 100644 index 000000000..576705b17 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/video.png differ diff --git a/invoice_merging/static/description/assets/icons/whatsapp.png b/invoice_merging/static/description/assets/icons/whatsapp.png new file mode 100644 index 000000000..d513a5356 Binary files /dev/null and b/invoice_merging/static/description/assets/icons/whatsapp.png differ diff --git a/invoice_merging/static/description/assets/icons/wrench-icon.svg b/invoice_merging/static/description/assets/icons/wrench-icon.svg new file mode 100644 index 000000000..174b5a465 --- /dev/null +++ b/invoice_merging/static/description/assets/icons/wrench-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/invoice_merging/static/description/assets/icons/wrench.png b/invoice_merging/static/description/assets/icons/wrench.png new file mode 100644 index 000000000..6c04dea0f Binary files /dev/null and b/invoice_merging/static/description/assets/icons/wrench.png differ diff --git a/invoice_merging/static/description/assets/modules/1.jpg b/invoice_merging/static/description/assets/modules/1.jpg new file mode 100644 index 000000000..9076676c1 Binary files /dev/null and b/invoice_merging/static/description/assets/modules/1.jpg differ diff --git a/invoice_merging/static/description/assets/modules/2.png b/invoice_merging/static/description/assets/modules/2.png new file mode 100644 index 000000000..738d65baf Binary files /dev/null and b/invoice_merging/static/description/assets/modules/2.png differ diff --git a/invoice_merging/static/description/assets/modules/3.png b/invoice_merging/static/description/assets/modules/3.png new file mode 100644 index 000000000..5b5797908 Binary files /dev/null and b/invoice_merging/static/description/assets/modules/3.png differ diff --git a/invoice_merging/static/description/assets/modules/4.png b/invoice_merging/static/description/assets/modules/4.png new file mode 100644 index 000000000..cf36ebd39 Binary files /dev/null and b/invoice_merging/static/description/assets/modules/4.png differ diff --git a/invoice_merging/static/description/assets/modules/5.jpg b/invoice_merging/static/description/assets/modules/5.jpg new file mode 100644 index 000000000..9076676c1 Binary files /dev/null and b/invoice_merging/static/description/assets/modules/5.jpg differ diff --git a/invoice_merging/static/description/assets/modules/6.jpg b/invoice_merging/static/description/assets/modules/6.jpg new file mode 100644 index 000000000..a83c58aac Binary files /dev/null and b/invoice_merging/static/description/assets/modules/6.jpg differ diff --git a/invoice_merging/static/description/assets/screenshots/1.png b/invoice_merging/static/description/assets/screenshots/1.png new file mode 100644 index 000000000..413502ee0 Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/1.png differ diff --git a/invoice_merging/static/description/assets/screenshots/11.png b/invoice_merging/static/description/assets/screenshots/11.png new file mode 100644 index 000000000..cc3989092 Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/11.png differ diff --git a/invoice_merging/static/description/assets/screenshots/12.png b/invoice_merging/static/description/assets/screenshots/12.png new file mode 100644 index 000000000..13bc2d5cf Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/12.png differ diff --git a/invoice_merging/static/description/assets/screenshots/5.png b/invoice_merging/static/description/assets/screenshots/5.png new file mode 100644 index 000000000..50f303909 Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/5.png differ diff --git a/invoice_merging/static/description/assets/screenshots/6.png b/invoice_merging/static/description/assets/screenshots/6.png new file mode 100644 index 000000000..53e897e24 Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/6.png differ diff --git a/invoice_merging/static/description/assets/screenshots/7.png b/invoice_merging/static/description/assets/screenshots/7.png new file mode 100644 index 000000000..f63acfcdc Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/7.png differ diff --git a/invoice_merging/static/description/assets/screenshots/8.png b/invoice_merging/static/description/assets/screenshots/8.png new file mode 100644 index 000000000..547a7052f Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/8.png differ diff --git a/invoice_merging/static/description/assets/screenshots/9.png b/invoice_merging/static/description/assets/screenshots/9.png new file mode 100644 index 000000000..7dc59dd41 Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/9.png differ diff --git a/invoice_merging/static/description/assets/screenshots/hero.gif b/invoice_merging/static/description/assets/screenshots/hero.gif new file mode 100644 index 000000000..496dfa0cf Binary files /dev/null and b/invoice_merging/static/description/assets/screenshots/hero.gif differ diff --git a/invoice_merging/static/description/banner.jpg b/invoice_merging/static/description/banner.jpg new file mode 100644 index 000000000..960a72aa8 Binary files /dev/null and b/invoice_merging/static/description/banner.jpg differ diff --git a/invoice_merging/static/description/icon.png b/invoice_merging/static/description/icon.png new file mode 100644 index 000000000..044837478 Binary files /dev/null and b/invoice_merging/static/description/icon.png differ diff --git a/invoice_merging/static/description/index.html b/invoice_merging/static/description/index.html new file mode 100644 index 000000000..2d411fe20 --- /dev/null +++ b/invoice_merging/static/description/index.html @@ -0,0 +1,1083 @@ + + + + + + Merge Invoices + + + + + + + + + + +
+
+ + + +
+
+ Community +
+
+ Enterprise +
+
+ Odoo.sh +
+
+
+ +
+
+
+
+

+ This Module Helps to Manage All Types Of Account Moves By Merging. +

+

Merge Invoices +

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

Key + Highlights

+
+
+
+
+ +
+
+ Easy to manage Invoices, Credit notes, Bills, etc. +
+
+
+
+
+
+ +
+
+ Simply Select and Merge. +
+
+
+
+
+
+ +
+
+ Merge to 'Single Invoice/Bill' from + Existing Large number of Invoices/Bills. +
+
+
+
+
+
+ +
+
+ Option to Merge in to Existing Account Move. +
+
+
+
+
+
+ +
+
+ Track merged moves using payment reference field. +
+
+
+
+
+ +
+
+
+ Merge Invoices +

+ Are you ready to make your business more + organized? +
Improve now! +

+ +
+
+ +
+
+
+ + + +
+
+ +
+
+
+
+ acc_bg +
+ +
+
+
+
+

+ Select Multiple + + Invoices +

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

+ Merge the + + Invoices +

+
+
+

+ Option to Merge the Invoices under the Actions menu. +

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

+ Merge Confirmation + Window: +

+
+
+

+ Displays the Selected Invoices and Instructions for Use. +

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

+ Select the Invoice + to Merge +

+
+
+

+ When a new partner is selected from the wizard, a + new invoice is created with the existing invoice lines. + You can also choose what to do with the selected + invoices—either cancel them or keep them. +

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

+ Shows the Newly Created + Invoice +

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

+ Payment Reference Shows the + Merged Invoice Name +

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

+ Merge in to the + Existing Invoice +

+
+
+

+ If you choose the merging type 'Cancel Others,' + all selected invoices except the target + invoice will be canceled. +

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

+ Invoices Merged +

+
+
+

+ Other Invoices are Canceled. +

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

+ Merge Invoices, Credit notes, Bills etc.

+
+
+
+
+
+
+
+ +
+

+ Merge to single Invoice/Bill from existing Invoices/Bills.

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

+ Yes, you can select multiple + invoices and merge them into + a single invoice by choosing + a target invoice to merge into. +

+
+
+ +
+ +
+

+ Yes, it is possible to create + a new invoice for a different + partner by merging existing + invoices. +

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

+ Latest Release 18.0.1.0.0 +

+ + 19th May, 2025 + +
+
+
+
+
+ Add +
+
+
+
    +
  • + Initial Commit +
  • +
+
+
+
+
+
+
+
+
+
+ + + +
+

+ Related Products +

+ +
+ + +
+

+ Our Services

+ +
+
+ +
+
+ .... +
+
+ +
+
+
+ + + + + + diff --git a/invoice_merging/wizard/__init__.py b/invoice_merging/wizard/__init__.py new file mode 100644 index 000000000..43e5fc875 --- /dev/null +++ b/invoice_merging/wizard/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2025-TODAY Cybrosys Technologies() +# Author: Aysha Shalin (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_invoice diff --git a/invoice_merging/wizard/merge_invoice.py b/invoice_merging/wizard/merge_invoice.py new file mode 100644 index 000000000..b3a3bdaf6 --- /dev/null +++ b/invoice_merging/wizard/merge_invoice.py @@ -0,0 +1,96 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2025-TODAY Cybrosys Technologies() +# Author: Aysha Shalin (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 MergeInvoice(models.TransientModel): + """ + Main method to merge selected invoices + - If user select merge to existing then the selected invoices will be + merged to the selected record + - If no invoice is selected, then a new record will be created with the + existing picking lines + """ + _name = "merge.invoice" + _description = "Invoice Merge" + + invoice_ids = fields.Many2many('account.move', + string="Selected Invoices", + help="Selected invoices to merge") + partner_id = fields.Many2one('res.partner', string="Customer", + help="The new invoice will be created" + " for selected partner") + + target_invoice_id = fields.Many2one( + 'account.move', + string="Merge to existing", + context={'display_invoice_with_partner': True}, + help="Select an invoice if you want to merge other invoices to selected " + "one, otherwise leave it empty" + ) + + merge_type = fields.Selection( + [('cancel', 'Cancel Others'), ('keep', 'Keep Others')], + string="Merge type", default="cancel", + help="Select the merge type to decide what to do with other invoices") + + def action_merge_invoice(self): + """Method for merge invoices""" + # Checking for is there any exceptions + if len(list(set(self.invoice_ids))) == 1: + raise AccessError( + _("Merging is not possible on single Invoice or Bill")) + if any(state in ['posted', 'cancel'] for state in + self.invoice_ids.mapped('state')): + raise AccessError(_("Merging is only possible on draft state " + "Invoices or Bills")) + if len(list(set(self.invoice_ids.mapped('move_type')))) > 1: + raise AccessError(_("Merging is only possible for different type " + "moves, so please select the same type.")) + # If there is no exceptions continue with the merging + invoices = self.invoice_ids + invoice_lines = [] + pay_reference = [] + if self.target_invoice_id: + target_invoice = self.target_invoice_id + invoices -= self.target_invoice_id + pay_reference.append(target_invoice.name if + target_invoice.name != False else + f"Draft {str(target_invoice.id)}") + else: + target_invoice = self.env['account.move'].with_context( + check_move_validity=False).create( + {'partner_id': self.partner_id.id}) + for record in invoices: + for line in record.line_ids: + if line.display_type not in ["payment_term", "tax"]: + invoice_lines += line.with_context( + check_move_validity=False).copy( + {'move_id': target_invoice.id}) + pay_reference.append(record.name if + record.name != False else + f"Draft {str(record.id)}") + if self.merge_type == "cancel": + record.button_cancel() + target_invoice.write( + {'payment_reference': f"Merged ({(', '.join(pay_reference))})"}) diff --git a/invoice_merging/wizard/merge_invoice_views.xml b/invoice_merging/wizard/merge_invoice_views.xml new file mode 100644 index 000000000..e0effd1d6 --- /dev/null +++ b/invoice_merging/wizard/merge_invoice_views.xml @@ -0,0 +1,41 @@ + + + + + merge.invoice.view.form + merge.invoice + +
+ + + + + + + + + + + + + + + + + + + + +
+
+
+