Merge pull request #13227 from achillesrasquinha/py3
[FIX] use text_type instead of unicode, use cmp from past.builtins
diff --git a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
index e925952..c939dd5 100644
--- a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
+++ b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
@@ -7,7 +7,7 @@
def execute():
- items_barcode = frappe.get_list('Item', ['name', 'barcode'], { 'barcode': ('!=', '') })
+ items_barcode = frappe.get_all('Item', ['name', 'barcode'], { 'barcode': ('!=', '') })
frappe.reload_doc("stock", "doctype", "item")
frappe.reload_doc("stock", "doctype", "item_barcode")
diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
index 0e4ba6b..19318df 100644
--- a/erpnext/setup/setup_wizard/data/country_wise_tax.json
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -1230,14 +1230,18 @@
},
"Switzerland": {
- "Switzerland VAT 8%": {
- "account_name": "VAT 8%",
- "tax_rate": 8.00,
+ "Switzerland normal VAT": {
+ "account_name": "VAT 7.7%",
+ "tax_rate": 7.70,
"default": 1
},
- "Switzerland VAT 2.4%": {
- "account_name": "VAT 2.4%",
- "tax_rate": 2.40
+ "Switzerland reduced VAT": {
+ "account_name": "VAT 2.5%",
+ "tax_rate": 2.50
+ },
+ "Switzerland lodging VAT": {
+ "account_name": "VAT 3.7%",
+ "tax_rate": 3.70
}
},