Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIG][18.0] Migration of account_invoice_merge from 16.0 #1870

Open
wants to merge 96 commits into
base: 18.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
b1df261
[ADD] several new modules double confirmation, web wysiwyg etc.
May 10, 2012
4ae2acf
[FIX] correct naming bug
May 11, 2012
8319b59
account_invoice_merge: migrate module in V7. Add french translation.
Jun 25, 2013
5870045
account_invoice_merge: in copyright replace Erico-Corp by Elico Corp.
Jun 25, 2013
6432f44
translation for account_invoice_merge
Jul 17, 2013
9cd95e3
account_invoice_merge : replace osv by orm
Jul 17, 2013
e85cb03
account_invoice_merge : replace label from invoice_merge_view.xml wit…
Jul 17, 2013
77a77d8
account_invoice_merge : replace "todo_ids +=" by "todo_ids" and move …
Jul 17, 2013
dbe250a
account_invoice_merge : rename order to invoice
Jul 17, 2013
aed405e
account_invoice_merge: update dependance management
Jul 17, 2013
6c994aa
account_invoice_merge: use commercial_partner_id instead of partner_id
Jul 17, 2013
8a1b04a
account_invoice_merge: revert last commit (use of commercial_partner_id)
Jul 17, 2013
d6ad0af
account_invoice_merge: refactor do_merge method and some cleanup.
Jul 31, 2013
e480d82
[IMP] merge must linked order lines and new invoice lines (many2many …
rdeheele Jul 31, 2013
6f4362b
account_invoice_merge: update some labels
Aug 6, 2013
4724aed
Launchpad automatic translations update.
Jan 18, 2014
39c7604
Recreate link with invoices originating from account_analytic_line (e…
ddico Feb 1, 2014
ef1151a
Launchpad automatic translations update.
Mar 4, 2014
8c7108d
[FIX] invoice_id is not guaranteed to be in analytic line's columns
Mar 19, 2014
04bdf3e
Launchpad automatic translations update.
Mar 21, 2014
996f463
Launchpad automatic translations update.
Apr 26, 2014
ccd2b50
Fix PEP8
pedrobaeza Aug 13, 2014
2706053
set addons as unported to 8.0
gurneyalex Aug 20, 2014
603914d
Remove account_invoice_merge from __unported__
Jan 22, 2015
8fac827
Port to Odoo 8.0 and new api
Jan 26, 2015
d94bcf0
Remove deprecated nsvc package
Jan 27, 2015
3ff91b4
Replace methods returning a static tuple by variables
Jan 27, 2015
d012a03
Fix flake 8 issues
Jan 27, 2015
e7310d3
Fix pylint issues
Jan 27, 2015
2ff8071
Change except_orm with Warning argument by exceptions.Warning
Jan 28, 2015
d762a5f
[IMP] account_invoice_merge: README.rst
pedrobaeza Feb 2, 2015
11dd2d6
Forward port 7.0 to 8.0
Feb 2, 2015
a557237
PEP8 issue
Feb 2, 2015
c368385
Remove useless context copy
Feb 3, 2015
dee510e
No need to browse after search in new API
Feb 3, 2015
013afc7
Remove useless loop and prefer mass updating
Feb 3, 2015
4f97734
[IMP] Replace tuples with column names to list to be more flexible to…
adrienpeiffer Feb 4, 2015
4c49332
Add license key in __openerp__.py
yvaucher Feb 6, 2015
27466c4
[FIX]open view corresponding to the type of invoice
Feb 17, 2015
d9a0ee9
Let the choice to the user to keep or not the reference from original…
Feb 17, 2015
7c13e6c
[PEP8] fix blank line at end of file
Feb 18, 2015
55daf3d
Add OCA as author of OCA addons
gurneyalex Mar 2, 2015
31f974d
[IMP] Consider partner_bank_id field on account invoice merge
adrienpeiffer Mar 11, 2015
4b04710
[8.0] add date invoice on merge wizard
Mar 30, 2015
403067e
Slovenian translations added
sysadminmatmoz Apr 5, 2015
582e48a
Add bug tracker link on README.rst
yvaucher May 22, 2015
5269dbe
[IMP] Spanish location
Jun 9, 2015
7fde19e
[IMP] Spanish location corrections
Jun 10, 2015
2eeafd0
[ADD] support analytic plans
hbrunn Aug 31, 2015
ba1ccab
OCA Transbot updated translations from Transifex
oca-transbot Sep 1, 2015
d6ade56
[DEL][account_invoice_merge] Remove link with purchase
adrienpeiffer Aug 18, 2015
e9b7a34
[UPD] prefix versions with 8.0
sbidoul Oct 9, 2015
30c05c7
[MIG] Make modules uninstallable
pedrobaeza Oct 14, 2015
cbc0e2b
[FIX] remove en.po that was erroneously created by transbot
sbidoul Aug 15, 2016
f5edca8
[MIG] Rename manifest files
pedrobaeza Oct 6, 2016
c6ba516
account_invoice_merge: Migration to 9.0
Apr 4, 2016
fb70952
Use float_is_zero instead of != 0
alexis-via Nov 3, 2016
482f350
OCA Transbot updated translations from Transifex
oca-transbot Dec 10, 2016
6ee2795
[MIG] account_invoice_merge to v10
LoisRForgeFlow Mar 16, 2017
1bb496c
remove obsolete .pot files [ci skip]
sbidoul Jun 15, 2018
cfefd4c
[UPD] Update account_invoice_merge.pot
oca-travis Jun 19, 2018
d7e637e
[10.0][FIX] account_invoice_merge: fix wrong usage of non-existent xm…
Jul 26, 2018
304e8f2
[MIG] account_invoice_merge: Migration to 12.0
Feb 13, 2019
14eb511
[IMP] Make the function to get draft invoices & _dirty_check overridable
mourad-ehm Jun 16, 2020
17c46ff
Update translation files
oca-travis Jul 20, 2020
06d25f8
Translated using Weblate (Slovenian)
sysadminmatmoz Aug 11, 2020
0097a16
Update translation files
oca-transbot Aug 16, 2020
a528d82
Translated using Weblate (Spanish)
anasuarez1 Mar 11, 2021
f42cc48
[FIX] account_invoice_merge: compatibility with account_invoice_margi…
legalsylvain Apr 20, 2021
b6ee136
Translated using Weblate (Turkish)
aaltinisik Aug 24, 2021
f570c36
account_invoice_merge 12.0.1.0.2
OCA-git-bot Dec 4, 2021
a569e07
Translated using Weblate (Italian)
Dec 23, 2021
c169f9e
[IMP] account_invoice_merge: black, isort, prettier
fredzamoabg Feb 28, 2022
e2b4457
[MIG] account_invoice_merge: Migration to 14.0
fredzamoabg Mar 1, 2022
030b62f
[15.0][MIG] account_invoice_merge
Freni-OSI Jun 28, 2022
0172f59
[16.0][MIG] account_invoice_merge: Migrate to version 16.0
nguyenminhchien Feb 23, 2023
7f6fff9
[UPD] Update account_invoice_merge.pot
Mar 23, 2023
9ff9acf
[UPD] README.rst
OCA-git-bot Mar 23, 2023
c9695ca
Update translation files
weblate Mar 23, 2023
061d0b9
Translated using Weblate (Italian)
mymage Mar 30, 2023
c3d10cf
Translated using Weblate (Croatian)
badbole Apr 3, 2023
2018548
Translated using Weblate (Italian)
mymage Apr 10, 2023
f84a914
Translated using Weblate (Slovenian)
sysadminmatmoz Apr 11, 2023
87b9a70
Translated using Weblate (Italian)
mymage Apr 15, 2023
bb58919
Translated using Weblate (Italian)
mymage Apr 17, 2023
75979bc
Translated using Weblate (Spanish)
Gelo-fl Apr 18, 2023
2bb1c39
[FIX] account_invoice_merge: this commit fixes the incorrect link bet…
RodrigoBM May 4, 2023
3af6948
account_invoice_merge 16.0.1.0.1
OCA-git-bot May 12, 2023
acc32b8
Translated using Weblate (Portuguese (Brazil))
adrianojprado Jul 1, 2023
6212f49
[UPD] README.rst
OCA-git-bot Sep 3, 2023
662638f
Update translation files
weblate Oct 9, 2023
a5f60bf
Translated using Weblate (Italian)
mymage Feb 21, 2024
3127ecf
Translated using Weblate (Swedish)
jakobkrabbe Feb 27, 2024
d39194c
Translated using Weblate (Catalan)
Jaimermaccione Jul 9, 2024
48883df
[IMP] account_invoice_merge: pre-commit auto fixes
acsonefho Dec 31, 2024
470d61a
[MIG] account_invoice_merge: Migration to 18.0
acsonefho Dec 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 119 additions & 0 deletions account_invoice_merge/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
=====================
Account Invoice Merge
=====================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:651021e32ffff00752cf1bf5fb2f7a648a2cd05de7d30f50cdd816492245cf3d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--invoicing-lightgray.png?logo=github
:target: https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_merge
:alt: OCA/account-invoicing
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-invoicing-18-0/account-invoicing-18-0-account_invoice_merge
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-invoicing&target_branch=18.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

This module adds an action in the invoices list to merge invoices. Here
are the conditions to allow merging:

- Type should be the same (Customer Invoice, Supplier Invoice, Customer
Refund or Supplier Refund)
- Partner should be the same
- Currency should be the same
- Account receivable account should be the same

**Table of contents**

.. contents::
:local:

Configuration
=============



Usage
=====

Go to a invoice tree view, select several invoices and click expand the
action button and click 'Merge Partner Invoice'.

|Try me on Runbot|

.. |Try me on Runbot| image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:target: https://runbot.odoo-community.org/runbot/95/10.0

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-invoicing/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-invoicing/issues/new?body=module:%20account_invoice_merge%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
-------

* Elico Corp

Contributors
------------

- Ian Li <[email protected]>

- Cédric Pigeon <[email protected]>

- Lois Rilo <[email protected]>

- Miquel Raïch <[email protected]>

- Sylvain Van Hoof <[email protected]>

- Freni Patel <[email protected]>

- `Trobz <https://trobz.com>`__:

- Nguyễn Minh Chiến <[email protected]>

Other credits
-------------

The migration of this module from 15.0 to 16.0 was financially supported
by Camptocamp

Maintainers
-----------

This module is maintained by the OCA.

.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org

OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

This module is part of the `OCA/account-invoicing <https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_merge>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
9 changes: 9 additions & 0 deletions account_invoice_merge/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright 2004-2010 Tiny SPRL (http://tiny.be).
# Copyright 2010-2011 Elico Corp.
# Copyright 2016 Acsone (https://www.acsone.eu/)
# Copyright 2017 Eficent Business and IT Consulting Services S.L.
# (http://www.eficent.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

from . import models
from . import wizard
23 changes: 23 additions & 0 deletions account_invoice_merge/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright 2004-2010 Tiny SPRL (http://tiny.be).
# Copyright 2010-2011 Elico Corp.
# Copyright 2016 Acsone (https://www.acsone.eu/)
# Copyright 2017 Eficent Business and IT Consulting Services S.L.
# (http://www.eficent.com)
# Copyright 2019 Okia SPRL
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

{
"name": "Account Invoice Merge",
"version": "18.0.1.0.1",
"category": "Finance",
"summary": "Merge invoices in draft",
"author": "Elico Corp,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/account-invoicing",
"license": "AGPL-3",
"depends": ["account"],
"data": [
"security/ir.model.access.csv",
"wizard/invoice_merge_view.xml",
],
"installable": True,
}
133 changes: 133 additions & 0 deletions account_invoice_merge/i18n/account_invoice_merge.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_invoice_merge
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: account_invoice_merge
#. odoo-python
#: code:addons/account_invoice_merge/wizard/invoice_merge.py:0
#, python-format
msgid "All invoices must have the same: \n"
msgstr ""

#. module: account_invoice_merge
#: model_terms:ir.ui.view,arch_db:account_invoice_merge.view_invoice_merge
msgid "Are you sure you want to merge these invoices?"
msgstr ""

#. module: account_invoice_merge
#: model_terms:ir.ui.view,arch_db:account_invoice_merge.view_invoice_merge
msgid "Cancel"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__create_uid
msgid "Created by"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__create_date
msgid "Created on"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__display_name
msgid "Display Name"
msgstr ""

#. module: account_invoice_merge
#. odoo-python
#: code:addons/account_invoice_merge/wizard/invoice_merge.py:0
#, python-format
msgid "Draft"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__error_message
msgid "Error Message"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__id
msgid "ID"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__date_invoice
msgid "Invoice Date"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model,name:account_invoice_merge.model_account_move
msgid "Journal Entry"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__keep_references
msgid "Keep references from original invoices"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge____last_update
msgid "Last Modified on"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__write_uid
msgid "Last Updated by"
msgstr ""

#. module: account_invoice_merge
#: model:ir.model.fields,field_description:account_invoice_merge.field_invoice_merge__write_date
msgid "Last Updated on"
msgstr ""

#. module: account_invoice_merge
#: model_terms:ir.ui.view,arch_db:account_invoice_merge.view_invoice_merge
msgid "Merge Invoices"
msgstr ""

#. module: account_invoice_merge
#: model:ir.actions.act_window,name:account_invoice_merge.action_view_invoice_merge
#: model:ir.model,name:account_invoice_merge.model_invoice_merge
#: model_terms:ir.ui.view,arch_db:account_invoice_merge.view_invoice_merge
msgid "Merge Partner Invoice"
msgstr ""

#. module: account_invoice_merge
#. odoo-python
#: code:addons/account_invoice_merge/wizard/invoice_merge.py:0
#, python-format
msgid "Merge-able State (ex : %s)"
msgstr ""

#. module: account_invoice_merge
#: model_terms:ir.ui.view,arch_db:account_invoice_merge.view_invoice_merge
msgid ""
"Please note that:<br/><br/>\n"
" Invoices will only be merged if:<br/>\n"
" * Invoices are in state 'draft'.<br/>\n"
" * Invoices belong to the same partner.<br/>\n"
" * Invoices have the same company, partner, address,\n"
" currency, journal, salesman, account and type.<br/><br/>\n"
" Lines will only be merged if:<br/>\n"
" * Invoice lines are exactly the same except for the\n"
" product, quantity and unit.<br/>"
msgstr ""

#. module: account_invoice_merge
#. odoo-python
#: code:addons/account_invoice_merge/wizard/invoice_merge.py:0
#, python-format
msgid "Please select multiple invoices to merge in the list view."
msgstr ""
Loading
Loading