Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into po-status-updater-dev-1

Browse Source
This commit is contained in:
Nabin Hait 2019-05-22 15:05:08 +05:30 committed by GitHub
commit 5ee08620cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/regional/italy/utils.py
View File

@ -75,7 +75,7 @@ def prepare_invoice(invoice, progressive_number):
invoice.tax_data = tax_data invoice.tax_data = tax_data
#Check if stamp duty (Bollo) of 2 EUR exists. #Check if stamp duty (Bollo) of 2 EUR exists.
stamp_duty_charge_row = next((tax for tax in invoice.taxes if tax.charge_type == _("Actual") and tax.tax_amount == 2.0 ), None) stamp_duty_charge_row = next((tax for tax in invoice.taxes if tax.charge_type == "Actual" and tax.tax_amount == 2.0 ), None)
if stamp_duty_charge_row: if stamp_duty_charge_row:
invoice.stamp_duty = stamp_duty_charge_row.tax_amount invoice.stamp_duty = stamp_duty_charge_row.tax_amount
@ -222,7 +222,7 @@ def sales_invoice_validate(doc):
#Validate customer details #Validate customer details
customer = frappe.get_doc("Customer", doc.customer) customer = frappe.get_doc("Customer", doc.customer)
if customer.customer_type == _("Individual"): if customer.customer_type == "Individual":
doc.customer_fiscal_code = customer.fiscal_code doc.customer_fiscal_code = customer.fiscal_code
if not doc.customer_fiscal_code: if not doc.customer_fiscal_code:
frappe.throw(_("Please set Fiscal Code for the customer '%s'" % doc.customer), title=_("E-Invoicing Information Missing")) frappe.throw(_("Please set Fiscal Code for the customer '%s'" % doc.customer), title=_("E-Invoicing Information Missing"))

1
erpnext/setup/doctype/item_group/item_group.py
View File

@ -113,6 +113,7 @@ def get_product_list_for_group(product_group=None, start=0, limit=10, search=Non
data = frappe.db.sql(query, {"product_group": product_group,"search": search, "today": nowdate()}, as_dict=1) data = frappe.db.sql(query, {"product_group": product_group,"search": search, "today": nowdate()}, as_dict=1)
data = adjust_qty_for_expired_items(data) data = adjust_qty_for_expired_items(data)
if cint(frappe.db.get_single_value("Shopping Cart Settings", "enabled")):
for item in data: for item in data:
set_product_info_for_website(item) set_product_info_for_website(item)