nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-12-hotfix' into import-italian-invoice

Browse Source
This commit is contained in:
Marica
2020-05-28 12:20:35 +05:30
committed by GitHub
parent 4f75a3a29b 64078da47b
commit aa6280f5cd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
View File

@@ -180,7 +180,7 @@ def get_advance_vouchers(suppliers, fiscal_year=None, company=None, from_date=No
if company: if company:
condition += "and company =%s" % (company) condition += "and company =%s" % (company)
if from_date and to_date: if from_date and to_date:
condition += "and posting_date between %s and %s" % (company, from_date, to_date) condition += "and posting_date between %s and %s" % (from_date, to_date)
## Appending the same supplier again if length of suppliers list is 1 ## Appending the same supplier again if length of suppliers list is 1
## since tuple of single element list contains None, For example ('Test Supplier 1', ) ## since tuple of single element list contains None, For example ('Test Supplier 1', )

4
erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
View File

@@ -133,7 +133,7 @@
"label": "Customer Settings" "label": "Customer Settings"
}, },
{ {
"description": "If Shopify not contains a customer in Order, then while syncing Orders, the system will consider default customer for order", "description": "If Shopify does not have a customer in the order, then while syncing the orders, the system will consider the default customer for the order",
"fieldname": "default_customer", "fieldname": "default_customer",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Default Customer", "label": "Default Customer",
@@ -277,4 +277,4 @@
], ],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC"
} }