Merge lp:~camptocamp/account-financial-report/7.0-add-ref-in-open-invoice-jge into lp:~account-report-core-editor/account-financial-report/7.0

[Joël Grand-Guillaume @ camptocamp]

Hi,

I just added the ref of the move line in the open invoice report. This seems very useful to find to which context an open invoice belong.

Regards

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM (only rev 66 will be applied)

review: Approve (code review, no tests)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I checked and Yannick is right. The rev66 has been merged already. A bit weird to see it in the diff though.

Thanks, LGTM

review: Approve (code review)

=== 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	2013-11-21 15:55:29 +0000
+++ account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html	2014-02-05 11:57:01 +0000
@@ -36,9 +36,11 @@
                 ## move
                 <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
                 ## journal
-                <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
+                <div class="act_as_cell" style="width: 50px;">${_('Journal')}</div>
+                ## move reference
+                <div class="act_as_cell" style="width: 75px;">${_('Ref.')}</div>
                 ## label
-                <div class="act_as_cell" style="width: 255px;">${_('Label')}</div>
+                <div class="act_as_cell" style="width: 200px;">${_('Label')}</div>
                 ## reconcile
                 <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
                 ## maturity
@@ -83,6 +85,8 @@
                   <div class="act_as_cell">${line.get('move_name') or ''}</div>
                   ## journal
                   <div class="act_as_cell">${line.get('jcode') or ''}</div>
+                   ## move reference
+                  <div class="act_as_cell">${line.get('lref') or ''}</div>
                   ## label
                   <div class="act_as_cell">${label}</div>
                   ## reconcile

=== modified file 'account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html'
--- account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html	2013-11-21 15:55:29 +0000
+++ account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html	2014-02-05 11:57:01 +0000
@@ -33,9 +33,11 @@
                 ## move
                 <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
                 ## journal
-                <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
+                <div class="act_as_cell" style="width: 50px;">${_('Journal')}</div>
                 ## partner
                 <div class="act_as_cell" style="width: 60px;">${_('Partner')}</div>
+                ## move reference
+                <div class="act_as_cell" style="width: 75px;">${_('Ref.')}</div>
                 ## label
                 <div class="act_as_cell" style="width: 255px;">${_('Label')}</div>
                 ## reconcile
@@ -86,6 +88,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

=== modified file 'account_financial_report_webkit/report_menus.xml'
--- account_financial_report_webkit/report_menus.xml	2013-09-12 20:53:27 +0000
+++ account_financial_report_webkit/report_menus.xml	2014-02-05 11:57:01 +0000
@@ -26,10 +26,13 @@
             parent="account.menu_journals_report" action="action_account_print_journal_menu_webkit"
             groups="account.group_account_manager,account.group_account_user" id="account.menu_account_print_journal"/>
 
-        <menuitem icon="STOCK_PRINT" name="Sale/Purchase Journals"
-            parent="account.menu_journals_report" action="action_account_print_journal_sale_purchase_menu_webkit"
-            groups="account.group_account_manager,account.group_account_user" id="account.menu_account_print_sale_purchase_journal"
-            sequence="1"/>
+        <!--
+        Hide Sale / Purchase Journals menu, replaced by a unique
+        "Journals" menu
+        -->
+        <record id="account.menu_account_print_sale_purchase_journal" model="ir.ui.menu">
+            <field name="groups">base.group_no_one</field>
+        </record>
 
     </data>
 </openerp>

=== modified file 'account_financial_report_webkit/wizard/print_journal.py'
--- account_financial_report_webkit/wizard/print_journal.py	2013-11-03 12:55:27 +0000
+++ account_financial_report_webkit/wizard/print_journal.py	2014-02-05 11:57:01 +0000
@@ -105,26 +105,6 @@
             res['value'] = {'period_from': start_period, 'period_to': end_period, 'date_from': False, 'date_to': False}
         return res
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        '''
-        used to set the domain on 'journal_ids' field: we exclude or only propose the journals of type
-        sale/purchase (+refund) accordingly to the presence of the key 'sale_purchase_only' in the context.
-        '''
-        if context is None:
-            context = {}
-        res = super(AccountReportPrintJournalWizard, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        doc = etree.XML(res['arch'])
-
-        if context.get('sale_purchase_only'):
-            domain = "[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]"
-        else:
-            domain = "[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]"
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('domain', domain)
-        res['arch'] = etree.tostring(doc)
-        return res
-
     def _print_report(self, cursor, uid, ids, data, context=None):
         context = context or {}
         # we update form with display account value

=== modified file 'account_financial_report_webkit/wizard/print_journal_view.xml'
--- account_financial_report_webkit/wizard/print_journal_view.xml	2013-09-12 20:53:27 +0000
+++ account_financial_report_webkit/wizard/print_journal_view.xml	2014-02-05 11:57:01 +0000
@@ -86,16 +86,5 @@
             <field name="model">account.journal.period</field>
         </record>
 
-        <record id="action_account_print_journal_sale_purchase_menu_webkit" model="ir.actions.act_window">
-            <field name="name">Journals</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">print.journal.webkit</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_report_print_journal_view_webkit"/>
-            <field name="context">{'sale_purchase_only':True}</field>
-            <field name="target">new</field>
-        </record>
-
     </data>
 </openerp>