Merge lp:~openerp-dev/openobject-addons/6.0-opw-16360-nep into lp:openobject-addons/6.0

[Nehal Panchal (OpenERP)]

Hello,

General journals Report prints double entry for the journal, if the payment currency differs from the company's currency.

Improved General journals Report for grouping the entries as per journals.

Thank You.

[lp:~openerp-dev/openobject-addons/6.0-opw-16360-nep]

4736. By Launchpad Translations on behalf of openerp on 2011-07-29

Launchpad automatic translations update.

[Nehal Panchal (OpenERP) (nep-openerp)]

Hello ,

"General journals" Report prints double entry for the wages, bank and expenses journal, even if payment currency and company currency are same.

Thank You.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.0-opw-16360-nep]

4737. By Launchpad Translations on behalf of openerp on 2011-07-30

Launchpad automatic translations update.

4738. By Launchpad Translations on behalf of openerp on 2011-07-31

Launchpad automatic translations update.

4739. By Launchpad Translations on behalf of openerp on 2011-08-01

Launchpad automatic translations update.

4740. By Launchpad Translations on behalf of openerp on 2011-08-02

Launchpad automatic translations update.

4741. By Launchpad Translations on behalf of openerp on 2011-08-03

Launchpad automatic translations update.

4742. By Quentin (OpenERP) <email address hidden> on 2011-08-03

[MERGE] opw 5852

4743. By Anup(SerpentCS) on 2011-08-03

[Merge]account_vooucher : Merged My Branch to fix the regression in bank statement when importing supplier invoice

4744. By Anup(SerpentCS) on 2011-08-03

[MERGE] thunderbird : Merged Ravi's branch for fixing thunderbird issue(Case:16137)

4745. By Jay Vora (Serpent Consulting Services) on 2011-08-03

[FIX] Sale : Set taxes to be null on the onchange of Product

4746. By Launchpad Translations on behalf of openerp on 2011-08-04

Launchpad automatic translations update.

4747. By Anup(SerpentCS) on 2011-08-04

[MERGE] sale : Merged Ravi's branch for Picking policy reconfigure issue

4748. By Anup(SerpentCS) on 2011-08-04

[FIX] account : Merged my branch for account profit loss report fix(Case:5583)

4749. By Jay Vora (Serpent Consulting Services) on 2011-08-04

[MERGE] Merged Priyesh' branch for the fix of onchange() of analytic account inside analytic line while analytic_user_function is installed

4750. By Launchpad Translations on behalf of openerp on 2011-08-05

Launchpad automatic translations update.

4751. By Priyesh (OpenERP) on 2011-08-05

[MERGE] Merged my branch to improve _debit_credit_bal_qtty method of analytic account for passing the related field name instead of all fields (case:16550)

4752. By Jay Vora (Serpent Consulting Services) on 2011-08-05

[MERGE] Merged Valencia's branch for the fix of computation of company contribution in Payslip

4753. By Jay Vora (Serpent Consulting Services) on 2011-08-05

[MERGE] Merged Olivier Dony's branch to correct the stock reservation algorithm

4754. By Valencia Rodrigues (OpenERP) on 2011-08-05

[FIX] Sale_Layout : Corrected the RML and SXW for the layout report which was failing due to wrong conditions note

4755. By Priyesh (OpenERP) on 2011-08-05

[MERGE] Merged IRA's branch to improve calculation of taxes while invoicing(case:16152)

4756. By Launchpad Translations on behalf of openerp on 2011-08-07

Launchpad automatic translations update.

4757. By Launchpad Translations on behalf of openerp on 2011-08-08

Launchpad automatic translations update.

[Nehal Panchal (OpenERP) (nep-openerp)]

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.0-opw-16360-nep]

4758. By Priyesh (OpenERP) on 2011-08-08

[MERGE] Merged ADO's branch to fix the Keyerror: 'Amount' coming when Taxtype is defined as 'None' (case:16655)

4759. By Quentin (OpenERP) <email address hidden> on 2011-08-08

[FIX] crm_partner_assign: quick and dirty hack to switch latitude and longitude fields, as they are stored in wrong fields and we need to preserve database schema for existing instances. In trunk we will fix that in the right way.

4760. By Launchpad Translations on behalf of openerp on 2011-08-09

Launchpad automatic translations update.

4761. By Anup(SerpentCS) on 2011-08-09

[FIX] product : Merged Nehal's branch for UoM warning

4762. By Launchpad Translations on behalf of openerp on 2011-08-10

Launchpad automatic translations update.

4763. By Marco(Bremskerl) on 2011-08-10

[MERGE] Merged Marco(Bremskerl)'s branch for Purchase order report fixes(Case:16747)

4764. By Priyesh (OpenERP) on 2011-08-10

[MERGE] Merged ADO's branch to fetch the correct note of Payment term in Sale order report(case:16743)

4765. By Launchpad Translations on behalf of openerp on 2011-08-11

Launchpad automatic translations update.

4766. By Quentin (OpenERP) <email address hidden> on 2011-08-11

[FIX] account_voucher: 'currency_id' field doesn't exist in account.journal object, it's 'currency'

4767. By Anup(SerpentCS) on 2011-08-11

[MERGE] hr_timesheet : Merged Mohammed's branch for signin/signout wizard view fixes

4768. By Launchpad Translations on behalf of openerp on 2011-08-12

Launchpad automatic translations update.

4769. By Launchpad Translations on behalf of openerp on 2011-08-13

Launchpad automatic translations update.

4770. By Launchpad Translations on behalf of openerp on 2011-08-14

Launchpad automatic translations update.

4771. By Launchpad Translations on behalf of openerp on 2011-08-15

Launchpad automatic translations update.

4772. By Launchpad Translations on behalf of openerp on 2011-08-16

Launchpad automatic translations update.

4773. By Launchpad Translations on behalf of openerp on 2011-08-17

Launchpad automatic translations update.

4774. By Jay Vora (Serpent Consulting Services) on 2011-08-17

[FIX] Account_voucher : Fixed the onchange_date method which was missing the checking of context initially

4775. By Launchpad Translations on behalf of openerp on 2011-08-18

Launchpad automatic translations update.

4776. By Launchpad Translations on behalf of openerp on 2011-08-19

Launchpad automatic translations update.

4777. By Jay Vora (Serpent Consulting Services) on 2011-08-19

[MERGE] Merged Rifakat's branch for the fix of delivery report not printing the name when product has no code

4778. By Launchpad Translations on behalf of openerp on 2011-08-20

Launchpad automatic translations update.

4779. By Launchpad Translations on behalf of openerp on 2011-08-21

Launchpad automatic translations update.

4780. By Launchpad Translations on behalf of openerp on 2011-08-22

Launchpad automatic translations update.

4781. By Launchpad Translations on behalf of openerp on 2011-08-23

Launchpad automatic translations update.

4782. By Anup(SerpentCS) on 2011-08-23

[Merge] crm_*,project_*,hr_recruitment,mail_gateway: Merged my branch for the issue of Internal note(Case:16976)

4783. By Launchpad Translations on behalf of openerp on 2011-08-24

Launchpad automatic translations update.

4784. By Launchpad Translations on behalf of openerp on 2011-08-25

Launchpad automatic translations update.

4785. By Launchpad Translations on behalf of openerp on 2011-08-26

Launchpad automatic translations update.

4786. By Launchpad Translations on behalf of openerp on 2011-08-27

Launchpad automatic translations update.

4787. By Launchpad Translations on behalf of openerp on 2011-08-28

Launchpad automatic translations update.

4788. By Launchpad Translations on behalf of openerp on 2011-08-29

Launchpad automatic translations update.

4789. By Priyesh (OpenERP) on 2011-08-29

[MERGE] Merged My branch to fix the AssertionError of Fields in 'groupby' must appear in the list of fields to read(case:16819)

4790. By Quentin (OpenERP) <email address hidden> on 2011-08-18

[FIX] account, taxes report: removal of the option to print the report based on payment, as it seems we can't really do it. On the suggestion from fp and luc (c2c)

4791. By Quentin (OpenERP) <email address hidden> on 2011-08-29

[FIX] sale: backport of revision 3164.118.785 from trunk branch, to fix picked rate on SO

4792. By Launchpad Translations on behalf of openerp on 2011-08-30

Launchpad automatic translations update.

4793. By Priyesh (OpenERP) on 2011-08-30

[MERGE] Merged RHA's branch to fix the problem of showing inactive employees in Holidays report per department.(case:17104)

4794. By Anup(SerpentCS) on 2011-08-30

[MERGE] thunderbird,outlook : Merged Ravi's branch for documentation link fix(Case:17190)

4795. By Anup(SerpentCS) on 2011-08-30

[MERGE] thunderbird : Merged Ravi's branch for thunderbird push mail with accented chars fix(Case:16766)

4796. By Jay Vora (Serpent Consulting Services) on 2011-08-30

[MERGE] Merged Valencia's branch for the fix of creation of menu from wiki group(case 17204)

4797. By Jay Vora (Serpent Consulting Services) on 2011-08-30

[FIX] Hr_payroll,hr_payroll_account : Corrected the views and used xpath tag

4798. By Launchpad Translations on behalf of openerp on 2011-08-31

Launchpad automatic translations update.

4799. By Priyesh (OpenERP) on 2011-08-31

[IMP] account_voucher: Fixed AttributeError: 'bool' object has no attribute 'replace' in the absenece of number and activated sequence in payment journal of Voucher(case:17229)

4800. By Antony Lesuisse (OpenERP) on 2011-08-31

[FIX] account journal create sequence with company_id

4801. By tfr (Openerp) on 2011-09-01

[FIX] Calendar invitation issue

4802. By Quentin (OpenERP) <email address hidden> on 2011-09-01

[FIX] stock: allowed to set 0 as qty, otherwise if you ordered x PC1 and y PC2, and received only the PC1, then you have to delete the line with PC2 in the wizard. With that fix, you can just set it to 0

4803. By Launchpad Translations on behalf of openerp on 2011-09-02

Launchpad automatic translations update.

4804. By Launchpad Translations on behalf of openerp on 2011-09-03

Launchpad automatic translations update.

4805. By Launchpad Translations on behalf of openerp on 2011-09-04

Launchpad automatic translations update.

4806. By Launchpad Translations on behalf of openerp on 2011-09-05

Launchpad automatic translations update.

4807. By Launchpad Translations on behalf of openerp on 2011-09-06

Launchpad automatic translations update.

4808. By Anup(SerpentCS) on 2011-09-06

[Merge] Merged Valencia's branch for decimal precision fix(Case:17325)

4809. By Anup(SerpentCS) on 2011-09-06

[Merge] hr_timesheet_sheet : Merged Riken's branch for Timesheet's workflow correction(Case:17103)

4810. By Launchpad Translations on behalf of openerp on 2011-09-07

Launchpad automatic translations update.

4811. By Husen Daudi <hda@hda-laptop> on 2011-09-07

merged ach branch for issue opw-6306

4812. By Anup(SerpentCS) on 2011-09-07

[Merge] hr : Merged Nehal's branch for domain correction(Case:17165)

4813. By Anup(SerpentCS) on 2011-09-07

[Merge] sale_layout : Merged Nehal's branch for translation fixes in report(Case:17286)

4814. By Anup(SerpentCS) on 2011-09-07

[Merge] hr_holidays : Merged Nehal's branch for fixing the workflow(Case:17349)

4815. By Launchpad Translations on behalf of openerp on 2011-09-08

Launchpad automatic translations update.

4816. By Jay Vora (Serpent Consulting Services) on 2011-09-08

[MERGE] Merged Amit's branch for the fix of RFQ report showing good format of Address

4817. By Jay Vora (Serpent Consulting Services) on 2011-09-08

[MERGE] Analytic : Fixed the problem of search()/name_search() on analytic account,project

4818. By Launchpad Translations on behalf of openerp on 2011-09-09

Launchpad automatic translations update.

4819. By Launchpad Translations on behalf of openerp on 2011-09-10

Launchpad automatic translations update.

4820. By Launchpad Translations on behalf of openerp on 2011-09-13

Launchpad automatic translations update.

4821. By Launchpad Translations on behalf of openerp on 2011-09-14

Launchpad automatic translations update.

4822. By Raphael Collet (OpenERP) on 2011-09-14

[FIX] crm_partner_assign: switch latitude and longitude fields

4823. By Raphael Collet (OpenERP) on 2011-09-14

[FIX] crm_partner_assign: revert former fix, and switch labels in res.partner instead

4824. By Raphael Collet (OpenERP) on 2011-09-14

[MERGE] fix opw 16763: missing meetings in calendar view

4825. By Launchpad Translations on behalf of openerp on 2011-09-15

Launchpad automatic translations update.

[Anup(SerpentCS) (anup-serpent)]

Hello Nehal,

It is a crucial one.

Indeed a great fix!

Thanks.

review: Approve

[Anup(SerpentCS) (anup-serpent)]

Hello Nehal,

Can you please made the same fix with .sxw file as you did it with rml?

Thanks.

[lp:~openerp-dev/openobject-addons/6.0-opw-16360-nep]

4826. By Nehal Panchal (OpenERP) on 2011-09-15

[FIX] account : Improve General journals Report for grouping the entries as per journals

[Nehal Panchal (OpenERP) (nep-openerp)]

Hello Sir,

I have made the changes in .sxw as you suggested.

Thanks.

review: Needs Resubmitting

Unmerged revisions

4826. By Nehal Panchal (OpenERP) on 2011-09-15

[FIX] account : Improve General journals Report for grouping the entries as per journals

=== modified file 'account/report/account_general_journal.py'
--- account/report/account_general_journal.py	2011-01-14 00:11:01 +0000
+++ account/report/account_general_journal.py	2011-09-15 16:34:28 +0000
@@ -80,21 +80,32 @@
         filtered_objs = filter(filter_unique, journal_period_objs)
         return map(lambda x: x.period_id, filtered_objs)
 
-    def lines(self, period_id):
+    def lines(self, period_id, amount_currency):
         if not self.journal_ids:
             return []
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
-        self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.symbol AS currency_code,l.currency_id, '
+        if not amount_currency:
+            self.cr.execute('SELECT j.code, j.name, '
                         'SUM(l.debit) AS debit, SUM(l.credit) AS credit '
                         'FROM account_move_line l '
                         'LEFT JOIN account_move am ON (l.move_id=am.id) '
                         'LEFT JOIN account_journal j ON (l.journal_id=j.id) '
                         'LEFT JOIN res_currency c on (l.currency_id=c.id)'
                         'WHERE am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' '
-                        'GROUP BY j.id, j.code, j.name, l.amount_currency, c.symbol, l.currency_id ',
+                        'GROUP BY j.id, j.code, j.name ',
                         (tuple(move_state), period_id, tuple(self.journal_ids)))
+        else:
+            self.cr.execute('SELECT j.code, j.name, COALESCE(SUM(l.amount_currency),0.00) as amount_currency,c.symbol AS currency_code,l.currency_id, '
+                            'SUM(l.debit) AS debit, SUM(l.credit) AS credit '
+                            'FROM account_move_line l '
+                            'LEFT JOIN account_move am ON (l.move_id=am.id) '
+                            'LEFT JOIN account_journal j ON (l.journal_id=j.id) '
+                            'LEFT JOIN res_currency c on (l.currency_id=c.id)'
+                            'WHERE am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' '
+                            'GROUP BY j.id, j.code, j.name, COALESCE(l.amount_currency,0.00), c.symbol, l.currency_id ',
+                            (tuple(move_state), period_id, tuple(self.journal_ids)))
         return self.cr.dictfetchall()
 
     def _set_get_account_currency_code(self, account_id):

=== modified file 'account/report/account_general_journal.rml'
--- account/report/account_general_journal.rml	2011-01-14 00:11:01 +0000
+++ account/report/account_general_journal.rml	2011-09-15 16:34:28 +0000
@@ -342,7 +342,7 @@
         </tr>
       </blockTable>
       <section>
-      <para style="Standard">[[ repeatIn(lines(o.id),'line')]]</para>
+      <para style="Standard">[[ repeatIn(lines(o.id, data['form']['amount_currency']),'line')]]</para>
       <blockTable colWidths="100.0,125.0,90.0,100.0,100.0" style="Table_Journal_Detail">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
@@ -364,7 +364,7 @@
       </blockTable>
       </section>
 	  <section>
-	  <para style="Standard">[[ repeatIn(lines(o.id),'line')]]</para>
+	  <para style="Standard">[[ repeatIn(lines(o.id, data['form']['amount_currency']),'line')]]</para>
       <blockTable colWidths="100.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Detail">[[ display_currency(data)  or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>

=== modified file 'account/report/account_general_journal.sxw'
Binary files account/report/account_general_journal.sxw	2011-01-14 00:11:01 +0000 and account/report/account_general_journal.sxw	2011-09-15 16:34:28 +0000 differ