Merge lp:~laetitia-gangloff/account-invoicing/account_invoice_merge into lp:~account-core-editors/account-invoicing/7.0

[Laetitia Gangloff (Acsone)]

Add (and migrate in v7.0) module account_invoice_merge from lp:~openerp-community/openobject-addons/elico-6.0.

"This module adds an action in the invoices lists to merge of invoices. Here are the condition to allow merge:
- Type should be the same (customer Invoice, supplier invoice, Customer or Supplier Refund)
- Partner should be the same
- Currency should be the same
- Account receivable account should be the same"

[Eric Caudal - www.elico-corp.com (elicoidal)]

On my side: the copyright should be Elico Corp and not Erico-Corp
Eric CAUDAL

Eric Caudal
/CEO/
--
*Elico Corporation, Shanghai branch
/OpenERP Premium Certified Training Partner/ *
Cell: + 86 186 2136 1670
Office: + 86 21 6211 8017/27/37
Skype: elico.corp
<email address hidden> <mailto:<email address hidden>>
http://www.elico-corp.com

Elico Corp
On 06/25/2013 05:25 PM, Laetitia Gangloff (Acsone) wrote:
> Laetitia Gangloff (Acsone) has proposed merging lp:~laetitia-gangloff/account-invoicing/account_invoice_merge into lp:account-invoicing.
>
> Requested reviews:
> Acsone OpenErp Team (acsone-openerp)
>
> For more details, see:
> https://code.launchpad.net/~laetitia-gangloff/account-invoicing/account_invoice_merge/+merge/171247
>
> Add (and migrate in v7.0) module account_invoice_merge from lp:~openerp-community/openobject-addons/elico-6.0.
>
> "This module adds an action in the invoices lists to merge of invoices. Here are the condition to allow merge:
> - Type should be the same (customer Invoice, supplier invoice, Customer or Supplier Refund)
> - Partner should be the same
> - Currency should be the same
> - Account receivable account should be the same"

[lp:~laetitia-gangloff/account-invoicing/account_invoice_merge]

22. By Laetitia Gangloff (Acsone) on 2013-06-25

account_invoice_merge: in copyright replace Erico-Corp by Elico Corp.

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

I replaced "Copyright (C) 2011-2012 Erico-Corp (<http://www.openerp.net.cn>)." by "Copyright (c) 2010-2011 Elico Corp. All Rights Reserved."

Note that the file zh_CN.po need revision.

[Eric Caudal - www.elico-corp.com (elicoidal)]

Hi Laetitia,
I am not so familiar with the lp contribution process. For the zh_CN
file what shall I do:
1. Branch the lp
2. Change the po file
3. propose for merge with bzr merge

Thanks for helping...
Eric CAUDAL

Eric Caudal
/CEO/
--
*Elico Corporation, Shanghai branch
/OpenERP Premium Certified Training Partner/ *
Cell: + 86 186 2136 1670
Office: + 86 21 6211 8017/27/37
Skype: elico.corp
<email address hidden> <mailto:<email address hidden>>
http://www.elico-corp.com

Elico Corp
On 06/25/2013 06:11 PM, Laetitia Gangloff (Acsone) wrote:
> I replaced "Copyright (C) 2011-2012 Erico-Corp (<http://www.openerp.net.cn>)." by "Copyright (c) 2010-2011 Elico Corp. All Rights Reserved."
>
> Note that the file zh_CN.po need revision.

[Stéphane Bidoul (Acsone) (sbi)]

Hi Eric,

I think the easiest would go as follow:
- you bzr branch lp:~laetitia-gangloff/account-invoicing/account_invoice_merge
- you commit and bzr push lp:~elicoidal/account-invoicing/account_invoice_merge_zh_CN_fix
- Laetitia merges lp:~elicoidal/account-invoicing/account_invoice_merge_zh_CN_fix in her branch
- we continue the review process on this MP

-sbi

[lp:~laetitia-gangloff/account-invoicing/account_invoice_merge]

23. By Laetitia Gangloff (Acsone) on 2013-07-17

Merge from account_invoice_merge_zh_CN_fix

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

I merged the branch https://code.launchpad.net/~lin-yu/account-invoicing/account_invoice_merge_zh_CN_fix into this one.

I think this proposal can be review.

Thank you.

[Stéphane Bidoul (Acsone) (sbi)]

A few comments (code reading only, no test at this stage):
- osv.osv deprecated, use orm.Model instead
- initially I was a bit confused because the code in invoice.py uses "order" variables where it actually treats invoices, I would to rename these variables for readability

review: Needs Fixing

[Niels Huylebroeck (red15)]

Got some remarks on the view:
'account_invoice_merge/wizard/invoice_merge_view.xml'

You use form version 7 but still use a label with a big ugly string which contains '&#10;' characters to break lines.
I would think that using clean and simple html would be a better fit here ? Perhaps a few clean <p> tags to bundle the text.

A question about the merge key, would it not be better to use the commercial_entity instead of the regular partner_id ?
This could obviously lead to somewhat unexpected behaviour which will merge invoices that were meant for different departments within a company maybe but this itself could also be considered a desireable feature.
Perhaps the merge wizard should ask the user if it has to merge invoices for the same entity or only per "address"?

[Stéphane Bidoul (Acsone) (sbi)]

Bug fix: in wizard/invoice_merge.py, replace "todo_ids +=" by "todo_ids =". Otherwise the browse on po tries to browse so ids.

Also, I would move this part which reconnects the so/po to the invoices from wizard/invoice_merge.py to invoice.py/do_merge() so do_merge implements the whole algorithm and can be called from elsewhere without surprise.

review: Needs Fixing (testing)

[lp:~laetitia-gangloff/account-invoicing/account_invoice_merge]

24. By Laetitia Gangloff (Acsone) on 2013-07-17

account_invoice_merge : replace osv by orm

25. By Laetitia Gangloff (Acsone) on 2013-07-17

account_invoice_merge : replace label from invoice_merge_view.xml with html

26. By Laetitia Gangloff (Acsone) on 2013-07-17

account_invoice_merge : replace "todo_ids +=" by "todo_ids" and move it in invoice.py

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

Hello,

I use orm instead of osv.
I rewrite the label of the view 'account_invoice_merge/wizard/invoice_merge_view.xml'.
I replace "todo_ids +=" by "todo_ids =" and move this part in invoice.py.

[lp:~laetitia-gangloff/account-invoicing/account_invoice_merge]

27. By Laetitia Gangloff (Acsone) on 2013-07-17

account_invoice_merge : rename order to invoice

28. By Laetitia Gangloff (Acsone) on 2013-07-17

account_invoice_merge: update dependance management

29. By Laetitia Gangloff (Acsone) on 2013-07-17

account_invoice_merge: use commercial_partner_id instead of partner_id

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

I rename 'order' in 'invoice'.
I replace dependance on sale and purchase by checking if modules are loaded.

As you suggest, I use commercial_partner_id instead of partner_id for the merge key.

Thank you.

[Stéphane Bidoul (Acsone) (sbi)]

@Niels,

Now that I think of it, the merge of invoices to different partner_id would result in silently using the contact of the first invoice and dropping the others.

To solve this the wizard would need to be made more sophisticated, so we'll leave that improvement to future contributors.

-sbi

[lp:~laetitia-gangloff/account-invoicing/account_invoice_merge]

30. By Laetitia Gangloff (Acsone) on 2013-07-17

account_invoice_merge: revert last commit (use of commercial_partner_id)

[Stéphane Bidoul (Acsone) (sbi)]

Looks good. Approved!

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Is it the same module than?
https://code.launchpad.net/~camptocamp/account-financial-tools/7.0-add-account_invoice_merge/+merge/171119

Can both MPs converge in an unique MP?

review: Needs Information

[Stéphane Bidoul (Acsone) (sbi)]

Hello Guewen and community,

Y <email address hidden>es they the MP have the same goal and stem
from the same Elico module. Apparently both teams did the same work in the
exact same timeframe. Romain's branch came one day before Laetitia's.

There is a process question here: how can we (not being part of the
Community Reviewers group - yet :) receive notifications of changes and MP
to community branches? The question is even broader: how can someone
interested in doing some code review receive notifications of community
activities. Thanks in advance for hints in this area.

Now these two MP need to be merged. At first glance there is good
improvements in both. It seems Laetitia's branch got a bit more scrutiny so
far? Another way to decide which of the two goes forward could be to decide
the best project to receive it. Is it account-invoicing, or
account-financial-tools. My intuition would go to account-invoicing as this
module is exclusively about invoices.

-sbi

On Mon, Jul 22, 2013 at 10:20 AM, Guewen Baconnier @ Camptocamp <
<email address hidden>> wrote:

> Review: Needs Information
>
> Is it the same module than?
>
> https://code.launchpad.net/~camptocamp/account-financial-tools/7.0-add-account_invoice_merge/+merge/171119
>
> Can both MPs converge in an unique MP?
> --
>
> https://code.launchpad.net/~laetitia-gangloff/account-invoicing/account_invoice_merge/+merge/171247
> You are reviewing the proposed merge of
> lp:~laetitia-gangloff/account-invoicing/account_invoice_merge into
> lp:account-invoicing.
>

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

About which MP should be the base to converge both in one, it seams Leatitia's MP is more advanced in the porting with details such as in views specifics to v7.0 and few more cleaning.

Furthermore, I agree with Stéphane, account-invoicing is certainly better than account-financial-tools branch

So let's keep this branch and bring what is needed from Romain's one?

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

l490, fields imported but unused
l492 _ imported but unused
l538 bad indentation for comment

l500 - l629 do_merge method is too long - can be refactored using Romain's changes

l689 fields imported but unused

l760 doesn't po and so need to be rewritten with invoice ids ? (Romain's changes)

review: Needs Fixing

[lp:~laetitia-gangloff/account-invoicing/account_invoice_merge]

31. By Laetitia Gangloff (Acsone) on 2013-07-31

account_invoice_merge: refactor do_merge method and some cleanup.

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

Hello,

I refactor do_merge method using Romain's changes.
I remove unused import and correct the comment indentation.

doesn't po and so need to be rewritten with invoice ids ?
As suggested by Stéphane, the part which reconnects the so/po to the invoice move from wizard/invoice_merge.py to invoice.py/do_merge() so do_merge implements the whole algorithm and can be called from elsewhere without surprise.

Thank you

[lp:~laetitia-gangloff/account-invoicing/account_invoice_merge]

32. By Laetitia Gangloff (Acsone) on 2013-07-31

merge from lp:~romaindeheele/account-invoicing/account-invoicing-merge

[Stéphane Bidoul (Acsone) (sbi)]

nitpicking for readability:
- L161 new_invoice should be new_invoice_id
- org_invoice is org_so/org_po in L174/L182
- pep8 whitespace in L177 & L179

A question: where is the link from so line to invoice visible for the user?

review: Needs Fixing

[lp:~laetitia-gangloff/account-invoicing/account_invoice_merge]

33. By Laetitia Gangloff (Acsone) on 2013-08-06

account_invoice_merge: update some labels

[Stéphane Bidoul (Acsone) (sbi)]

review: Approve

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Approve (code, no test)

[Stéphane Bidoul (Acsone) (sbi)]

Is this one good for merging?

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I just merged the MP. Thanks all.

[xrg (xrg)]

This module has clearly copied code from "account_invoice_merge" from extra-addons 6.0. Hence the copyright of Elico is false!

review: Disapprove

[Eric Caudal - www.elico-corp.com (elicoidal)]

I think the copyright is correct ;)

xrg <email address hidden> wrote:

>Review: Disapprove
>
>This module has clearly copied code from "account_invoice_merge" from extra-addons 6.0. Hence the copyright of Elico is false!
>
>
>--
>https://code.launchpad.net/~laetitia-gangloff/account-invoicing/account_invoice_merge/+merge/171247
>Your team Account Core Editors is subscribed to branch lp:account-invoicing.

[xrg (xrg)]

so, you think you can replace copyright holders?

Then s/Elico Corp/whatever/g !

[Stéphane Bidoul (Acsone) (sbi)]

There is still a copyright Tiny SPRL in invoice.py. This one goes back to
the original commit from Elico and is probably a mistake (Eric?).

Other than that I don't see any copyright issue. Credits are properly
attributed and commit history is prorperly preserved.

-sbi

On Fri, Aug 30, 2013 at 1:21 PM, xrg <email address hidden> wrote:

> so, you think you can replace copyright holders?
>
>
> Then s/Elico Corp/whatever/g !
>
> --
>
> https://code.launchpad.net/~laetitia-gangloff/account-invoicing/account_invoice_merge/+merge/171247
> You are reviewing the proposed merge of
> lp:~laetitia-gangloff/account-invoicing/account_invoice_merge into
> lp:account-invoicing.
>

[Eric Caudal - www.elico-corp.com (elicoidal)]

We probably kept the original copyright because most of the code was
copied directly from invoice.py for inheritance.
I dont know what would be the common practice in this case: add a line
with Elico Copyright + other contributors?

Eric CAUDAL

Eric Caudal
/CEO/
--
*Elico Corporation, Shanghai branch
/OpenERP Premium Certified Training Partner/ *
Cell: + 86 186 2136 1670
Office: + 86 21 6211 8017/27/37
Skype: elico.corp
<email address hidden> <mailto:<email address hidden>>
http://www.elico-corp.com

Elico Corp
On 30/08/2013 19:36, Stéphane Bidoul (Acsone) wrote:
> There is still a copyright Tiny SPRL in invoice.py. This one goes back to
> the original commit from Elico and is probably a mistake (Eric?).
>
> Other than that I don't see any copyright issue. Credits are properly
> attributed and commit history is prorperly preserved.
>
> -sbi
>
>
> On Fri, Aug 30, 2013 at 1:21 PM, xrg <email address hidden> wrote:
>
>> so, you think you can replace copyright holders?
>>
>>
>> Then s/Elico Corp/whatever/g !
>>
>> --
>>
>> https://code.launchpad.net/~laetitia-gangloff/account-invoicing/account_invoice_merge/+merge/171247
>> You are reviewing the proposed merge of
>> lp:~laetitia-gangloff/account-invoicing/account_invoice_merge into
>> lp:account-invoicing.
>>

=== added directory 'account_invoice_merge'
=== added file 'account_invoice_merge/__init__.py'
--- account_invoice_merge/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/__init__.py	2013-08-06 10:17:31 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import invoice
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_invoice_merge/__openerp__.py'
--- account_invoice_merge/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/__openerp__.py	2013-08-06 10:17:31 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
+#    Author: Ian Li <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Account Invoice Merge Wizard',
+    'version': '1.1',
+    'category': 'Finance',
+    'description': """
+This module adds an action in the invoices lists to merge of invoices. Here are the condition to allow merge:
+- Type should be the same (customer Invoice, supplier invoice, Customer or Supplier Refund)
+- Partner should be the same
+- Currency should be the same
+- Account receivable account should be the same
+    """,
+    'author': 'Elico Corp',
+    'website': 'http://www.openerp.net.cn',
+    'depends': ['account'],
+    'data': [
+        'wizard/invoice_merge_view.xml',
+    ],
+    'test': [
+    ],
+    'demo': [],
+    'installable': True,
+    'active': False,
+    'certificate': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'account_invoice_merge/i18n'
=== added file 'account_invoice_merge/i18n/account_invoice_merge.pot'
--- account_invoice_merge/i18n/account_invoice_merge.pot	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/i18n/account_invoice_merge.pot	2013-08-06 10:17:31 +0000
@@ -0,0 +1,136 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_merge
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-25 08:40+0000\n"
+"PO-Revision-Date: 2013-06-25 08:40+0000\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
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:34
+#, python-format
+msgid "Please select multiple invoice to merge in the list view."
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:44
+#, python-format
+msgid "Not all invoices are at the same company!"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:40
+#, python-format
+msgid "At least one of the selected invoices is %s!"
+msgstr ""
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+#: model:ir.actions.act_window,name:account_invoice_merge.action_view_invoice_merge
+#: model:ir.model,name:account_invoice_merge.model_invoice_merge
+msgid "Merge Partner Invoice"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:48
+#, python-format
+msgid "Not all invoices are of the same type!"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:107
+#, python-format
+msgid "Partner Invoice"
+msgstr ""
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid " Please note that: \n"
+" \n"
+" Invoices will only be merged if: \n"
+" * Invoices are in draft \n"
+" * Invoices belong to the same partner \n"
+" * Invoices are have same company, partner, address, currency, journal, salesman, account, type \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Invoice lines are exactly the same except for the product,quantity and unit \n"
+" "
+msgstr ""
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "or"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:42
+#, python-format
+msgid "Not all invoices use the same account!"
+msgstr ""
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Merge Invoices"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:40
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:42
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:44
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:46
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:48
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:50
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:52
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:34
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: account_invoice_merge
+#: model:ir.model,name:account_invoice_merge.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:52
+#, python-format
+msgid "Not all invoices are at the same journal!"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:50
+#, python-format
+msgid "Not all invoices are at the same currency!"
+msgstr ""
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Are you sure you want to merge these invoices ?"
+msgstr ""
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:46
+#, python-format
+msgid "Not all invoices are for the same partner!"
+msgstr ""
+
+

=== added file 'account_invoice_merge/i18n/fr.po'
--- account_invoice_merge/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/i18n/fr.po	2013-08-06 10:17:31 +0000
@@ -0,0 +1,144 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_merge
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-25 08:40+0000\n"
+"PO-Revision-Date: 2013-06-25 08:40+0000\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
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:34
+#, python-format
+msgid "Please select multiple invoice to merge in the list view."
+msgstr "Veuillez selectionner dans la liste plusieurs factures à fusionner"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:44
+#, python-format
+msgid "Not all invoices are at the same company!"
+msgstr "Toutes les factures n'appartiennent pas à la même société !"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:40
+#, python-format
+msgid "At least one of the selected invoices is %s!"
+msgstr "Au moins une des factures sélectionnées est %s !"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+#: model:ir.actions.act_window,name:account_invoice_merge.action_view_invoice_merge
+#: model:ir.model,name:account_invoice_merge.model_invoice_merge
+msgid "Merge Partner Invoice"
+msgstr "Fusion de facture de patenaire"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:48
+#, python-format
+msgid "Not all invoices are of the same type!"
+msgstr "Toutes les factures ne sont pas du même type !"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:107
+#, python-format
+msgid "Partner Invoice"
+msgstr "Facture de patenaire"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid " Please note that: \n"
+" \n"
+" Invoices will only be merged if: \n"
+" * Invoices are in draft \n"
+" * Invoices belong to the same partner \n"
+" * Invoices are have same company, partner, address, currency, journal, salesman, account, type \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Invoice lines are exactly the same except for the product,quantity and unit \n"
+" "
+msgstr " Veuillez noter que :\n"
+"\n"
+" Les factures seront fusionnées seulement si :\n"
+" * Les factures sont dans l'état brouillon\n"
+" * Les factures appartiennent au même patenaire\n"
+" * Les facture possédent les même société, partenaire, adresse, devise, journal, vendeur, compte, type\n"
+"\n"
+" Les lignes seront fusionnées seulement si :\n"
+" * Les lignes de facture sont identique à l'exception de la quantité et de l'unité\n"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "or"
+msgstr "ou"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:42
+#, python-format
+msgid "Not all invoices use the same account!"
+msgstr "Toutes les factures n'utilisent pas le même compte !"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Merge Invoices"
+msgstr "Fusion de factures"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:40
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:42
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:44
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:46
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:48
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:50
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:52
+#, python-format
+msgid "Warning"
+msgstr "Attention"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:34
+#, python-format
+msgid "Warning!"
+msgstr "Attention !"
+
+#. module: account_invoice_merge
+#: model:ir.model,name:account_invoice_merge.model_account_invoice
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:52
+#, python-format
+msgid "Not all invoices are at the same journal!"
+msgstr "Toutes les factures ne sont pas dans le même journal !"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:50
+#, python-format
+msgid "Not all invoices are at the same currency!"
+msgstr "Toutes les factures ne sont pas dans la même devise !"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Are you sure you want to merge these invoices ?"
+msgstr "Êtes vous certain de vouloir fusionner ces factures ?"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:46
+#, python-format
+msgid "Not all invoices are for the same partner!"
+msgstr "Toutes les factures ne sont pas du même partenaire !"
+
+

=== added file 'account_invoice_merge/i18n/zh_CN.po'
--- account_invoice_merge/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/i18n/zh_CN.po	2013-08-06 10:17:31 +0000
@@ -0,0 +1,85 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_merge
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-05-07 02:54+0000\n"
+"PO-Revision-Date: 2012-05-07 02:54+0000\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
+#: model:ir.model,name:account_invoice_merge.model_account_invoice
+msgid "Invoice"
+msgstr "发票"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:86
+#, python-format
+msgid "Partner Invoice"
+msgstr "合作伙伴发票"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid " Please note that: \n"
+" \n"
+" Invoices will only be merged if: \n"
+" * Invoices are in draft \n"
+" * Invoices belong to the same partner \n"
+" * Invoices are have same company, partner, address, currency, journal, salesman, account, type \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Invoice lines are exactly the same except for the product,quantity and unit \n"
+" "
+msgstr " 请注意： \n"
+" \n"
+"符合下列条件，才会被合并： \n"
+" * 仍在草稿状态的发票。 \n"
+" * 属于同一合作伙伴的发票。 \n"
+" * 属于同一公司，有相同币别，账簿，业务员，科目及类型等的发票。 \n"
+" \n"
+" 符合下列条件，发票明细才会被合并： \n"
+" * 除了明细的产品，数量，价格，金额等字段外，发票明细必须一致。 \n"
+" "
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:48
+#, python-format
+msgid "Please select multiple invoice to merge in the list view."
+msgstr "请在列表视图里选择多个发票来进行合并。"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Merge Invoices"
+msgstr "合并发票"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:47
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+#: model:ir.actions.act_window,name:account_invoice_merge.action_view_invoice_merge
+#: model:ir.model,name:account_invoice_merge.model_invoice_merge
+msgid "Merge Partner Invoice"
+msgstr "合并发票"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Are you sure you want to merge these invoices ?"
+msgstr "您确认合并这些发票？"
+

=== added file 'account_invoice_merge/invoice.py'
--- account_invoice_merge/invoice.py	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/invoice.py	2013-08-06 10:17:31 +0000
@@ -0,0 +1,187 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+from openerp import netsvc
+from osv.orm import browse_record, browse_null
+
+
+class account_invoice(orm.Model):
+    _inherit = "account.invoice"
+
+    def _get_first_invoice_fields(self, cr, uid, invoice):
+        return {'origin': '%s' % (invoice.origin or '',),
+                'partner_id': invoice.partner_id.id,
+                'journal_id': invoice.journal_id.id,
+                'user_id': invoice.user_id.id,
+                'currency_id': invoice.currency_id.id,
+                'company_id': invoice.company_id.id,
+                'type': invoice.type,
+                'account_id': invoice.account_id.id,
+                'state': 'draft',
+                'reference': '%s' % (invoice.reference or '',),
+                'name': '%s' % (invoice.name or '',),
+                'fiscal_position': invoice.fiscal_position and invoice.fiscal_position.id or False,
+                'payment_term': invoice.payment_term and invoice.payment_term.id or False,
+                'period_id': invoice.period_id and invoice.period_id.id or False,
+                'invoice_line': {},
+                }
+
+    def _get_invoice_key_cols(self, cr, uid, invoice):
+        return ('partner_id', 'user_id', 'type',
+                'account_id', 'currency_id',
+                'journal_id', 'company_id')
+
+    def _get_invoice_line_key_cols(self, cr, uid, invoice_line):
+        return ('name', 'origin', 'discount',
+                'invoice_line_tax_id', 'price_unit',
+                'product_id', 'account_id',
+                'account_analytic_id')
+
+    def do_merge(self, cr, uid, ids, context=None):
+        """
+        To merge similar type of account invoices.
+        Invoices will only be merged if:
+        * Account invoices are in draft
+        * Account invoices belong to the same partner
+        * Account invoices are have same company, partner, address, currency, journal, currency, salesman, account, type
+        Lines will only be merged if:
+        * Invoice lines are exactly the same except for the quantity and unit
+
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: the ID or list of IDs
+         @param context: A standard dictionary
+
+         @return: new account invoice id
+
+        """
+        wf_service = netsvc.LocalService("workflow")
+
+        def make_key(br, fields):
+            list_key = []
+            for field in fields:
+                field_val = getattr(br, field)
+                if field in ('product_id', 'account_id'):
+                    if not field_val:
+                        field_val = False
+                if isinstance(field_val, browse_record):
+                    field_val = field_val.id
+                elif isinstance(field_val, browse_null):
+                    field_val = False
+                elif isinstance(field_val, list):
+                    field_val = ((6, 0, tuple([v.id for v in field_val])),)
+                list_key.append((field, field_val))
+            list_key.sort()
+            return tuple(list_key)
+
+        # compute what the new invoices should contain
+
+        new_invoices = {}
+        draft_invoices = [invoice
+                          for invoice in self.browse(cr, uid, ids, context=context)
+                          if invoice.state == 'draft']
+        seen_origins = {}
+        seen_client_refs = {}
+
+        for account_invoice in draft_invoices:
+            invoice_key = make_key(account_invoice, self._get_invoice_key_cols(cr, uid, account_invoice))
+            new_invoice = new_invoices.setdefault(invoice_key, ({}, []))
+            origins = seen_origins.setdefault(invoice_key, set())
+            client_refs = seen_client_refs.setdefault(invoice_key, set())
+            new_invoice[1].append(account_invoice.id)
+            invoice_infos = new_invoice[0]
+            if not invoice_infos:
+                invoice_infos.update(self._get_first_invoice_fields(cr, uid, account_invoice))
+                origins.add(account_invoice.origin)
+                client_refs.add(account_invoice.reference)
+            else:
+                if account_invoice.name:
+                    invoice_infos['name'] = (invoice_infos['name'] or '') + (' %s' % (account_invoice.name,))
+                if account_invoice.origin and account_invoice.origin not in origins:
+                    invoice_infos['origin'] = (invoice_infos['origin'] or '') + ' ' + account_invoice.origin
+                    origins.add(account_invoice.origin)
+                if account_invoice.reference and account_invoice.reference not in client_refs:
+                    invoice_infos['reference'] = (invoice_infos['reference'] or '') + (' %s' % (account_invoice.reference,))
+                    client_refs.add(account_invoice.reference)
+
+            for invoice_line in account_invoice.invoice_line:
+                line_key = make_key(invoice_line, self._get_invoice_line_key_cols(cr, uid, invoice_line))
+                o_line = invoice_infos['invoice_line'].setdefault(line_key, {})
+                if o_line:
+                    # merge the line with an existing line
+                    o_line['quantity'] += invoice_line.quantity * invoice_line.uos_id.factor / o_line['uom_factor']
+                else:
+                    # append a new "standalone" line
+                    for field in ('quantity', 'uos_id'):
+                        field_val = getattr(invoice_line, field)
+                        if isinstance(field_val, browse_record):
+                            field_val = field_val.id
+                        o_line[field] = field_val
+                    o_line['uom_factor'] = invoice_line.uos_id and invoice_line.uos_id.factor or 1.0
+
+        allinvoices = []
+        invoices_info = {}
+        for invoice_key, (invoice_data, old_ids) in new_invoices.iteritems():
+            # skip merges with only one invoice
+            if len(old_ids) < 2:
+                allinvoices += (old_ids or [])
+                continue
+
+            # cleanup invoice line data
+            for key, value in invoice_data['invoice_line'].iteritems():
+                del value['uom_factor']
+                value.update(dict(key))
+            invoice_data['invoice_line'] = [(0, 0, value) for value in invoice_data['invoice_line'].itervalues()]
+
+            # create the new invoice
+            newinvoice_id = self.create(cr, uid, invoice_data)
+            invoices_info.update({newinvoice_id: old_ids})
+            allinvoices.append(newinvoice_id)
+
+            # make triggers pointing to the old invoices point to the new invoice
+            for old_id in old_ids:
+                wf_service.trg_redirect(uid, 'account.invoice', old_id, newinvoice_id, cr)
+                wf_service.trg_validate(uid, 'account.invoice', old_id, 'invoice_cancel', cr)
+
+        # make link between original sale order or purchase order
+        so_obj = self.pool.get('sale.order')  # None if sale is not installed
+        order_line_obj = self.pool.get('sale.order.line')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        po_obj = self.pool.get('purchase.order')  # None if purchase is not installed
+        for new_invoice_id in invoices_info:
+            if so_obj is not None:
+                todo_ids = so_obj.search(cr, uid, [('invoice_ids', 'in', invoices_info[new_invoice_id])], context=context)
+                for org_so in so_obj.browse(cr, uid, todo_ids, context=context):
+                    so_obj.write(cr, uid, [org_so.id], {'invoice_ids': [(4, new_invoice_id)]}, context)
+                    for so_line in org_so.order_line:
+                        invoice_line_ids = invoice_line_obj.search(cr, uid, [('product_id', '=', so_line.product_id.id), ('invoice_id', '=', new_invoice_id)])
+                        if invoice_line_ids:
+                            order_line_obj.write(cr, uid, [so_line.id], {'invoice_lines': [(6, 0, invoice_line_ids)]}, context=context)
+            if po_obj is not None:
+                todo_ids = po_obj.search(cr, uid, [('invoice_ids', 'in', invoices_info[new_invoice_id])], context=context)
+                for org_po in po_obj.browse(cr, uid, todo_ids, context=context):
+                    po_obj.write(cr, uid, [org_po.id], {'invoice_ids': [(4, new_invoice_id)]}, context)
+
+        return invoices_info
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'account_invoice_merge/wizard'
=== added file 'account_invoice_merge/wizard/__init__.py'
--- account_invoice_merge/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/wizard/__init__.py	2013-08-06 10:17:31 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import invoice_merge
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_invoice_merge/wizard/invoice_merge.py'
--- account_invoice_merge/wizard/invoice_merge.py	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/wizard/invoice_merge.py	2013-08-06 10:17:31 +0000
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+from openerp.tools.translate import _
+
+
+class invoice_merge(orm.TransientModel):
+    _name = "invoice.merge"
+    _description = "Merge Partner Invoice"
+
+    def _dirty_check(self, cr, uid, context):
+        if context.get('active_model', '') == 'account.invoice':
+            ids = context['active_ids']
+            if len(ids) < 2:
+                raise orm.except_orm(_('Warning!'), _('Please select multiple invoice to merge in the list view.'))
+            inv_obj = self.pool.get('account.invoice')
+            invs = inv_obj.read(cr, uid, ids, ['account_id', 'state', 'type', 'company_id',
+                                               'partner_id', 'currency_id', 'journal_id'])
+            for d in invs:
+                if d['state'] != 'draft':
+                    raise orm.except_orm(_('Warning'), _('At least one of the selected invoices is %s!') % d['state'])
+                if (d['account_id'] != invs[0]['account_id']):
+                    raise orm.except_orm(_('Warning'), _('Not all invoices use the same account!'))
+                if (d['company_id'] != invs[0]['company_id']):
+                    raise orm.except_orm(_('Warning'), _('Not all invoices are at the same company!'))
+                if (d['partner_id'] != invs[0]['partner_id']):
+                    raise orm.except_orm(_('Warning'), _('Not all invoices are for the same partner!'))
+                if (d['type'] != invs[0]['type']):
+                    raise orm.except_orm(_('Warning'), _('Not all invoices are of the same type!'))
+                if (d['currency_id'] != invs[0]['currency_id']):
+                    raise orm.except_orm(_('Warning'), _('Not all invoices are at the same currency!'))
+                if (d['journal_id'] != invs[0]['journal_id']):
+                    raise orm.except_orm(_('Warning'), _('Not all invoices are at the same journal!'))
+        return {}
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+                        context=None, toolbar=False, submenu=False):
+        """
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return: New arch of view.
+        """
+        if context is None:
+            context = {}
+        res = super(invoice_merge, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
+        self._dirty_check(cr, uid, context)
+        return res
+
+    def merge_invoices(self, cr, uid, ids, context=None):
+        """
+             To merge similar type of account invoices.
+
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs
+             @param context: A standard dictionary
+
+             @return: account invoice view
+
+        """
+        inv_obj = self.pool.get('account.invoice')
+        mod_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = {}
+        result = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+
+        allinvoices = inv_obj.do_merge(cr, uid, context.get('active_ids', []), context)
+
+        return {
+            'domain': "[('id','in', [" + ','.join(map(str, allinvoices.keys())) + "])]",
+            'name': _('Partner Invoice'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+        }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_invoice_merge/wizard/invoice_merge_view.xml'
--- account_invoice_merge/wizard/invoice_merge_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/wizard/invoice_merge_view.xml	2013-08-06 10:17:31 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_invoice_merge" model="ir.ui.view">
+            <field name="name">Merger Partner Invoice</field>
+            <field name="model">invoice.merge</field>
+            <field name="arch" type="xml">
+                <form string="Merge Partner Invoice" version="7.0">
+                    <group>
+                        <separator
+                            string="Are you sure you want to merge these invoices ?"
+                            colspan="4" />
+                        <p>
+Please note that:<br/><br/>
+Invoices will only be merged if:<br/>
+* Invoices are in draft<br/>
+* Invoices belong to the same partner<br/>
+* Invoices are have same company, partner, address, currency, journal, salesman, account, type<br/><br/>
+Lines will only be merged if:<br/>
+* Invoice lines are exactly the same except for the product,quantity and unit<br/>
+                            </p>
+                    </group>
+                    <footer>
+                        <button name="merge_invoices" string="Merge Invoices"
+                            type="object" class="oe_highlight" />
+                        or
+                        <button string="Cancel" class="oe_link"
+                            special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <act_window name="Merge Partner Invoice" res_model="invoice.merge"
+            src_model="account.invoice" view_mode="form" target="new"
+            multi="True" key2="client_action_multi" id="action_view_invoice_merge" />
+
+    </data>
+</openerp>
+