Merge branch 'staging' into production

Author: sahil28297

.github/workflows/update_sit_servers.yml

@@ -0,0 +1,18 @@
+name: Deploy SIT Servers
+
+on:
+  push:
+    branches: [ staging ]
+  workflow_dispatch:
+
+jobs:
+  deployment:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Deploy on SIT Servers
+      uses: fjogeleit/http-request-action@master
+      with:
+        url: 'https://awx.bloomstack.org/api/v2/job_templates/9/launch/'
+        method: 'POST'
+        username: ${{ secrets.AWX_USERNAME }}
+        password: ${{ secrets.AWX_PASSWORD }}

erpnext/__init__.py

@@ -6,7 +6,7 @@
 from frappe.utils import getdate
 
 __erpnext_version__ = '12.10.1'
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/print_format/sales_invoice/__init__.py

@@ -0,0 +1,26 @@
+{
+ "align_labels_right": 0,
+ "creation": "2021-03-02 04:15:14.254142",
+ "css": ".print-format div, .print-format span, .print-format td, .print-format h1, .print-format h2, .print-format h3, .print-format h4 {\n    font-family: 'Lato', sans-serif\n}\n\n.text-right {\n    text-align: right;\n    font-weight: bold;\n}\n\n.row {\n    margin-right: 0;\n    margin-left: 0;\n}\n\n.col-md-6 {\n  padding-left: 0;\n  padding-right: 0;\n  display: inline-block;\n  width: 49%;\n  margin-bottom: 6px;\n  vertical-align: middle;\n  color: #000;\n}\n\n.billing_shipping_info {\n    margin-top: 30px;\n}\n\ntable {\n    width: 100%;\n    margin-top: 30px;\n}\n\nh2 {\n    font-size: 22px;\n    font-weight: 800;\n    text-transform: uppercase;\n}\n\n.col-md-6 h3 {\n    color: #000;\n    text-transform: uppercase;\n    font-size: 14px;\n    margin-top: 0\n}\n\n.bill_to {\n    margin-right: 20px;\n}\n\n.col-md-6 .row .col-md-6 p {\n    font-size: 14px;\n    font-weight: 600;\n    margin: 0;\n}\n\n.col-md-6 .row .col-md-6 h3 {\n    margin-bottom: 4px;\n}\n\ntable thead tr {\n    color: #000;\n    text-transform: uppercase;\n    padding: 5px 13px;\n    font-size: 14px;\n}\n\ntable tr {\n    border: 1px solid gray;\n}\n\ntable td,\ntable th {\n    border-right: 1px solid gray;\n}\n\ntable thead tr th:first-child {\n    padding-left: 13px!important\n}",
+ "custom_format": 1,
+ "disabled": 0,
+ "doc_type": "Sales Invoice",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}]",
+ "html": "{% if doc.license %}\n{% set type = frappe.db.get_value('Compliance Info' ,doc.license, 'license_for' )%}\n{% endif %}\n<div class=\"row\">\n    <div class=\"col-md-6\">\n        <h2>{{doc.company}}</h2>\n        <div class=\"company-address\">\n            {% set links = frappe.get_all(\"Dynamic Link\", filters={\"link_doctype\": \"Company\", \"link_name\": doc.company, \"parenttype\": \"Address\"}, fields=[\"parent\"]) %}\n                {% if links %}\n                    <p>{{ frappe.db.get_value(\"Address\", links[0].parent, \"address_line1\")}}, \n                    {{ frappe.db.get_value(\"Address\", links[0].parent, \"address_line2\") or \" \" }}</p>\n                    <p>{{ frappe.db.get_value(\"Address\", links[0].parent, \"city\") or \" \" }},\n                    {{ frappe.db.get_value(\"Address\", links[0].parent, \"state\") or \" \" }},\n                    {{ frappe.db.get_value(\"Address\", links[0].parent, \"country\") or \" \" }},\n                    {{ frappe.db.get_value(\"Address\", links[0].parent, \"pincode\") or \" \" }}.\n                {% endif %}\n            </div>\n            <p class=\"license\">License: {{ frappe.db.get_value(\"Company\",doc.company , \"license\") or \" \" }}</p>\n            <p class=\"phone\">Phone: {{ frappe.db.get_value(\"Address\", links[0].parent, \"phone\") or \" \" }}.</p>\n    </div>\n    <div class=\"col-md-6\">\n        <h2 class=\"text-right\">Invoice</h2>\n        <div class=\"row\">\n            <div class=\"col-md-6\">\n                <h3>Invoice Number</h3>\n            </div>\n            <div class=\"col-md-6\">\n                <p>{{doc.name}}</p>\n            </div>\n        </div>\n          <div class=\"row\">\n            <div class=\"col-md-6\">\n                <h3>Date</h3>\n            </div>\n            <div class=\"col-md-6\">\n                <p>{{doc.posting_date}}</p>\n            </div>\n        </div>\n        {% if type != \"Retailer\" %}\n        <div class=\"row\">\n            <div class=\"col-md-6\">\n                <h3>Terms</h3>\n            </div>\n            <div class=\"col-md-6\">\n                <p>{{doc.payment_terms_template}}</p>\n            </div>\n        </div>\n        <div class=\"row\">\n            <div class=\"col-md-6\">\n                <h3>Due Date</h3>\n            </div>\n            <div class=\"col-md-6\">\n                <p>{{doc.due_date}}</p>\n            </div>\n        </div>\n        {% endif %}\n    </div>\n</div>\n {% if type != \"Retailer\" %}\n<div class=\"row billing_shipping_info\">\n    <div class=\"col-md-6\">\n        <h3 class=\"bill_to\">Bill To:</h3>\n        <p class=\"customer\">{{doc.customer}}</p>\n        <p class=\"company_address\">{{doc.address_display or ''}}</p>\n        <p class=\"license\">License: {{doc.license or \"\"}}</p>\n        <p class=\"license\">A/R Contact: {{doc.contact_person or \"\"}}</p>\n    </div>\n    <div class=\"col-md-6\">\n        <h3>Ship To:</h3>\n        <p class=\"customer\">{{doc.customer}}</p>\n        <p class=\"comapany_address\">{{doc.shipping_address or \"\"}}</p>\n    </div>\n</div>\n{% endif %}\n<div class=\"row\">\n    <table>\n        <thead>\n            <tr>\n                <th width=\"50%\">Description</th>\n                <th>Quantity</th>\n                <th>Unit Price</th>\n                <th>Amount</th>\n            </tr>\n        </thead>\n        <tbody>\n    {% for item in doc.items %}\n        <tr>\n            <td>{{item.item_name or \"\"}}</td>\n            <td>{{item.qty or \"0\"}}</td>\n            <td>{{item.rate or \"0\"}}</td>\n            <td>{{item.amount or \"0\"}}</td>\n        </tr>\n    {% endfor %}\n    </tbody>\n    </table>\n</div>\n<div class=\"row\">\n    <table>\n        <thead>\n            <tr>\n                <th width=\"50%\">Account Head</th>\n                <th>Tax</th>\n                <th>Rate</th>\n                <th>Tax Amount</th>\n            </tr>\n        </thead>\n        <tbody>\n    {% for tax in doc.taxes %}\n        <tr>\n            <td>{{tax.account_head or ''}}</td>\n            <td>{{tax.description or ''}}</td>\n            <td>{{tax.rate or ''}}</td>\n            <td>{{tax.tax_amount or ''}}</td>\n        </tr>\n    {% endfor %}\n    </tbody>\n    </table>\n</div>\n<div class=\"row\">\n    <table>\n       <tbody>\n            {% if type != \"Retailer\" %}\n           <tr>\n               <td colspan=\"3\" class=\"text-right\">Subtotal</td>\n               <td class=\"text-right\">{{doc.total}}</td>\n           </tr>\n           {% endif %}\n           <tr>\n               <td colspan=\"3\" class=\"text-right\">Discount</td>\n               <td class=\"text-right\">{{doc.discount_amount}}</td>\n           </tr>\n            {% if type != \"Retailer\" %}\n           <tr>\n               <td colspan=\"3\" class=\"text-right\">Net Total</td>\n               <td class=\"text-right\">{{doc.net_total}}</td>\n           </tr>\n           {% endif %}\n           <tr>\n               <td colspan=\"3\" class=\"text-right\">Taxes Charged</td>\n               <td class=\"text-right\">{{doc.total_taxes_and_charges}}</td>\n           </tr>\n           <tr>\n               <td colspan=\"3\" class=\"text-right\">Grand Total</td>\n               <td class=\"text-right\">{{doc.grand_total}}</td>\n           </tr>\n           <tr>\n               <td colspan=\"3\" class=\"text-right\">Mode of Payment</td>\n               {% set mode_of_payment = frappe.get_all(\"Payment Entry\",{\"reference_name\": doc.name},\"mode_of_payment\") %}\n               <td class=\"text-right\">\n                {% for m in mode_of_payment %}\n                    {{m.mode_of_payment}}\n                {% endfor%}\n                </td>\n           </tr>\n       </tbody>\n    </table>\n</div>\n",
+ "idx": 0,
+ "line_breaks": 0,
+ "modified": "2021-05-06 00:18:12.444557",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Sales Invoice",
+ "owner": "Administrator",
+ "parent": "Sales Invoice",
+ "print_format_builder": 1,
+ "print_format_type": "Jinja",
+ "raw_printing": 0,
+ "show_section_headings": 0,
+ "standard": "Yes"
+}

erpnext/accounts/print_format/sales_invoice/sales_invoice.json

@@ -57,6 +57,12 @@ frappe.ui.form.on("Waste Disposal", {
 		});
 	},
 
+	s_warehouse: function(frm) {
+		for (let row of frm.doc.items) {
+			frappe.model.set_value(row.doctype, row.name, "warehouse", frm.doc.s_warehouse);
+		}
+	},
+
 	get_items: function (frm) {
 		frappe.prompt({
 			label: "Warehouse",

erpnext/compliance/doctype/waste_disposal/waste_disposal.js

@@ -8,6 +8,7 @@
 import requests
 import json
 from six import text_type
+from frappe import _
 from frappe.model.document import Document
 
 class FlowkanaSettings(Document):

erpnext/erpnext_integrations/doctype/flowkana_settings/flowkana_settings.py

@@ -0,0 +1,8 @@
+// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('LeafLink Settings', {
+	// refresh: function(frm) {
+
+	// }
+});

erpnext/erpnext_integrations/doctype/leaflink_settings/__init__.py

@@ -0,0 +1,122 @@
+{
+ "creation": "2021-04-12 17:03:28.589509",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "enable_leaflink",
+  "leaflink_configurations_section",
+  "leaflink_id",
+  "api_key",
+  "api_value",
+  "legacy_api_key",
+  "incoming_api_authentication_key",
+  "column_break_7",
+  "base_url",
+  "orders_url",
+  "products_url",
+  "customers_url",
+  "default_customer_group",
+  "default_customer_territory"
+ ],
+ "fields": [
+  {
+   "fieldname": "api_key",
+   "fieldtype": "Data",
+   "label": "API Key"
+  },
+  {
+   "fieldname": "api_value",
+   "fieldtype": "Data",
+   "label": "API Value"
+  },
+  {
+   "default": "0",
+   "fieldname": "enable_leaflink",
+   "fieldtype": "Check",
+   "label": "Enable LeafLink"
+  },
+  {
+   "fieldname": "orders_url",
+   "fieldtype": "Data",
+   "label": "Orders URL"
+  },
+  {
+   "fieldname": "products_url",
+   "fieldtype": "Data",
+   "label": "Products URL"
+  },
+  {
+   "fieldname": "customers_url",
+   "fieldtype": "Data",
+   "label": "Customers URL"
+  },
+  {
+   "fieldname": "column_break_7",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "default_customer_group",
+   "fieldtype": "Link",
+   "label": "Default Customer Group",
+   "options": "Customer Group"
+  },
+  {
+   "fieldname": "default_customer_territory",
+   "fieldtype": "Link",
+   "label": "Default Customer Territory",
+   "options": "Territory"
+  },
+  {
+   "fieldname": "incoming_api_authentication_key",
+   "fieldtype": "Data",
+   "label": "Incoming API Authentication Key"
+  },
+  {
+   "depends_on": "eval:doc.enable_leaflink==1",
+   "fieldname": "leaflink_id",
+   "fieldtype": "Int",
+   "label": "LeafLink ID"
+  },
+  {
+   "collapsible": 1,
+   "collapsible_depends_on": "eval:doc.enable_leaflink==1",
+   "fieldname": "leaflink_configurations_section",
+   "fieldtype": "Section Break",
+   "in_standard_filter": 1,
+   "label": "LeafLink Configurations"
+  },
+  {
+   "fieldname": "base_url",
+   "fieldtype": "Data",
+   "label": "Base URL"
+  },
+  {
+   "fieldname": "legacy_api_key",
+   "fieldtype": "Data",
+   "label": "Legacy API Key"
+  }
+ ],
+ "issingle": 1,
+ "modified": "2021-05-10 01:30:12.918710",
+ "modified_by": "Administrator",
+ "module": "ERPNext Integrations",
+ "name": "LeafLink Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}