openerp-community-reviewer team mailing list archive

Thread
Date

[Merge] lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh into lp:account-financial-report

To: mp+214897@xxxxxxxxxxxxxxxxxx
From: "Matthieu Dietrich @ camptocamp" <matthieu.dietrich@xxxxxxxxxxxxxx>
Date: Wed, 09 Apr 2014 08:52:22 -0000
Reply-to: mp+214897@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Matthieu Dietrich @ camptocamp has proposed merging lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh into lp:account-financial-report.

Commit message:
[FIX] total lines in open invoices now correctly aligned
[IMP] reference field added to general & partner ledger

Requested reviews:
  Account Report Core Editors (account-report-core-editor)

For more details, see:
https://code.launchpad.net/~camptocamp/account-financial-report/7.0-add-reference-field-mdh/+merge/214897

The last addition of the reference field to the "Open Invoices" report created a shift to the left for total lines; it's now corrected ,and I also added the field to General & Partner ledgers (requirement from one of our customers).
-- 
https://code.launchpad.net/~camptocamp/account-financial-report/7.0-add-reference-field-mdh/+merge/214897
Your team Account Report Core Editors is requested to review the proposed merge of lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh into lp:account-financial-report.

=== modified file 'account_financial_report_webkit/report/templates/account_report_general_ledger.mako'
--- account_financial_report_webkit/report/templates/account_report_general_ledger.mako	2013-11-21 15:55:29 +0000
+++ account_financial_report_webkit/report/templates/account_report_general_ledger.mako	2014-04-09 08:51:48 +0000
@@ -82,7 +82,7 @@
               cumul_balance_curr = 0.0
               %>
             <div class="act_as_table list_table" style="margin-top: 10px;">
-                
+
                 <div class="act_as_caption account_title">
                     ${account.code} - ${account.name}
                 </div>
@@ -93,15 +93,17 @@
                         ## period
                         <div class="act_as_cell" style="width: 50px;">${_('Period')}</div>
                         ## move
-                        <div class="act_as_cell" style="width: 60px;">${_('Entry')}</div>
+                        <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
                         ## journal
                         <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
                         ## account code
                         <div class="act_as_cell" style="width: 65px;">${_('Account')}</div>
                         ## partner
-                        <div class="act_as_cell" style="width: 120px;">${_('Partner')}</div>
+                        <div class="act_as_cell" style="width: 140px;">${_('Partner')}</div>
+                        ## move reference
+                        <div class="act_as_cell" style="width: 140px;">${_('Reference')}</div>
                         ## label
-                        <div class="act_as_cell" style="width: 200px;">${_('Label')}</div>
+                        <div class="act_as_cell" style="width: 160px;">${_('Label')}</div>
                         ## counterpart
                         <div class="act_as_cell" style="width: 100px;">${_('Counter part')}</div>
                         ## debit
@@ -140,6 +142,8 @@
                           <div class="act_as_cell"></div>
                           ## partner
                           <div class="act_as_cell"></div>
+                          ## move reference
+                          <div class="act_as_cell"></div>
                           ## label
                           <div class="act_as_cell">${_('Initial Balance')}</div>
                           ## counterpart
@@ -184,6 +188,8 @@
                           <div class="act_as_cell">${account.code}</div>
                           ## partner
                           <div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
+                          ## move reference
+                          <div class="act_as_cell">${line.get('lref') or ''}</div>
                           ## label
                           <div class="act_as_cell">${label}</div>
                           ## counterpart
@@ -206,8 +212,8 @@
                 <div class="act_as_table list_table">
                     <div class="act_as_row labels" style="font-weight: bold;">
                         ## date
-                        <div class="act_as_cell first_column" style="width: 350px;">${account.code} - ${account.name}</div>
-                        <div class="act_as_cell" style="width: 365px;">${_("Cumulated Balance on Account")}</div>
+                        <div class="act_as_cell first_column" style="width: 615px;">${account.code} - ${account.name}</div>
+                        <div class="act_as_cell" style="width: 260px;">${_("Cumulated Balance on Account")}</div>
                         ## debit
                         <div class="act_as_cell amount" style="width: 75px;">${ formatLang(cumul_debit) | amount }</div>
                         ## credit

=== modified file 'account_financial_report_webkit/report/templates/account_report_partners_ledger.mako'
--- account_financial_report_webkit/report/templates/account_report_partners_ledger.mako	2013-11-21 15:55:29 +0000
+++ account_financial_report_webkit/report/templates/account_report_partners_ledger.mako	2014-04-09 08:51:48 +0000
@@ -67,7 +67,7 @@
                 <div class="act_as_cell">${ initial_balance_text[initial_balance_mode] }</div>
             </div>
         </div>
-    
+
         %for account in objects:
             %if account.ledger_lines or account.init_balance:
                 <%
@@ -102,13 +102,15 @@
                             ## period
                             <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
                             ## move
-                            <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
+                            <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
                             ## journal
                             <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
                             ## partner
-                            <div class="act_as_cell" style="width: 60px;">${_('Partner')}</div>
+                            <div class="act_as_cell" style="width: 100px;">${_('Partner')}</div>
+                            ## move reference
+                            <div class="act_as_cell" style="width: 60px;">${_('Reference')}</div>
                             ## label
-                            <div class="act_as_cell" style="width: 310px;">${_('Label')}</div>
+                            <div class="act_as_cell" style="width: 280px;">${_('Label')}</div>
                             ## reconcile
                             <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
                             ## debit
@@ -150,6 +152,8 @@
                               <div class="act_as_cell"></div>
                               ## partner
                               <div class="act_as_cell"></div>
+                              ## move reference
+                              <div class="act_as_cell"></div>
                               ## label
                               <div class="act_as_cell" >${_('Initial Balance')}</div>
                               ## reconcile
@@ -191,6 +195,8 @@
                               <div class="act_as_cell">${line.get('jcode') or ''}</div>
                               ## partner
                               <div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
+                              ## move reference
+                              <div class="act_as_cell">${line.get('lref') or ''}</div>
                               ## label
                               <div class="act_as_cell">${label}</div>
                               ## reconcile
@@ -221,6 +227,8 @@
                           <div class="act_as_cell"></div>
                           ## partner
                           <div class="act_as_cell"></div>
+                          ## move reference
+                          <div class="act_as_cell"></div>
                           ## label
                           <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
                           ## reconcile
@@ -254,9 +262,9 @@
 
                 <div class="act_as_table list_table" style="margin-top:5px;">
                     <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
-                            <div class="act_as_cell first_column" style="width: 320px;">${account.code} - ${account.name}</div>
+                            <div class="act_as_cell first_column" style="width: 450px;">${account.code} - ${account.name}</div>
                             ## label
-                            <div class="act_as_cell" style="width: 390px;">${_("Cumulated Balance on Account")}</div>
+                            <div class="act_as_cell" style="width: 360px;">${_("Cumulated Balance on Account")}</div>
                             ## debit
                             <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
                             ## credit

=== modified file 'account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html'
--- account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html	2014-02-05 11:53:47 +0000
+++ account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html	2014-04-09 08:51:48 +0000
@@ -10,8 +10,8 @@
    %for partner_name, p_id, p_ref, p_name in account.partners_order:
     <div class="account_title bg" style="width: 1080px; margin-top:
       20px; font-size: 12px;">${account.code} - ${account.name} --  ${partner_name or _('No Partner')} </div>
-    
- 
+
+
 
     %for curr, grouped_lines in account.grouped_ledger_lines.get(p_id, []):
     <%
@@ -21,7 +21,7 @@
       cumul_balance_curr = 0.0
 
       part_cumul_balance = 0.0
-      part_cumul_balance_curr = 0.0 
+      part_cumul_balance_curr = 0.0
     %>
     <div class="act_as_table list_table" style="margin-top: 5px;">
         <div class="act_as_caption account_title">
@@ -34,13 +34,13 @@
                 ## period
                 <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
                 ## move
-                <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
+                <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
                 ## journal
-                <div class="act_as_cell" style="width: 50px;">${_('Journal')}</div>
+                <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
                 ## move reference
-                <div class="act_as_cell" style="width: 75px;">${_('Ref.')}</div>
+                <div class="act_as_cell" style="width: 100px;">${_('Reference')}</div>
                 ## label
-                <div class="act_as_cell" style="width: 200px;">${_('Label')}</div>
+                <div class="act_as_cell" style="width: 180px;">${_('Label')}</div>
                 ## reconcile
                 <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
                 ## maturity
@@ -115,6 +115,8 @@
               <div class="act_as_cell"></div>
               ## journal
               <div class="act_as_cell"></div>
+              ## move reference
+              <div class="act_as_cell"></div>
               ## label
               <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
               ## reconcile
@@ -148,9 +150,9 @@
 %endfor
        <div class="act_as_table list_table" style="margin-top:5px;">
         <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
-                <div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div>
+                <div class="act_as_cell first_column" style="width: 450px;">${account.code} - ${account.name}</div>
                 ## label
-                <div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div>
+                <div class="act_as_cell" style="width: 320px;">${_("Cumulated Balance on Account")}</div>
                 ## debit
                 <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
                 ## credit

=== modified file 'account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html'
--- account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html	2014-02-05 11:53:47 +0000
+++ account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html	2014-04-09 08:51:48 +0000
@@ -9,7 +9,7 @@
     %>
 
     <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${account.code} - ${account.name}</div>
-    
+
     %for partner_name, p_id, p_ref, p_name in account.partners_order:
     <%
       total_debit = 0.0
@@ -18,7 +18,7 @@
       cumul_balance_curr = 0.0
 
       part_cumul_balance = 0.0
-      part_cumul_balance_curr = 0.0 
+      part_cumul_balance_curr = 0.0
     %>
     <div class="act_as_table list_table" style="margin-top: 5px;">
         <div class="act_as_caption account_title">
@@ -31,15 +31,15 @@
                 ## period
                 <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
                 ## move
-                <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
+                <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
                 ## journal
-                <div class="act_as_cell" style="width: 50px;">${_('Journal')}</div>
+                <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
                 ## partner
-                <div class="act_as_cell" style="width: 60px;">${_('Partner')}</div>
+                <div class="act_as_cell" style="width: 120px;">${_('Partner')}</div>
                 ## move reference
-                <div class="act_as_cell" style="width: 75px;">${_('Ref.')}</div>
+                <div class="act_as_cell" style="width: 100px;">${_('Reference')}</div>
                 ## label
-                <div class="act_as_cell" style="width: 255px;">${_('Label')}</div>
+                <div class="act_as_cell" style="width: 180px;">${_('Label')}</div>
                 ## reconcile
                 <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
                 ## maturity
@@ -122,6 +122,8 @@
               <div class="act_as_cell"></div>
               ## partner
               <div class="act_as_cell"></div>
+              ## move reference
+              <div class="act_as_cell"></div>
               ## label
               <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
               ## reconcile
@@ -156,9 +158,9 @@
     %endfor
     <div class="act_as_table list_table" style="margin-top:5px;">
         <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
-                <div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div>
+                <div class="act_as_cell first_column" style="width: 520px;">${account.code} - ${account.name}</div>
                 ## label
-                <div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div>
+                <div class="act_as_cell" style="width: 320px;">${_("Cumulated Balance on Account")}</div>
                 ## debit
                 <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
                 ## credit

Follow ups

[Merge] lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh into lp:account-financial-report
From: noreply, 2014-04-25
Re: [Merge] lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh into lp:account-financial-report
From: Guewen Baconnier @ Camptocamp, 2014-04-25
Re: [Merge] lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh into lp:account-financial-report
From: Frederic Clementi - Camptocamp, 2014-04-14
Re: [Merge] lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh into lp:account-financial-report
From: Leonardo Pistone - camptocamp, 2014-04-09