Merge lp:~cv.clearcorp/openobject-addons/6.1-account_voucher-rate into lp:openobject-addons/6.1

[Carlos Vásquez (ClearCorp)]

This fixes the first part of this but (see it's description)

[lp:~cv.clearcorp/openobject-addons/6.1-account_voucher-rate]

6739. By Launchpad Translations on behalf of openerp on 2012-04-14

Launchpad automatic translations update.

6740. By Launchpad Translations on behalf of openerp on 2012-04-15

Launchpad automatic translations update.

6741. By Launchpad Translations on behalf of openerp on 2012-04-16

Launchpad automatic translations update.

6742. By Launchpad Translations on behalf of openerp on 2012-04-17

Launchpad automatic translations update.

6743. By Xavier ALT on 2012-04-17

[MERGE] report_webkit: handle more gracefull remove of 'lib_path' + fix test in l10n_ch

6744. By Launchpad Translations on behalf of openerp on 2012-04-18

Launchpad automatic translations update.

6745. By Launchpad Translations on behalf of openerp on 2012-04-19

Launchpad automatic translations update.

6746. By Launchpad Translations on behalf of openerp on 2012-04-20

Launchpad automatic translations update.

6747. By Launchpad Translations on behalf of openerp on 2012-04-21

Launchpad automatic translations update.

6748. By Launchpad Translations on behalf of openerp on 2012-04-22

Launchpad automatic translations update.

6749. By Launchpad Translations on behalf of openerp on 2012-04-23

Launchpad automatic translations update.

6750. By Quentin (OpenERP) <email address hidden> on 2012-04-23

[IMP] portal: improved inheritancy when creating a new portal user

6751. By Quentin (OpenERP) <email address hidden> on 2012-04-23

[REF] l10n_be: added some comments

6752. By Quentin (OpenERP) <email address hidden> on 2012-04-23

[FIX] portal: moved the prepare_user_data on wizard rather than on the user

6753. By Antony Lesuisse (OpenERP) on 2012-04-23

[FIX] home action

6754. By Launchpad Translations on behalf of openerp on 2012-04-24

Launchpad automatic translations update.

6755. By nel on 2012-04-24

[FIX] stock: check if the move exists to avoid the key error

6756. By nel on 2012-04-24

[FIX] stock: small important fix

6757. By Launchpad Translations on behalf of openerp on 2012-04-25

Launchpad automatic translations update.

6758. By nel on 2012-04-25

[FIX] stock: check if currency on product or picking exists

6759. By Olivier Laurent (Open ERP) on 2012-04-24

[FIX] l10n_multilang should be certified since it's a dependancy for a certified module (l10n_ch)

6760. By Olivier Laurent (Open ERP) on 2012-04-25

[FIX] raise clear except_osv instead of traceback

6761. By Olivier Laurent (Open ERP) on 2012-04-25

[FIX] added missing certificate number

6762. By Olivier Dony (Odoo) on 2012-04-25

[MERGE] crm: multiple bugfixes for mass-conversion wizards

6763. By Olivier Dony (Odoo) on 2012-04-25

[MERGE] crm.lead: bugfixes for saleman allocation and convert to opportunity

6764. By Quentin (OpenERP) <email address hidden> on 2012-04-25

[MERGE] some fixes in constraints in account_coda

6765. By Launchpad Translations on behalf of openerp on 2012-04-26

Launchpad automatic translations update.

6766. By Xavier ALT on 2012-04-26

[MERGE] server action: fix missing active_model in context when calling server action run()

6767. By Xavier ALT on 2012-04-26

[MERGE] project_gtd: fix UnicodeDecodeError on GTD Task search view when user language is different than English

6768. By Xavier ALT on 2012-04-26

[MERGE] OPW 573248: crm: do not round localized user value as this will display NaN of kanban view (ex: decimal separator <> '.')

6769. By Launchpad Translations on behalf of openerp on 2012-04-27

Launchpad automatic translations update.

6770. By Xavier ALT on 2012-04-27

[MERGE] share: fix error on user creation, missing 'company_ids' raising constraint ValidationError

6771. By Xavier ALT on 2012-04-27

[MERGE] OPW 573134: wiki: fix 'wikijs' support of syntax: h1, h2, h3, img, attach

6772. By Olivier Dony (Odoo) on 2012-04-27

[FIX] mail.thread: fix SMTP headers when forwarding messages

mail.message.Message has case-insensitive behavior
for headers, but setting the header value *adds* a
new header even if the same header already exists.
This caused multiple issues when forwarding, because
the forwarded mail kept the original To: header.
Also changed the code to use capitalized header
names at all times, just for consistency.
Also removed unused variable ``mail_message``.

6773. By Launchpad Translations on behalf of openerp on 2012-04-28

Launchpad automatic translations update.

6774. By Launchpad Translations on behalf of openerp on 2012-04-29

Launchpad automatic translations update.

6775. By Launchpad Translations on behalf of openerp on 2012-04-30

Launchpad automatic translations update.

6776. By Olivier Dony (Odoo) on 2012-04-30

[FIX] account,sale,purchase: avoid white text in email notifications due to broken mail clients

Some strange mail client implementations seem to
selectively strip the background-color CSS in emails,
making a white-on-black button become white-on-white
invisible text. Replaced #FFF with #DDD in order
to more gracefully degrade in those cases.
Reproduced with Lotus Notes 8.

6777. By Olivier Dony (Odoo) on 2012-04-30

[FIX] account,sale,purchase: translations were not enabled for mail notifications

6778. By Xavier ALT on 2012-04-30

[MERGE] OPW 572907: account: account.financial.report balance should respect report sign

6779. By Launchpad Translations on behalf of openerp on 2012-05-01

Launchpad automatic translations update.

6780. By Launchpad Translations on behalf of openerp on 2012-05-02

Launchpad automatic translations update.

6781. By Launchpad Translations on behalf of openerp on 2012-05-03

Launchpad automatic translations update.

6782. By Launchpad Translations on behalf of openerp on 2012-05-04

Launchpad automatic translations update.

6783. By Xavier ALT on 2012-05-04

[FIX] stock: fix partial picking testing on non-existant 'new' stock.move state

6784. By Launchpad Translations on behalf of openerp on 2012-05-05

Launchpad automatic translations update.

6785. By Antony Lesuisse (OpenERP) on 2012-05-05

[FIX] point_of_sale typo only load pos enabled products

6786. By Antony Lesuisse (OpenERP) on 2012-05-05

[MERGE] 6.1-opw-573508-ado point_of_sale multiple rows for categories

6787. By Launchpad Translations on behalf of openerp on 2012-05-06

Launchpad automatic translations update.

6788. By Launchpad Translations on behalf of openerp on 2012-05-07

Launchpad automatic translations update.

6789. By nel on 2012-05-07

[MERGE]

6790. By Launchpad Translations on behalf of openerp on 2012-05-08

Launchpad automatic translations update.

6791. By Olivier Laurent (Open ERP) on 2012-05-08

[FIX] reverted __openerp__.py: the commented line was already commented before so it was wrongly uncommented

6792. By Launchpad Translations on behalf of openerp on 2012-05-09

Launchpad automatic translations update.

6793. By Launchpad Translations on behalf of openerp on 2012-05-10

Launchpad automatic translations update.

6794. By Launchpad Translations on behalf of openerp on 2012-05-11

Launchpad automatic translations update.

6795. By Launchpad Translations on behalf of openerp on 2012-05-12

Launchpad automatic translations update.

6796. By Launchpad Translations on behalf of openerp on 2012-05-13

Launchpad automatic translations update.

6797. By Launchpad Translations on behalf of openerp on 2012-05-14

Launchpad automatic translations update.

6798. By Launchpad Translations on behalf of openerp on 2012-05-15

Launchpad automatic translations update.

[Carlos Vásquez (ClearCorp) (cv.clearcorp)]

I fixed the bug second part.

Now the voucher is able to correctly calculate the amount_currency, debit and credit in every currency combination.

I tried with a company set to a currency not base (rate != 1). I created invoices in the company currency, in the base currency and in a third, not base, currency. Then, for each case I registered payments with each of those currencies. Every case worked fine.

review: Needs Resubmitting

[lp:~cv.clearcorp/openobject-addons/6.1-account_voucher-rate]

6799. By Launchpad Translations on behalf of openerp on 2012-05-16

Launchpad automatic translations update.

6800. By Olivier Laurent (Open ERP) on 2012-05-16

[FIX] account: reports: drop view before replacing them

6801. By Olivier Dony (Odoo) on 2012-05-16

[FIX] document,mail: show only personal attachments by default

6803. By Launchpad Translations on behalf of openerp on 2012-05-17

Launchpad automatic translations update.

6804. By Launchpad Translations on behalf of openerp on 2012-05-18

Launchpad automatic translations update.

6805. By Launchpad Translations on behalf of openerp on 2012-05-19

Launchpad automatic translations update.

6806. By Launchpad Translations on behalf of openerp on 2012-05-20

Launchpad automatic translations update.

6807. By Olivier Dony (Odoo) on 2012-05-23

[FIX] decimal_precision: properly invalidate cache when changing precisions

This was working previously because the cache was disabled,
due to bug #988743. Now that the cache is working again,
it needs to be properly invalidated whenever a decimal.precision
record is created or deleted, otherwise all computations
will use an incorrect precision.

6808. By Xavier ALT on 2012-05-24

[MERGE] crm_partner_assign: test: be more lenient about partner localisation

    As of today, google maps tend to localize:
       Avenue de la Liberté 56, 1000 Brussels, , Belgium
    As:
       Place de la Liberté 56, 1000 Bruxelles, Belgique

    making imprecision and failing geolocalizaton test of
    'crm.crm_case_abcfuelcounits0' (current modification is backported from
    trunk unit-test)

6809. By Xavier ALT on 2012-05-24

[MERGE] OPW 575004: stock: fix font for product name/variant in packaging report

6810. By Launchpad Translations on behalf of openerp on 2012-05-24

Launchpad automatic translations update.

6811. By Launchpad Translations on behalf of openerp on 2012-05-25

Launchpad automatic translations update.

6812. By Xavier ALT on 2012-05-25

[MERGE] OPW 574991: rml reports: move setLang() before <pto_header/> otherwise it won't be correctly translated

6813. By Launchpad Translations on behalf of openerp on 2012-05-26

Launchpad automatic translations update.

6814. By Launchpad Translations on behalf of openerp on 2012-05-27

Launchpad automatic translations update.

6815. By Launchpad Translations on behalf of openerp on 2012-05-28

Launchpad automatic translations update.

6816. By Launchpad Translations on behalf of openerp on 2012-05-29

Launchpad automatic translations update.

6817. By Xavier ALT on 2012-05-29

[MERGE] OPW 574652: hr_expense: add correct decimal precision on 'amount' field

6818. By Launchpad Translations on behalf of openerp on 2012-05-30

Launchpad automatic translations update.

6819. By Olivier Dony (Odoo) on 2012-05-30

[FIX] stock: Warehouse Manager should have all rights on stock.move

6820. By Launchpad Translations on behalf of openerp on 2012-05-31

Launchpad automatic translations update.

6821. By Launchpad Translations on behalf of openerp on 2012-06-01

Launchpad automatic translations update.

6822. By Olivier Dony (Odoo) on 2012-06-01

[FIX] crm: missing index on user_id, which is used by ir.rules

6823. By Olivier Dony (Odoo) on 2012-06-01

[MERGE] OPW 575424: mrp: error on analytic entries when workcenter has no product

6824. By Launchpad Translations on behalf of openerp on 2012-06-02

Launchpad automatic translations update.

6825. By Launchpad Translations on behalf of openerp on 2012-06-03

Launchpad automatic translations update.

6826. By Launchpad Translations on behalf of openerp on 2012-06-04

Launchpad automatic translations update.

6827. By Olivier Dony (Odoo) on 2012-06-04

[MERGE] OPW 575437: account_payment: missing voucher entries when importing payment orders into bank statement

6828. By Launchpad Translations on behalf of openerp on 2012-06-05

Launchpad automatic translations update.

6829. By Olivier Dony (Odoo) on 2012-06-05

[FIX] edi: fix Invoice preview template, uos_id field not required so may be missing

6830. By Quentin (OpenERP) <email address hidden> on 2012-06-05

[REF] account_coda: stripped dummy spaces at end of lines

6831. By Quentin (OpenERP) <email address hidden> on 2012-06-05

[FIX] account_coda: fixed coda import to work with iban bank accounts

6832. By Launchpad Translations on behalf of openerp on 2012-06-06

Launchpad automatic translations update.

6833. By Launchpad Translations on behalf of openerp on 2012-06-07

Launchpad automatic translations update.

6834. By Launchpad Translations on behalf of openerp on 2012-06-08

Launchpad automatic translations update.

6835. By Launchpad Translations on behalf of openerp on 2012-06-09

Launchpad automatic translations update.

6836. By Launchpad Translations on behalf of openerp on 2012-06-10

Launchpad automatic translations update.

6837. By Launchpad Translations on behalf of openerp on 2012-06-11

Launchpad automatic translations update.

6838. By Launchpad Translations on behalf of openerp on 2012-06-12

Launchpad automatic translations update.

6839. By Olivier Dony (Odoo) on 2012-06-12

[MERGE] OPW 575526: fix returning product with upstream stock moves + multiple returns

6840. By Launchpad Translations on behalf of openerp on 2012-06-13

Launchpad automatic translations update.

6841. By Launchpad Translations on behalf of openerp on 2012-06-14

Launchpad automatic translations update.

6842. By Fabien Meghazi (OpenERP) on 2012-06-14

[REM] Removed <image> tags from wizards

6843. By Launchpad Translations on behalf of openerp on 2012-06-15

Launchpad automatic translations update.

6844. By Launchpad Translations on behalf of openerp on 2012-06-16

Launchpad automatic translations update.

6845. By Launchpad Translations on behalf of openerp on 2012-06-17

Launchpad automatic translations update.

6846. By Launchpad Translations on behalf of openerp on 2012-06-18

Launchpad automatic translations update.

6847. By Olivier Dony (Odoo) on 2012-06-18

[MERGE] OPW 575624: product,account_payment: respect current symbol position in reports

6848. By Olivier Dony (Odoo) on 2012-06-18

[FIX] stock: properly pass production lot number as SQL query parameter

6849. By Launchpad Translations on behalf of openerp on 2012-06-19

Launchpad automatic translations update.

6850. By Olivier Dony (Odoo) on 2012-06-19

[FIX] stock: correct order of query parameters, broken in commit 6848

6851. By Launchpad Translations on behalf of openerp on 2012-06-20

Launchpad automatic translations update.

6852. By Olivier Dony (Odoo) on 2012-06-20

[MERGE] OPW 575500: correct importing invoices in bank statements in multi-currency context

6853. By Olivier Dony (Odoo) on 2012-06-20

[MERGE] l10n_ch: bugfixes from Camptocamp, courtesy of Yannick Vaucher

6854. By Launchpad Translations on behalf of openerp on 2012-06-21

Launchpad automatic translations update.

6855. By Christophe Simonis (OpenERP) on 2012-06-21

[FIX] base_vat: correct Switzerland VAT check

6856. By Launchpad Translations on behalf of openerp on 2012-06-22

Launchpad automatic translations update.

6857. By Olivier Dony (Odoo) on 2012-06-22

[MERGE] mail: avoid obscure failure when processing batches of emails with attachments

  This issue was caused by the way browse_records are cached,
  in combination with the deletion of messages just after sending
  them. When processing a second message, the attachment.datas
  function fields gets computed for all messages that are being
  browsed, including the first message that was already deleted,
  causing an exception. The value of the function field had
  already been computed for the first message, but had been
  discarded by the message.refresh() call.
  Hopefully this kind of issue will disappear once we implement
  the new ORM API.

6858. By Launchpad Translations on behalf of openerp on 2012-06-23

Launchpad automatic translations update.

6859. By Launchpad Translations on behalf of openerp on 2012-06-24

Launchpad automatic translations update.

6860. By Launchpad Translations on behalf of openerp on 2012-06-25

Launchpad automatic translations update.

6861. By Launchpad Translations on behalf of openerp on 2012-06-26

Launchpad automatic translations update.

6862. By Launchpad Translations on behalf of openerp on 2012-06-27

Launchpad automatic translations update.

6863. By Carlos Vásquez (ClearCorp) on 2012-06-28

[MRG] merge from first feature branch, used to continue with an updated addons 6.1 branch

6864. By Carlos Vásquez (ClearCorp) on 2012-06-30

[FIX] supplier payment with company currency not in rate = 1, with invoice and payment in foreign currency calculated a wrong change move line

[Carlos Vásquez (ClearCorp) (cv.clearcorp)]

I just re-uploaded the branch with the latest upstream revisions and with some other fixes to support payments (supplier payment) with company's currency with a rate not set to 1.

Unmerged revisions

6864. By Carlos Vásquez (ClearCorp) on 2012-06-30

[FIX] supplier payment with company currency not in rate = 1, with invoice and payment in foreign currency calculated a wrong change move line

6863. By Carlos Vásquez (ClearCorp) on 2012-06-28

[MRG] merge from first feature branch, used to continue with an updated addons 6.1 branch

=== modified file 'account/test/account_supplier_invoice.yml'
--- account/test/account_supplier_invoice.yml	2011-12-19 16:54:40 +0000
+++ account/test/account_supplier_invoice.yml	2012-06-30 19:56:18 +0000
@@ -27,7 +27,6 @@
     address_invoice_id: base.res_partner_address_3000
     check_total: 3000.0
     company_id: base.main_company
-    currency_id: base.EUR
     invoice_line:
       - account_id: account.a_expense
         name: '[PC1] Basic PC'

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2012-03-30 11:07:16 +0000
+++ account_voucher/account_voucher.py	2012-06-30 19:56:18 +0000
@@ -231,14 +231,14 @@
         for voucher in self.browse(cr, uid, ids, context=context):
             if voucher.currency_id:
                 if voucher.company_id.currency_id.id == voucher.payment_rate_currency_id.id:
-                    rate =  1 / voucher.payment_rate
+                    rate =  voucher.payment_rate
                 else:
                     ctx = context.copy()
                     ctx.update({'date': voucher.date})
                     voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate
                     company_currency_rate = voucher.company_id.currency_id.rate
-                    rate = voucher_rate * company_currency_rate
-            res[voucher.id] =  voucher.amount / rate
+                    rate = company_currency_rate / voucher_rate
+            res[voucher.id] =  voucher.amount * rate
         return res
 
     _name = 'account.voucher'
@@ -758,6 +758,10 @@
         return vals
 
     def proforma_voucher(self, cr, uid, ids, context=None):
+        '''
+        This method is executed by the workflow when the voucher is validated.
+        
+        '''
         self.action_move_line_create(cr, uid, ids, context=context)
         return True
 
@@ -1020,7 +1024,10 @@
             # if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
             # currency rate difference
             if line.amount == line.amount_unreconciled:
-                currency_rate_difference = line.move_line_id.amount_residual - amount
+                if voucher_brw.type == 'payment':
+                    currency_rate_difference = amount - line.move_line_id.amount_residual
+                else:
+                    currency_rate_difference = line.move_line_id.amount_residual - amount
             else:
                 currency_rate_difference = 0.0
             move_line = {
@@ -1076,12 +1083,18 @@
                     elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
                         # if the rate is specified on the voucher, we must use it
                         voucher_rate = currency_obj.browse(cr, uid, voucher_currency, context=ctx).rate
-                        amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate * voucher_rate
+                        amount_currency = currency_obj.compute(cr, uid, voucher_brw.company_id.currency_id.id, voucher_brw.currency_id.id, (move_line['debit'] - move_line['credit']), context=context)
+                        amount_currency = amount_currency * voucher_brw.payment_rate
                     else:
                         # otherwise we use the rates of the system (giving the voucher date in the context)
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
                 if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
-                    foreign_currency_diff = line.move_line_id.amount_residual_currency + amount_currency
+                    # The move_line_id.amount_residual_currency is positive if receivable and debit, or payable and credit
+                    # The amount_currency is positive if debit (for the new line to create)
+                    if line.move_line_id.account_id and line.move_line_id.account_id.type == 'payable':
+                        foreign_currency_diff = line.move_line_id.amount_residual_currency - amount_currency
+                    else:
+                        foreign_currency_diff = line.move_line_id.amount_residual_currency + amount_currency
 
             move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)
@@ -1186,19 +1199,24 @@
 
     def action_move_line_create(self, cr, uid, ids, context=None):
         '''
-        Confirm the vouchers given in ids and create the journal entries for each of them
+        Confirm the vouchers given in ids and create the journal entries for each of them.
+        The method proforma_voucher() just calls this one.
+        
         '''
+
         if context is None:
             context = {}
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
         for voucher in self.browse(cr, uid, ids, context=context):
             if voucher.move_id:
+                # Skip if voucher already has a move, usually indicates that it is posted
                 continue
             company_currency = self._get_company_currency(cr, uid, voucher.id, context)
             current_currency = self._get_current_currency(cr, uid, voucher.id, context)
             # we select the context to use accordingly if it's a multicurrency case or not
             context = self._sel_context(cr, uid, voucher.id, context)
+            # TODO: ctx and context seem to be the same, a double check is needed
             # But for the operations made by _convert_amount, we always need to give the date in the context
             ctx = context.copy()
             ctx.update({'date': voucher.date})