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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Frappe Bot 2019-02-28 10:08:08 +00:00
commit 5d414af86b
9 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
__version__ = '11.1.11'
__version__ = '11.1.12'
def get_default_company(user=None):
'''Get default company for user'''

1
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -46,6 +46,7 @@ class PurchaseInvoice(BuyingController):
}]
def onload(self):
super(PurchaseInvoice, self).onload()
supplier_tds = frappe.db.get_value("Supplier", self.supplier, "tax_withholding_category")
self.set_onload("supplier_tds", supplier_tds)

2
erpnext/patches.txt
View File

@ -587,4 +587,4 @@ erpnext.patches.v11_1.setup_guardian_role
execute:frappe.delete_doc('DocType', 'Notification Control')
erpnext.patches.v11_0.remove_barcodes_field_from_copy_fields_to_variants
erpnext.patches.v10_0.item_barcode_childtable_migrate # 16-02-2019
erpnext.patches.v11_0.make_italian_localization_fields
erpnext.patches.v11_0.make_italian_localization_fields # 26-02-2019

10
erpnext/patches/v11_0/make_italian_localization_fields.py
View File

@ -22,7 +22,9 @@ def execute():
condition += " when '{0}' then '{1}'".format(frappe.db.escape(state), frappe.db.escape(code))
if condition:
frappe.db.sql("""
UPDATE tabAddress set state_code = (case state {condition} end)
WHERE country in ('Italy', 'Italia', 'Italian Republic', 'Repubblica Italiana')
""".format(condition=condition))
condition = "state_code = (case state {0} end),".format(condition)
frappe.db.sql("""
UPDATE tabAddress set {condition} country_code = UPPER(ifnull((select code
from `tabCountry` where name = `tabAddress`.country), ''))
""".format(condition=condition))

10
erpnext/regional/italy/e-invoice.xml
View File

@ -9,7 +9,7 @@
{%- if address.state_code %}
<Provincia>{{ address.state_code }}</Provincia>
{%- endif %}
<Nazione>{{ address.country_code|upper }}</Nazione>
<Nazione>{{ address.country_code }}</Nazione>
{%- endmacro %}
{%- macro render_discount_or_margin(item) -%}
@ -40,7 +40,7 @@
<FatturaElettronicaHeader>
<DatiTrasmissione>
<IdTrasmittente>
<IdPaese>{{ doc.company_address_data.country_code|upper or "IT" }}</IdPaese>
<IdPaese>{{ doc.company_address_data.country_code }}</IdPaese>
<IdCodice>{{ doc.company_fiscal_code or doc.company_tax_id | replace("IT","") }}</IdCodice>
</IdTrasmittente>
<ProgressivoInvio>{{ doc.progressive_number }}</ProgressivoInvio>
@ -56,7 +56,7 @@
<CedentePrestatore>
<DatiAnagrafici>
<IdFiscaleIVA>
<IdPaese>{{ doc.company_address_data.country_code|upper or "IT"}}</IdPaese>
<IdPaese>{{ doc.company_address_data.country_code }}</IdPaese>
<IdCodice>{{ doc.company_tax_id | replace("IT","") }}</IdCodice>
</IdFiscaleIVA>
{%- if doc.company_fiscal_code %}
@ -99,7 +99,7 @@
<CodiceFiscale>{{ doc.customer_data.fiscal_code }}</CodiceFiscale>
{%- else %}
<IdFiscaleIVA>
<IdPaese>{{ doc.customer_address_data.country_code|upper or "IT" }}</IdPaese>
<IdPaese>{{ doc.customer_address_data.country_code }}</IdPaese>
<IdCodice>{{ doc.tax_id | replace("IT","") }}</IdCodice>
</IdFiscaleIVA>
{%- endif %}
@ -160,7 +160,7 @@
<CodiceTipo>CODICE</CodiceTipo>
<CodiceValore>{{ item.item_code }}</CodiceValore>
</CodiceArticolo>
<Descrizione>{{ html2text(item.description) or item.item_name }}</Descrizione>
<Descrizione>{{ html2text(item.description or '') or item.item_name }}</Descrizione>
<Quantita>{{ format_float(item.qty) }}</Quantita>
<UnitaMisura>{{ item.stock_uom }}</UnitaMisura>
<PrezzoUnitario>{{ format_float(item.price_list_rate or item.rate) }}</PrezzoUnitario>

2
erpnext/regional/italy/setup.py
View File

@ -132,7 +132,7 @@ def make_custom_fields(update=True):
'Supplier Quotation Item': invoice_item_fields,
'Address': [
dict(fieldname='country_code', label='Country Code',
fieldtype='Data', insert_after='country', print_hide=1, read_only=1,
fieldtype='Data', insert_after='country', print_hide=1, read_only=0,
fetch_from="country.code"),
dict(fieldname='state_code', label='State Code',
fieldtype='Data', insert_after='state', print_hide=1)

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

@ -189,7 +189,7 @@ def sales_invoice_validate(doc):
if not doc.company_address:
frappe.throw(_("Please set an Address on the Company '%s'" % doc.company), title=_("E-Invoicing Information Missing"))
else:
validate_address(doc.company_address, "Company")
validate_address(doc.company_address)
company_fiscal_regime = frappe.get_cached_value("Company", doc.company, 'fiscal_regime')
if not company_fiscal_regime:
@ -217,7 +217,7 @@ def sales_invoice_validate(doc):
if not doc.customer_address:
frappe.throw(_("Please set the Customer Address"), title=_("E-Invoicing Information Missing"))
else:
validate_address(doc.customer_address, "Customer")
validate_address(doc.customer_address)
if not len(doc.taxes):
frappe.throw(_("Please set at least one row in the Taxes and Charges Table"), title=_("E-Invoicing Information Missing"))
@ -285,13 +285,14 @@ def get_e_invoice_attachments(invoice):
return out
def validate_address(address_name, address_context):
pincode, city = frappe.db.get_value("Address", address_name, ["pincode", "city"])
if not pincode:
frappe.throw(_("Please set pin code on %s Address" % address_context), title=_("E-Invoicing Information Missing"))
if not city:
frappe.throw(_("Please set city on %s Address" % address_context), title=_("E-Invoicing Information Missing"))
def validate_address(address_name):
fields = ["pincode", "city", "country_code"]
data = frappe.get_cached_value("Address", address_name, fields, as_dict=1) or {}
for field in fields:
if not data.get(field):
frappe.throw(_("Please set {0} for address {1}".format(field.replace('-',''), address_name)),
title=_("E-Invoicing Information Missing"))
def get_unamended_name(doc):
attributes = ["naming_series", "amended_from"]
@ -312,6 +313,9 @@ def get_progressive_name_and_number(doc):
return progressive_name, progressive_number
def set_state_code(doc, method):
if doc.get('country_code'):
doc.country_code = doc.country_code.upper()
if not doc.get('state'):
return

2
erpnext/stock/doctype/item_price/test_item_price.py
View File

@ -11,7 +11,7 @@ from erpnext.stock.doctype.item_price.item_price import ItemPriceDuplicateItem
class TestItemPrice(unittest.TestCase):
def setUp(self):
frappe.db.sql("delete from `tabItem Price`")
frappe.db.sql("delete from `tabItem Price`")
make_test_records_for_doctype("Item Price", force=True)
def test_duplicate_item(self):

11
erpnext/stock/get_item_details.py
View File

@ -490,7 +490,7 @@ def get_price_list_rate_for(args, item_code):
price_list_rate = get_item_price(item_price_args, item_code)
if price_list_rate:
desired_qty = args.get("qty")
if check_packing_list(price_list_rate[0][0], desired_qty, item_code):
if desired_qty and check_packing_list(price_list_rate[0][0], desired_qty, item_code):
item_price_data = price_list_rate
else:
for field in ["customer", "supplier", "min_qty"]:
@ -521,12 +521,15 @@ def check_packing_list(price_list_rate_name, desired_qty, item_code):
:param qty: Derised Qt
"""
flag = True
item_price = frappe.get_doc("Item Price", price_list_rate_name)
if desired_qty and item_price.packing_unit:
if item_price.packing_unit:
packing_increment = desired_qty % item_price.packing_unit
if packing_increment == 0:
return True
if packing_increment != 0:
flag = False
return flag
def validate_price_list(args):
if args.get("price_list"):