From c392a7c4cc4519ea590caf917c6859699d3f1172 Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Thu, 13 Aug 2015 14:07:41 +0200
Subject: [PATCH] [FIX] Activity Report modification

---
 partner_activity_report_base/README.rst       |  3 +--
 partner_activity_report_base/__openerp__.py   |  8 ++++----
 .../{ => views}/report.xml                    |  2 +-
 .../views/report_partner_activity.xml         | 19 +++++++------------
 .../wizard/partner_activity_selection.py      |  2 +-
 .../wizard/partner_activity_selection.xml     | 11 ++++-------
 6 files changed, 18 insertions(+), 27 deletions(-)
 rename partner_activity_report_base/{ => views}/report.xml (94%)

diff --git a/partner_activity_report_base/README.rst b/partner_activity_report_base/README.rst
index 2b5ba68e5..6134e667a 100644
--- a/partner_activity_report_base/README.rst
+++ b/partner_activity_report_base/README.rst
@@ -5,7 +5,6 @@ Partner Activity Details Base
 =============================
 
 This module give a report with basic information on the partner
----------------------------------------------------------------
 
 * Display adresses and contact of the partner
 
@@ -16,7 +15,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/partner-contact/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
-`here <https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_activity_report%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`here <https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_activity_report_base%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 
 Credits
diff --git a/partner_activity_report_base/__openerp__.py b/partner_activity_report_base/__openerp__.py
index 902211937..8c50ea6bb 100644
--- a/partner_activity_report_base/__openerp__.py
+++ b/partner_activity_report_base/__openerp__.py
@@ -21,17 +21,17 @@
 
 {
     'name': 'Partner Activity Details',
-    'summary': "This module give a report with recent activity on the partner",
+    'summary': """Base extensible report for the partner activity
+     - Addresses and contacts""",
     'version': '1.2',
     'author': "Camptocamp, Odoo Community Association (OCA)",
-    'maintainer': 'Odoo Community Association (OCA)',
-    'category': 'Extra Tools',
+    'category': 'Partner and Contact Management',
     'website': 'http://www.camptocamp.com',
     'depends': ['base'],
     'data': [
         'wizard/partner_activity_selection.xml',
         'views/report_partner_activity.xml',
-        'report.xml'
+        'views/report.xml'
     ],
     'demo': [],
     'test': [],
diff --git a/partner_activity_report_base/report.xml b/partner_activity_report_base/views/report.xml
similarity index 94%
rename from partner_activity_report_base/report.xml
rename to partner_activity_report_base/views/report.xml
index 406b84089..88c04f8fd 100644
--- a/partner_activity_report_base/report.xml
+++ b/partner_activity_report_base/views/report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data noupdate="0">
+  <data >
     <report
       id="partner_activity_report_base.report_partner_activity"
       model="partner.print.activity"
diff --git a/partner_activity_report_base/views/report_partner_activity.xml b/partner_activity_report_base/views/report_partner_activity.xml
index 7429c6706..6f61c1609 100644
--- a/partner_activity_report_base/views/report_partner_activity.xml
+++ b/partner_activity_report_base/views/report_partner_activity.xml
@@ -2,10 +2,9 @@
 <openerp>
     <data>
         <template id="partner_activity_report_base.report_partner_activity_def">
-            <t t-call="report.external_layout">
+            <t t-call="report.internal_layout">
                 <div class="page">
                     <t t-foreach="o.partner_ids" t-as="partner">
-
                         <p t-if="option_selected.partner_information">
                             <h2>
                                 <span>Partner Informations</span>
@@ -121,20 +120,16 @@
                                 </tbody>
                             </table>
                         </p>
-
-                        <p style="page-break-after:always"></p>
-                    </t>
-                </div>
+                       </t>
+					 </div>
+                  <p style="page-break-after:always"></p>
             </t>
         </template>
 
         <template id="partner_activity_report_base.report_partner_activity_qweb">
-            <style type="text/css">
-                .total { border-top: 5px double darkgrey !important; }
-                .subtotal { border-top: 2px solid darkgrey !important; }
-                .col-separator { border-right: 3px solid lightgrey !important; }
-                .large-text { min-height: 50px !important;}
-            </style>
+            <t t-set="data_report_margin_top" t-value="12"/>
+	        <t t-set="data_report_header_spacing" t-value="9"/>
+	        <t t-set="data_report_dpi" t-value="110"/>
             <t t-call="report.html_container">
                 <t t-foreach="doc_ids" t-as="doc_id">
                     <t
diff --git a/partner_activity_report_base/wizard/partner_activity_selection.py b/partner_activity_report_base/wizard/partner_activity_selection.py
index 176e1f769..e8a287864 100644
--- a/partner_activity_report_base/wizard/partner_activity_selection.py
+++ b/partner_activity_report_base/wizard/partner_activity_selection.py
@@ -22,7 +22,7 @@
 from openerp import models, fields, api, _
 
 
-class partner_print_activity(models.TransientModel):
+class PartnerPrintActivity(models.TransientModel):
     _name = 'partner.print.activity'
     _description = 'Partner printing activity'
 
diff --git a/partner_activity_report_base/wizard/partner_activity_selection.xml b/partner_activity_report_base/wizard/partner_activity_selection.xml
index 84e774ed6..1fa8a31e4 100644
--- a/partner_activity_report_base/wizard/partner_activity_selection.xml
+++ b/partner_activity_report_base/wizard/partner_activity_selection.xml
@@ -6,13 +6,10 @@
       <field name="model">partner.print.activity</field>
       <field name="arch" type="xml">
         <form string="Print partner activity">
-          <separator string="Select part to print" colspan="4"/>
-          <newline/>
-          <group>
-	        <field name="partner_information" colspan="4" />
-	        <field name="partner_address_information" colspan="4" />
+          <group string="Select parts to print">
+	        <field name="partner_information" />
+	        <field name="partner_address_information"/>
           </group>
-          <newline/>
           <footer>
             <button class="oe_highlight" name="print_report" string="Print" type="object"/>
             or
@@ -28,7 +25,7 @@
                 src_model="res.partner"
                 view_mode="form"
                 target="new"
-                key2="client_action_multi"
+                key2="client_print_multi"
                 id="open_partner_activity_report_wizard_menu_action"/>
 
   </data>