From 28d8ae62440933e59029072e5f7235d7861e4ea5 Mon Sep 17 00:00:00 2001
From: Nihadness <1992.nihad@gmail.com>
Date: Fri, 26 May 2017 15:54:43 +0200
Subject: [PATCH 1/3] Removed Html field from ARReport.

---
 bika/lims/content/arreport.py    |  2 --
 bika/lims/upgrade/v3_2_0_1705.py | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/bika/lims/content/arreport.py b/bika/lims/content/arreport.py
index 8fd5fd8ec7..36c8a10323 100644
--- a/bika/lims/content/arreport.py
+++ b/bika/lims/content/arreport.py
@@ -29,8 +29,6 @@
     ),
     BlobField('Pdf',
     ),
-    StringField('Html',
-    ),
     StringField('SMS',
     ),
     RecordsField('Recipients',
diff --git a/bika/lims/upgrade/v3_2_0_1705.py b/bika/lims/upgrade/v3_2_0_1705.py
index 94391a146c..a9594baab9 100644
--- a/bika/lims/upgrade/v3_2_0_1705.py
+++ b/bika/lims/upgrade/v3_2_0_1705.py
@@ -64,8 +64,26 @@ def upgrade(tool):
     if CATALOG_ANALYSIS_REQUEST_LISTING not in ut.refreshcatalog:
         ut.refreshcatalog.append(CATALOG_ANALYSIS_REQUEST_LISTING)
 
+    # Deleting 'Html' field from ARReport objects.
+    removeHtmlFromAR(portal)
+
     # Refresh affected catalogs
     ut.refreshCatalogs()
 
     logger.info("{0} upgraded to version {1}".format(product, version))
     return True
+
+
+def removeHtmlFromAR(portal):
+    """
+    'Html' StringField has been deleted from ARReport Schema.
+    Now removing this attribute from old objects to save some memory.
+    """
+    uc = getToolByName(portal, 'uid_catalog')
+    ar_reps = uc(portal_type='ARReport')
+    f_name = 'Html'
+    for ar in ar_reps:
+        obj = ar.getObject()
+        if hasattr(obj, f_name):
+            delattr(obj, f_name)
+            print 'R'

From 9a6d212a0e7ddefb94fb8f6d363243d94689c4b7 Mon Sep 17 00:00:00 2001
From: Nihadness <1992.nihad@gmail.com>
Date: Tue, 30 May 2017 11:20:31 +0200
Subject: [PATCH 2/3] Progress info message.

---
 bika/lims/upgrade/v3_2_0_1705.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bika/lims/upgrade/v3_2_0_1705.py b/bika/lims/upgrade/v3_2_0_1705.py
index a9594baab9..dd7a874ec3 100644
--- a/bika/lims/upgrade/v3_2_0_1705.py
+++ b/bika/lims/upgrade/v3_2_0_1705.py
@@ -82,8 +82,12 @@ def removeHtmlFromAR(portal):
     uc = getToolByName(portal, 'uid_catalog')
     ar_reps = uc(portal_type='ARReport')
     f_name = 'Html'
+    counter = 0
     for ar in ar_reps:
         obj = ar.getObject()
         if hasattr(obj, f_name):
             delattr(obj, f_name)
-            print 'R'
+            counter += 1
+
+    logger.info("'Html' attribute has been removed from %d ARReport objects."
+                % counter)

From 28143906096ccc5685b8216be5899fbc7a5fbc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= <jpuiggene@naralabs.com>
Date: Tue, 30 May 2017 17:26:58 +0200
Subject: [PATCH 3/3] Do not set value for ARReport's Html field

---
 bika/lims/browser/analysisrequest/publish.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bika/lims/browser/analysisrequest/publish.py b/bika/lims/browser/analysisrequest/publish.py
index a821e07581..05016807d4 100644
--- a/bika/lims/browser/analysisrequest/publish.py
+++ b/bika/lims/browser/analysisrequest/publish.py
@@ -845,7 +845,6 @@ def publishFromHTML(self, aruid, results_html):
             report.edit(
                 AnalysisRequest=ar.UID(),
                 Pdf=pdf_report,
-                Html=results_html,
                 Recipients=recipients
             )
             report.unmarkCreationFlag()