Merge branch 'staging' into production

Author: sahil28297

bloomstack_core/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '2.0.6'
+__version__ = '2.0.7'

bloomstack_core/bloomstack_core/custom/bom.json

@@ -419,8 +419,8 @@
    "parenttype": null,
    "property": "search_fields",
    "property_type": "Data",
-   "value": "item_code,item_name,package_tag,item_group"
+   "value": "item_code,item_name,item_group"
   }
  ],
  "sync_on_migrate": 1
-}
+}

bloomstack_core/bloomstack_core/custom/package_tag.json

@@ -8,10 +8,10 @@
  "docstatus": 0,
  "doctype": "Print Format",
  "font": "Default",
- "html": "\n<style>\n\t.print-format {\n\t\tpadding: 0px;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\tpadding: 0in;\n\t\t}\n\t}\n</style>\n<div style=\"position: relative; top:0.0cm\">\n\t<div style=\"width:20.0cm;height:9.0cm;\">\n\t\t<span style=\"top:2.0cm; left:11.15cm;\n\t\t\tposition: absolute;\">\n\t\t\t{{ frappe.utils.formatdate(doc.reference_date) or '' }}\n\t\t</span>\n\t\t<span style=\"top:0.75cm;left:18.0cm;\n\t\t\tposition: absolute;  min-width: 6cm;\">\n\t\t\t{{ doc.account_no or '' }}\n\t\t</span>\n\t\t<span style=\"top:3.5cm;left: 3.0cm;\n\t\t\tposition: absolute;  min-width: 6cm;\">\n\t\t\t{{doc.party_name}}\n\t\t</span>\n\t\t<span style=\"top:3.5cm;left: 16.5cm;\n\t\t\tposition: absolute; min-width: 4cm;\">\n\t\t\t{{doc.get_formatted(\"base_paid_amount\") or doc.get_formatted(\"base_received_amount\")}}\n\t\t</span>\n\t\t<span style=\"top:1.5cm;left: 4.0cm;\n\t\t\tposition: absolute;  min-width: 6cm;\">\n\t\t\t{{doc.company}}\n\t\t</span>\n\t</div>\n</div>\n\n\n<div class=\"remittance padding\">\n    <div class=\"wrapper\">\n   <div class=\"bank-info\">\n       <p class=\"text-left\">{{doc.company}}</p>\n       <p class=\"text-middle\">Check Number : {{doc.reference_no or ''}}</p>\n       <p class=\"text-right\">Check Date: {{ doc.reference_date or '' }}</p>\n   </div>\n   <table>\n       <thead>\n           <tr>\n               <td width=\"15%\">Invoice Date</td>\n               <td width=\"15%\">Invoice Number</td>\n               <td width=\"55%\">Memo</td>\n               <td class=\"text-right\" width=\"15%\">Amount Paid</td>\n           </tr>\n       </thead>\n       <tbody>\n           {% for reference in doc.references %}\n           <tr>\n               <td>{{ frappe.utils.formatdate(reference.due_date, \"MM/dd/yyyy\") }}</td>\n               <td>{{reference.bill_no}}</td>\n               {% set remarks = frappe.db.get_value(\"Purchase Invoice\", reference.reference_name, \"remarks\") %}\n                <td>{{ remarks if remarks != \"No Remarks\" else \"\" }}</td>\n               <td class=\"text-right\">{{ frappe.format_value(reference.total_amount, df = \"Currency\") }}</td>\n           </tr>\n           {% endfor %}\n       </tbody>\n       <tfoot>\n           <tr>\n               <td colspan = \"3\">Total Paid</td>\n               <td class=\"text-right\">{{doc.get_formatted(\"paid_amount\")}}</td>\n           </tr>\n       </tfoot>\n   </table>\n   </div>\n</div>\n\n<div class=\"remittance no-padding\">\n    <div class=\"wrapper\">\n    <div class=\"bank-info\">\n       <p class=\"text-left\">{{doc.company}}</p>\n       <p class=\"text-middle\">Check Number : {{doc.reference_no or ''}}</p>\n       <p class=\"text-right\">Check Date: {{ doc.reference_date or '' }}</p>\n   </div>\n   <table>\n       <thead>\n           <tr>\n               <td width=\"15%\">Invoice Date</td>\n               <td width=\"15%\">Invoice Number</td>\n               <td width=\"55%\">Memo</td>\n               <td class=\"text-right\" width=\"15%\">Amount Paid</td>\n           </tr>\n       </thead>\n       <tbody>\n           {% for reference in doc.references %}\n           <tr>\n               <td>{{ frappe.utils.formatdate(reference.due_date, \"MM/dd/yyyy\") }}</td>\n               <td>{{reference.bill_no}}</td>\n                {% set remarks = frappe.db.get_value(\"Purchase Invoice\", reference.reference_name, \"remarks\") %}\n                <td>{{ remarks if remarks != \"No Remarks\" else \"\" }}</td>\n               <td class=\"text-right\">{{ frappe.format_value(reference.total_amount, df = \"Currency\") }}</td>\n           </tr>\n           {% endfor %}\n       </tbody>\n       <tfoot>\n           <tr>\n               <td colspan = \"3\">Total Paid</td>\n               <td class=\"text-right\">{{doc.get_formatted(\"paid_amount\")}}</td>\n           </tr>\n       </tfoot>\n   </table>\n   </div>\n</div>\n",
+ "html": "\n<style>\n\t.print-format {\n\t\tpadding: 0px;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\tpadding: 0in;\n\t\t}\n\t}\n</style>\n<div style=\"position: relative; top:0.0cm\">\n\t<div style=\"width:20.0cm;height:9.0cm;\">\n\t\t<span style=\"top:2.0cm; left:11.15cm;\n\t\t\tposition: absolute;\">\n\t\t\t{{ frappe.utils.formatdate(doc.reference_date) or '' }}\n\t\t</span>\n\t\t<span style=\"top:0.75cm;left:18.0cm;\n\t\t\tposition: absolute;  min-width: 6cm;\">\n\t\t\t{{ doc.account_no or '' }}\n\t\t</span>\n\t\t<span style=\"top:3.5cm;left: 3.0cm;\n\t\t\tposition: absolute;  min-width: 6cm;\">\n\t\t\t{{doc.party_name}}\n\t\t</span>\n\t\t<span style=\"top:3.5cm;left: 16.5cm;\n\t\t\tposition: absolute; min-width: 4cm;\">\n\t\t\t{{doc.get_formatted(\"base_paid_amount\") or doc.get_formatted(\"base_received_amount\")}}\n\t\t</span>\n\t\t<span style=\"top:1.5cm;left: 4.0cm;\n\t\t\tposition: absolute;  min-width: 6cm;\">\n\t\t\t{{doc.company}}\n\t\t</span>\n\t\t\t<span style=\"top:5cm;left: 3.0cm;\n\t\t\tposition: absolute;  min-width: 6cm;\">\n\t\t\t{{frappe.utils.money_in_words(doc.base_paid_amount)}}\n\t\t</span>\n\t</div>\n</div>\n\n\n<div class=\"remittance padding\">\n    <div class=\"wrapper\">\n   <div class=\"bank-info\">\n       <p class=\"text-left\">{{doc.company}}</p>\n       <p class=\"text-middle\">Check Number : {{doc.reference_no or ''}}</p>\n       <p class=\"text-right\">Check Date: {{ doc.reference_date or '' }}</p>\n   </div>\n   <table>\n       <thead>\n           <tr>\n               <td width=\"15%\">Invoice Date</td>\n               <td width=\"15%\">Invoice Number</td>\n               <td width=\"55%\">Memo</td>\n               <td class=\"text-right\" width=\"15%\">Amount Paid</td>\n           </tr>\n       </thead>\n       <tbody>\n           {% for reference in doc.references %}\n           <tr>\n               <td>{{ frappe.utils.formatdate(reference.due_date, \"MM/dd/yyyy\") }}</td>\n               <td>{{reference.bill_no}}</td>\n               {% set remarks = frappe.db.get_value(\"Purchase Invoice\", reference.reference_name, \"remarks\") %}\n                <td>{{ remarks if remarks != \"No Remarks\" else \"\" }}</td>\n               <td class=\"text-right\">{{ frappe.format_value(reference.total_amount, df = \"Currency\") }}</td>\n           </tr>\n           {% endfor %}\n       </tbody>\n       <tfoot>\n           <tr>\n               <td colspan = \"3\">Total Paid</td>\n               <td class=\"text-right\">{{doc.get_formatted(\"paid_amount\")}}</td>\n           </tr>\n       </tfoot>\n   </table>\n   </div>\n</div>\n\n<div class=\"remittance no-padding\">\n    <div class=\"wrapper\">\n    <div class=\"bank-info\">\n       <p class=\"text-left\">{{doc.company}}</p>\n       <p class=\"text-middle\">Check Number : {{doc.reference_no or ''}}</p>\n       <p class=\"text-right\">Check Date: {{ doc.reference_date or '' }}</p>\n   </div>\n   <table>\n       <thead>\n           <tr>\n               <td width=\"15%\">Invoice Date</td>\n               <td width=\"15%\">Invoice Number</td>\n               <td width=\"55%\">Memo</td>\n               <td class=\"text-right\" width=\"15%\">Amount Paid</td>\n           </tr>\n       </thead>\n       <tbody>\n           {% for reference in doc.references %}\n           <tr>\n               <td>{{ frappe.utils.formatdate(reference.due_date, \"MM/dd/yyyy\") }}</td>\n               <td>{{reference.bill_no}}</td>\n                {% set remarks = frappe.db.get_value(\"Purchase Invoice\", reference.reference_name, \"remarks\") %}\n                <td>{{ remarks if remarks != \"No Remarks\" else \"\" }}</td>\n               <td class=\"text-right\">{{ frappe.format_value(reference.total_amount, df = \"Currency\") }}</td>\n           </tr>\n           {% endfor %}\n       </tbody>\n       <tfoot>\n           <tr>\n               <td colspan = \"3\">Total Paid</td>\n               <td class=\"text-right\">{{doc.get_formatted(\"paid_amount\")}}</td>\n           </tr>\n       </tfoot>\n   </table>\n   </div>\n</div>\n",
  "idx": 0,
  "line_breaks": 0,
- "modified": "2020-10-26 06:36:08.614152",
+ "modified": "2020-12-24 02:08:12.055664",
  "modified_by": "Administrator",
  "module": "Bloomstack Core",
  "name": "Cheque with Remittance",

bloomstack_core/bloomstack_core/print_format/cheque_with_remittance/cheque_with_remittance.json

@@ -12,3 +12,5 @@ bloomstack_core.patches.v0_0_1.set_item_group_in_batch
 bloomstack_core.patches.v0_0_1.set_task_name_in_timesheet
 bloomstack_core.patches.v0_0_1.move_compliance_item_to_item
 bloomstack_core.patches.v0_0_1.remove_bloomstack_user_integration
+bloomstack_core.patches.v0_0_1.delete_bom_from_property_setter
+bloomstack_core.patches.v0_0_1.removed_mandatory_for_attachment_field

bloomstack_core/patches.txt

@@ -0,0 +1,7 @@
+import frappe
+
+def execute():
+    # Delete BOM property from property setter.
+    frappe.db.sql("""DELETE FROM `tabProperty Setter`
+    WHERE
+    doc_type='BOM' AND property='title_field'""")

bloomstack_core/patches/v0_0_1/delete_bom_from_property_setter.py

@@ -0,0 +1,4 @@
+import frappe
+
+def execute():
+	frappe.delete_doc_if_exists("Custom Field", "Job Applicant-resume_attachment-reqd")