Merge branch 'develop' into dev-work-order-bugs
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index ff08a72..ce9731e 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
-__version__ = '12.1.4'
+__version__ = '12.1.5'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/el_salvador_standard.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/el_salvador_standard.json
new file mode 100644
index 0000000..6409d95
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/el_salvador_standard.json
@@ -0,0 +1,809 @@
+{
+ "country_code": "sv",
+ "name": "El Salvador Standard",
+ "tree": {
+ "100000 - ACTIVOS - xmC": {
+ "11000000 - ACTIVOS CORRIENTES - xmC": {
+ "11010000 - EFECTIVO Y EQUIVALENTES AL EFECTIVO - xmC": {
+ "11010100 - Caja general - xmC": {
+ "account_number": "11010100",
+ "account_type": "Cash"
+ },
+ "Caja chica": {
+ "account_number": "11010200",
+ "account_type": "Cash",
+ "is_group": 1
+ },
+ "Efectivo en bancos": {
+ "account_number": "11010300",
+ "account_type": "Bank",
+ "is_group": 1
+ },
+ "account_number": "11010000",
+ "account_type": "Cash"
+ },
+ "CUENTAS POR COBRAR ARRENDAMIENTOS FINANCIEROS": {
+ "Arrendamientos financieros por cobrar": {
+ "account_number": "11040100",
+ "is_group": 1
+ },
+ "Estimaci\u00f3n para cuentas de cobro dudoso (CR)": {
+ "account_number": "11040200",
+ "is_group": 1
+ },
+ "account_number": "11040000"
+ },
+ "DEUDORES COMERCIALES Y OTRAS CUENTAS POR COBRAR": {
+ "11030100 - Deudores comerciales - xmC": {
+ "account_number": "11030100",
+ "account_type": "Receivable"
+ },
+ "Estimaci\u00f3n para cuentas de cobro dudoso (CR)": {
+ "account_number": "11030200",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Otras cuentas por cobrar no comerciales": {
+ "account_number": "11030300",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "account_number": "11030000",
+ "account_type": "Receivable"
+ },
+ "GASTOS PAGADOS POR ANTICIPADO": {
+ "Adelantos a empleados": {
+ "account_number": "110904",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "Papeler\u00eda y \u00fatiles en existencia": {
+ "account_number": "11090300",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "Primas de seguros aun no vendidas": {
+ "account_number": "11090100",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "Rentas aun no corridas por los inmuebles": {
+ "account_number": "11090200",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "account_number": "11090000",
+ "account_type": "Temporary"
+ },
+ "INVENTARIOS": {
+ "11050100 - Inventarios en bodega al costo - xmC": {
+ "account_number": "11050100",
+ "account_type": "Stock"
+ },
+ "11050300 - Pedidos en transito - xmC": {
+ "account_number": "11050300",
+ "account_type": "Stock Received But Not Billed"
+ },
+ "Estimaci\u00f3n para obsolescencia de inventarios o de lento movimiento (CR)": {
+ "account_number": "11050200",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Mercader\u00edas en consignaci\u00f3n": {
+ "account_number": "11050400",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "account_number": "11050000",
+ "account_type": "Stock"
+ },
+ "INVERSIONES TEMPORALES": {
+ "Acciones": {
+ "account_number": "11020100",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "Bonos": {
+ "account_number": "11020200",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "C\u00e9dulas hipotecarias": {
+ "account_number": "11020300",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "account_number": "11020000",
+ "account_type": "Temporary"
+ },
+ "IVA CREDITO FISCAL": {
+ "IVA compras locales": {
+ "account_number": "11060100",
+ "account_type": "Tax",
+ "is_group": 1,
+ "tax_rate": 13.0
+ },
+ "IVA importaciones": {
+ "account_number": "11060200",
+ "account_type": "Tax",
+ "is_group": 1,
+ "tax_rate": 13.0
+ },
+ "account_number": "11060000",
+ "account_type": "Tax",
+ "tax_rate": 13.0
+ },
+ "IVA PERCIBIDO": {
+ "account_number": "IVA PERCIBIDO",
+ "account_type": "Tax",
+ "is_group": 1,
+ "tax_rate": 1.0
+ },
+ "IVA RETENIDO": {
+ "account_number": "11070000",
+ "account_type": "Tax",
+ "is_group": 1,
+ "tax_rate": 1.0
+ },
+ "account_number": "11000000"
+ },
+ "12000000 - ACTIVOS NO CORRIENTES - xmC": {
+ "ACTIVOS INTANGIBLES": {
+ "Concesiones y franquicias": {
+ "account_number": "12080300",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Derechos de llave": {
+ "account_number": "12080100",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Patentes y marcas de fabrica": {
+ "account_number": "12080200",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Software": {
+ "account_number": "12080400",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "account_number": "12080000",
+ "account_type": "Fixed Asset"
+ },
+ "CUENTAS POR COBRAR ARRENDAMIENTOS FINANCIEROS A LARGO PLAZO": {
+ "Arrendamientos financieros por cobrar a largo plazo": {
+ "account_number": "12060100",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Estimaci\u00f3n para cuentas de cobro dudoso a largo plazo (CR)": {
+ "account_number": "12060200",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "account_number": "12060000",
+ "account_type": "Receivable"
+ },
+ "DEPRECIACION ACUMULUDA (CR)": {
+ "12030100 - Deprec. acumulada de propiedades, planta y equipo propio al costo - xmC": {
+ "account_number": "12030100",
+ "account_type": "Accumulated Depreciation"
+ },
+ "Deprec. acumulada de prop., planta y equipo bajo arrend. Financiero": {
+ "account_number": "12030200",
+ "account_type": "Accumulated Depreciation",
+ "is_group": 1
+ },
+ "Deprec. acumulada de revaluaos de propiedades, planta y equipo": {
+ "account_number": "12030300",
+ "account_type": "Accumulated Depreciation",
+ "is_group": 1
+ },
+ "account_number": "12030000",
+ "account_type": "Accumulated Depreciation"
+ },
+ "DEUDORES COMERCIALES Y OTRAS CUENTAS POR COBRAR A LARGO PLAZO": {
+ "12050100 - Deudores comerciales a largo plazo - xmC": {
+ "account_number": "12050100",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Cuentas por cobrar no comerciales a largo plazo": {
+ "account_number": "12050300",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Estimaci\u00f3n para cuentas de cobro dudoso a largo plazo (CR)": {
+ "account_number": "12050200",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "account_number": "12050000",
+ "account_type": "Receivable"
+ },
+ "IMPUESTO SOBRE LA RENTA DIFERIDO-ACTIVO": {
+ "12070200 - Pago anticipados de impuestos sobre la renta - xmC": {
+ "account_number": "12070200",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "Cr\u00e9dito impuestos sobre la renta de a\u00f1os anteriores": {
+ "account_number": "12070100",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "account_number": "12070000",
+ "account_type": "Tax"
+ },
+ "INVERSIONES PERMANENTES": {
+ "Inversiones en asociadas": {
+ "account_number": "12040200",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Inversiones en negocios conjuntos": {
+ "account_number": "12040300",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Inversiones en subsidiarias": {
+ "account_number": "12040100",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "account_number": "12040000",
+ "account_type": "Fixed Asset"
+ },
+ "PROPIEDADES, PLANTA Y EQUIPO": {
+ "12010300 - Maquinarias y equipos - xmC": {
+ "account_number": "12010300",
+ "account_type": "Fixed Asset"
+ },
+ "Edificios": {
+ "account_number": "12010200",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Mobiliario y equipo": {
+ "account_number": "12010400",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Terrenos": {
+ "account_number": "12010100",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Veh\u00edculos": {
+ "account_number": "12010500",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "account_number": "12010000",
+ "account_type": "Fixed Asset"
+ },
+ "REVALUACIONES DE PROPIEDADES, PLANTA Y EQUIPO": {
+ "Revaluaci\u00f3n de edificios": {
+ "account_number": "12020200",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Revaluaci\u00f3n de maquinarias y equipo": {
+ "account_number": "12020300",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Revaluaci\u00f3n de mobiliario y equipo": {
+ "account_number": "12020400",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Revaluaci\u00f3n de terrenos": {
+ "account_number": "12020100",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Revaluaci\u00f3n de veh\u00edculos": {
+ "account_number": "12020500",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "account_number": "12020000",
+ "account_type": "Fixed Asset"
+ },
+ "account_number": "12000000",
+ "account_type": "Fixed Asset"
+ },
+ "account_number": "100000",
+ "root_type": "Asset"
+ },
+ "20000000 - PASIVOS - xmC": {
+ "PASIVOS CORRIENTES": {
+ "ACREEDORES COMERCIALES Y OTRAS CUENTAS POR PAGAR": {
+ "21020100 - Cuentas por pagar comerciales - xmC": {
+ "account_number": "21020100",
+ "account_type": "Payable"
+ },
+ "Documentos por pagar comerciales": {
+ "account_number": "21020200",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "account_number": "21020000",
+ "account_type": "Payable"
+ },
+ "BENEFICIOS A EMPLEADOS POR PAGAR": {
+ "Beneficios a corto plazo por pagar": {
+ "account_number": "21050100",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Beneficios post empleo por pagar": {
+ "account_number": "21050200",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "account_number": "21050000",
+ "account_type": "Payable"
+ },
+ "DIVIDENDOS POR PAGAR": {
+ "account_number": "21080000",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "IMPUESTO SOBRE LA RENTA CORRIENTE POR PAGAR": {
+ "account_number": "21070000",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "IVA DEBITOS FISCALES": {
+ "Por ventas a consumidores": {
+ "account_number": "21060200",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "Por ventas a contribuyentes": {
+ "account_number": "21060100",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "account_number": "21060000",
+ "account_type": "Tax"
+ },
+ "OBLIGACIONES BAJO ARRENDAMIENTOS FINANCIEROS PORCION CORRIENTE": {
+ "Contratos bajo arrendamientos financieros": {
+ "account_number": "21030100",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "account_number": "21030000",
+ "account_type": "Payable"
+ },
+ "OTROS ACREEDORES, RETENCIONES Y DESCUENTOS": {
+ "Cuentas por pagar a accionistas": {
+ "account_number": "21040400",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Descuentos": {
+ "account_number": "21040300",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Otros acreedores": {
+ "account_number": "21040100",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Retenciones": {
+ "account_number": "21040200",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "account_number": "21040000",
+ "account_type": "Payable"
+ },
+ "PRESTAMOS Y SOBREGIROS BANCARIOS": {
+ "Porci\u00f3n corriente de prestamos bancarios a largo plazo": {
+ "account_number": "21010300",
+ "is_group": 1
+ },
+ "Prestamos bancarios a corto plazo": {
+ "account_number": "21010100",
+ "is_group": 1
+ },
+ "Sobregiros bancarios": {
+ "account_number": "21010200",
+ "is_group": 1
+ },
+ "account_number": "21010000"
+ },
+ "account_number": "21000000"
+ },
+ "PASIVOS NO CORRIENTES": {
+ "ANTICIPOS Y GARANTIAS DE CLIENTES": {
+ "Anticipos de clientes": {
+ "account_number": "22040100",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "Garant\u00edas de clientes": {
+ "account_number": "22040200",
+ "account_type": "Temporary",
+ "is_group": 1
+ },
+ "account_number": "22040000",
+ "account_type": "Temporary"
+ },
+ "INTERES MINOTARIO": {
+ "Inter\u00e9s de accionista minotarios": {
+ "account_number": "22050100",
+ "is_group": 1
+ },
+ "account_number": "22050000"
+ },
+ "OBLIGACIONES BAJO ARRENDAMIENTOS FINANCIEROS A LARGO PLAZO": {
+ "Contratos bajo arrendamientos financieros": {
+ "account_number": "22030100",
+ "is_group": 1
+ },
+ "account_number": "22030000"
+ },
+ "OTROS PRESTAMOS A LARGO PLAZO": {
+ "account_number": "22020000",
+ "is_group": 1
+ },
+ "PRESTAMOS BANCARIOS A LARGO PLAZO": {
+ "account_number": "22010000",
+ "is_group": 1
+ },
+ "account_number": "22000000"
+ },
+ "PROVISIONES": {
+ "IMPUESTOS SOBRE LA RENTA COMPLEMENTARIO": {
+ "Ejercicios anteriores": {
+ "account_number": "23010100",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "account_number": "23010000",
+ "account_type": "Tax"
+ },
+ "PROVISION PARA OBLIGACIONES LABORALES": {
+ "Indemnizaci\u00f3n": {
+ "account_number": "23020100",
+ "is_group": 1
+ },
+ "account_number": "23020000"
+ },
+ "account_number": "23000000"
+ },
+ "account_number": "20000000",
+ "root_type": "Liability"
+ },
+ "30000000 - PATRIMONIO - xmC": {
+ "CAPITAL, RESERVAS Y RESULTADOS": {
+ "CAPITAL SOCIAL": {
+ "Capital Social M\u00ednimo": {
+ "Capital Social M\u00ednimo NO Pagado": {
+ "account_number": "31010102",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Capital Social M\u00ednimo Suscrito": {
+ "account_number": "31010101",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "account_number": "31010100",
+ "account_type": "Equity"
+ },
+ "Capital Social Variable": {
+ "Capital Social Variable NO Pagado": {
+ "account_number": "31010202",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Capital Social Variable Suscrito": {
+ "account_number": "31010201",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "account_number": "31010200",
+ "account_type": "Equity"
+ },
+ "account_number": "31010000",
+ "account_type": "Equity"
+ },
+ "DIVIDENDOS PAGADOS": {
+ "account_number": "31060000",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "GANANCIAS NO DISTRIBUIDAS": {
+ "De ejercicios anteriores": {
+ "account_number": "31020100",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Del presente ejercicio": {
+ "account_number": "31020200",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "account_number": "31020000",
+ "account_type": "Equity"
+ },
+ "GANANCIAS RESTRINGIDAS": {
+ "Reserva legal": {
+ "account_number": "31030100",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "account_number": "31030000",
+ "account_type": "Equity"
+ },
+ "PERDIDAS ACUMULADAS (CR)": {
+ "De ejercicios anteriores": {
+ "account_number": "31050100",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Del presente ejercicio": {
+ "account_number": "31050200",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "account_number": "31050000",
+ "account_type": "Equity"
+ },
+ "SUPERAVIT POR REVALUACIONES": {
+ "Super\u00e1vit por revaluaci\u00f3n de activos": {
+ "account_number": "31040100",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "account_number": "31040000",
+ "account_type": "Equity"
+ },
+ "account_number": "31000000",
+ "account_type": "Equity"
+ },
+ "account_number": "30000000",
+ "root_type": "Equity"
+ },
+ "40000000 - CUENTAS DE RESULTADO DEUDORAS - xmC": {
+ "COSTOS Y GASTOS DE OPERACI\u00d3N": {
+ "41010000 - COSTO DE LAS VENTAS - xmC": {
+ "account_number": "41010000",
+ "account_type": "Cost of Goods Sold"
+ },
+ "GASTOS DE DEPARTAMENTO DE OPERACIONES": {
+ "41020600 - Depreciaciones y amortizaciones - xmC": {
+ "account_number": "41020600",
+ "account_type": "Depreciation"
+ },
+ "41020900 - Redondeos - xmC": {
+ "account_number": "41020900",
+ "account_type": "Round Off"
+ },
+ "Gastos operativos": {
+ "account_number": "41020700",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Mantenimientos": {
+ "account_number": "41020400",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Materiales y suministros": {
+ "Ajustes de Inventario": {
+ "account_number": "41020201",
+ "account_type": "Stock Adjustment"
+ },
+ "account_number": "41020200",
+ "account_type": "Chargeable"
+ },
+ "Seguros": {
+ "account_number": "41020500",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Servicios b\u00e1sicos": {
+ "account_number": "41020300",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Servicios y honorarios profesionales": {
+ "account_number": "41020800",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Sueldos y prestaciones laborales": {
+ "account_number": "41020100",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "account_number": "41020000",
+ "account_type": "Expense Account"
+ },
+ "GASTOS DE VENTAS Y DISTRIBUCION": {
+ "Depreciaciones y amortizaciones": {
+ "account_number": "41030600",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Gastos operativos": {
+ "account_number": "41030700",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Mantenimientos": {
+ "account_number": "41030400",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Materiales y suministros": {
+ "account_number": "41030200",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Seguros": {
+ "account_number": "41030500",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Servicios b\u00e1sicos": {
+ "account_number": "41030300",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Servicios y honorarios profesionales": {
+ "account_number": "41030800",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "Sueldos y prestaciones laborales": {
+ "account_number": "41030100",
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "account_number": "41030000",
+ "account_type": "Expense Account"
+ },
+ "account_number": "41000000",
+ "account_type": "Expense Account"
+ },
+ "GASTOS DE IMPUESTO SOBRE LA RENTA": {
+ "GASTOS DE IMPUESTO SOBRE LA RENTA CORRIENTE": {
+ "account_number": "43010000",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "account_number": "43000000",
+ "account_type": "Expense Account"
+ },
+ "GASTOS DE NO OPERACI\u00d3N": {
+ "42020000 - GASTOS NO DEDUCIBLES - xmC": {
+ "Garant\u00eda por venta de productos": {
+ "account_number": "42020200",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Impuesto sobre la renta complementario": {
+ "account_number": "42020100",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "account_number": "42020000",
+ "account_type": "Expense Account"
+ },
+ "GASTOS FINANCIEROS": {
+ "42010100 - Intereses - xmC": {
+ "account_number": "42010100",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "42010300 - Diferenciales cambiarios - xmC": {
+ "account_number": "42010300",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Comisiones bancarias": {
+ "account_number": "42010200",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "account_number": "42010000",
+ "account_type": "Expense Account"
+ },
+ "account_number": "42000000",
+ "account_type": "Expense Account"
+ },
+ "account_number": "40000000",
+ "root_type": "Expense"
+ },
+ "50000000 - CUENTAS DE RESULTADO ACREEDORAS - xmC": {
+ "INGRESOS DE NO OPERACI\u00d3N": {
+ "DIVIDENDOS GANADOS": {
+ "Dividendos devengados por inversiones": {
+ "account_number": "52020100",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "account_number": "52020000",
+ "account_type": "Income Account"
+ },
+ "INGRESOS FINANCIEROS": {
+ "Comisiones": {
+ "account_number": "52010200",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Diferenciales cambiarios": {
+ "account_number": "52010300",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Intereses": {
+ "account_number": "52010100",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "account_number": "52010000",
+ "account_type": "Income Account"
+ },
+ "OTROS INGRESOS": {
+ "Ingresos por activos dados en arrendamientos financieros": {
+ "account_number": "52030200",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Ingresos por conversi\u00f3n": {
+ "account_number": "52030100",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Reintegros de seguros": {
+ "account_number": "52030300",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "account_number": "52030000",
+ "account_type": "Income Account"
+ },
+ "account_number": "52000000",
+ "account_type": "Income Account"
+ },
+ "INGRESOS POR OPERACIONES CONTINUAS": {
+ "51010000 - VENTAS DE BIENES - xmC": {
+ "account_number": "51010000",
+ "account_type": "Income Account"
+ },
+ "VENTAS DE SERVICIOS": {
+ "account_number": "51020000",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "account_number": "51000000",
+ "account_type": "Income Account"
+ },
+ "account_number": "50000000",
+ "root_type": "Income"
+ },
+ "60000000 - CUENTA LIQUIDADORA DE RESULTADOS - xmC": {
+ "CUENTA DE CIERRE": {
+ "PERDIDAS Y GANANCIAS": {
+ "account_number": "61010000",
+ "is_group": 1
+ },
+ "account_number": "61000000"
+ },
+ "account_number": "60000000",
+ "root_type": "Income"
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json b/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json
index 04d6303..5c3519a 100644
--- a/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json
+++ b/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json
@@ -38,13 +38,13 @@
"read_only": 1
},
{
- "fetch_from": "sales_invoice.grand_total",
+ "fetch_from": "sales_invoice.outstanding_amount",
+ "fetch_if_empty": 1,
"fieldname": "outstanding_amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Outstanding Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
+ "options": "Company:company:default_currency"
},
{
"fieldname": "column_break_3",
@@ -60,7 +60,7 @@
}
],
"istable": 1,
- "modified": "2019-08-07 15:13:55.808349",
+ "modified": "2019-09-26 11:05:36.016772",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Discounted Invoice",
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
index f1f88a8..0fab8b7 100644
--- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
@@ -97,7 +97,6 @@
}
frm.set_value("total_amount", total_amount);
},
-
get_invoices: (frm) => {
var d = new frappe.ui.Dialog({
title: __('Get Invoices based on Filters'),
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
index 36c2911..39fc203 100644
--- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
@@ -26,14 +26,20 @@
frappe.throw(_("Loan Start Date and Loan Period are mandatory to save the Invoice Discounting"))
def validate_invoices(self):
- discounted_invoices = [record.sales_invoice for record in
- frappe.get_all("Discounted Invoice",fields = ["sales_invoice"], filters= {"docstatus":1})]
+ discounted_invoices = [record.sales_invoice for record in
+ frappe.get_all("Discounted Invoice",fields=["sales_invoice"], filters={"docstatus":1})]
for record in self.invoices:
if record.sales_invoice in discounted_invoices:
- frappe.throw("Row({0}): {1} is already discounted in {2}"
+ frappe.throw(_("Row({0}): {1} is already discounted in {2}")
.format(record.idx, frappe.bold(record.sales_invoice), frappe.bold(record.parent)))
+ actual_outstanding = frappe.db.get_value("Sales Invoice", record.sales_invoice,"outstanding_amount")
+ if record.outstanding_amount > actual_outstanding :
+ frappe.throw(_
+ ("Row({0}): Outstanding Amount cannot be greater than actual Outstanding Amount {1} in {2}").format(
+ record.idx, frappe.bold(actual_outstanding), frappe.bold(record.sales_invoice)))
+
def calculate_total_amount(self):
self.total_amount = sum([flt(d.outstanding_amount) for d in self.invoices])
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index eb75d0d..e25942c 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -827,10 +827,10 @@
accounts = frappe.db.sql_list("""select
name from tabAccount
where
- is_group=0 and report_type='Balance Sheet' and company=%s and
- name not in(select distinct account from tabWarehouse where
+ is_group=0 and report_type='Balance Sheet' and company={0} and
+ name not in (select distinct account from tabWarehouse where
account is not null and account != '')
- order by name asc""", frappe.db.escape(company))
+ order by name asc""".format(frappe.db.escape(company)))
return [{"account": a, "balance": get_balance_on(a)} for a in accounts]
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 73c4bc1..6fe1811 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1,1349 +1,1352 @@
{
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-21 16:16:39",
- "doctype": "DocType",
- "document_type": "Document",
- "field_order": [
- "title",
- "naming_series",
- "supplier",
- "supplier_name",
- "tax_id",
- "due_date",
- "is_paid",
- "is_return",
- "apply_tds",
- "column_break1",
- "company",
- "posting_date",
- "posting_time",
- "set_posting_time",
- "amended_from",
- "accounting_dimensions_section",
- "cost_center",
- "dimension_col_break",
- "sb_14",
- "on_hold",
- "release_date",
- "cb_17",
- "hold_comment",
- "supplier_invoice_details",
- "bill_no",
- "column_break_15",
- "bill_date",
- "returns",
- "return_against",
- "section_addresses",
- "supplier_address",
- "address_display",
- "contact_person",
- "contact_display",
- "contact_mobile",
- "contact_email",
- "col_break_address",
- "shipping_address",
- "shipping_address_display",
- "currency_and_price_list",
- "currency",
- "conversion_rate",
- "column_break2",
- "buying_price_list",
- "price_list_currency",
- "plc_conversion_rate",
- "ignore_pricing_rule",
- "sec_warehouse",
- "set_warehouse",
- "rejected_warehouse",
- "col_break_warehouse",
- "is_subcontracted",
- "supplier_warehouse",
- "items_section",
- "update_stock",
- "scan_barcode",
- "items",
- "pricing_rule_details",
- "pricing_rules",
- "raw_materials_supplied",
- "supplied_items",
- "section_break_26",
- "total_qty",
- "base_total",
- "base_net_total",
- "column_break_28",
- "total",
- "net_total",
- "total_net_weight",
- "taxes_section",
- "tax_category",
- "column_break_49",
- "shipping_rule",
- "section_break_51",
- "taxes_and_charges",
- "taxes",
- "sec_tax_breakup",
- "other_charges_calculation",
- "totals",
- "base_taxes_and_charges_added",
- "base_taxes_and_charges_deducted",
- "base_total_taxes_and_charges",
- "column_break_40",
- "taxes_and_charges_added",
- "taxes_and_charges_deducted",
- "total_taxes_and_charges",
- "section_break_44",
- "apply_discount_on",
- "base_discount_amount",
- "column_break_46",
- "additional_discount_percentage",
- "discount_amount",
- "section_break_49",
- "base_grand_total",
- "base_rounding_adjustment",
- "base_rounded_total",
- "base_in_words",
- "column_break8",
- "grand_total",
- "rounding_adjustment",
- "rounded_total",
- "in_words",
- "total_advance",
- "outstanding_amount",
- "disable_rounded_total",
- "payments_section",
- "mode_of_payment",
- "cash_bank_account",
- "clearance_date",
- "col_br_payments",
- "paid_amount",
- "base_paid_amount",
- "write_off",
- "write_off_amount",
- "base_write_off_amount",
- "column_break_61",
- "write_off_account",
- "write_off_cost_center",
- "advances_section",
- "allocate_advances_automatically",
- "get_advances",
- "advances",
- "payment_schedule_section",
- "payment_terms_template",
- "payment_schedule",
- "terms_section_break",
- "tc_name",
- "terms",
- "printing_settings",
- "letter_head",
- "group_same_items",
- "column_break_112",
- "select_print_heading",
- "language",
- "more_info",
- "credit_to",
- "party_account_currency",
- "is_opening",
- "against_expense_account",
- "column_break_63",
- "status",
- "inter_company_invoice_reference",
- "remarks",
- "subscription_section",
- "from_date",
- "to_date",
- "column_break_114",
- "auto_repeat",
- "update_auto_repeat_reference"
- ],
- "fields": [
- {
- "allow_on_submit": 1,
- "default": "{supplier_name}",
- "fieldname": "title",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Title",
- "no_copy": 1,
- "print_hide": 1
- },
- {
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "ACC-PINV-.YYYY.-",
- "print_hide": 1,
- "reqd": 1,
- "set_only_once": 1
- },
- {
- "fieldname": "supplier",
- "fieldtype": "Link",
- "in_standard_filter": 1,
- "label": "Supplier",
- "oldfieldname": "supplier",
- "oldfieldtype": "Link",
- "options": "Supplier",
- "print_hide": 1,
- "search_index": 1
- },
- {
- "bold": 1,
- "depends_on": "supplier",
- "fetch_from": "supplier.supplier_name",
- "fieldname": "supplier_name",
- "fieldtype": "Data",
- "in_global_search": 1,
- "label": "Supplier Name",
- "oldfieldname": "supplier_name",
- "oldfieldtype": "Data",
- "read_only": 1
- },
- {
- "fetch_from": "supplier.tax_id",
- "fieldname": "tax_id",
- "fieldtype": "Read Only",
- "label": "Tax Id",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "due_date",
- "fieldtype": "Date",
- "label": "Due Date",
- "oldfieldname": "due_date",
- "oldfieldtype": "Date"
- },
- {
- "default": "0",
- "fieldname": "is_paid",
- "fieldtype": "Check",
- "label": "Is Paid",
- "print_hide": 1
- },
- {
- "default": "0",
- "fieldname": "is_return",
- "fieldtype": "Check",
- "label": "Is Return (Debit Note)",
- "no_copy": 1,
- "print_hide": 1
- },
- {
- "default": "0",
- "fieldname": "apply_tds",
- "fieldtype": "Check",
- "label": "Apply Tax Withholding Amount",
- "print_hide": 1
- },
- {
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "width": "50%"
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "in_standard_filter": 1,
- "label": "Company",
- "options": "Company",
- "print_hide": 1,
- "remember_last_selected_value": 1
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center"
- },
- {
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Date",
- "oldfieldname": "posting_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
- "fieldname": "posting_time",
- "fieldtype": "Time",
- "label": "Posting Time",
- "no_copy": 1,
- "print_hide": 1,
- "print_width": "100px",
- "width": "100px"
- },
- {
- "default": "0",
- "depends_on": "eval:doc.docstatus==0",
- "fieldname": "set_posting_time",
- "fieldtype": "Check",
- "label": "Edit Posting Date and Time",
- "print_hide": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Link",
- "options": "Purchase Invoice",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "eval:doc.on_hold",
- "fieldname": "sb_14",
- "fieldtype": "Section Break",
- "label": "Hold Invoice"
- },
- {
- "default": "0",
- "fieldname": "on_hold",
- "fieldtype": "Check",
- "label": "Hold Invoice"
- },
- {
- "depends_on": "eval:doc.on_hold",
- "description": "Once set, this invoice will be on hold till the set date",
- "fieldname": "release_date",
- "fieldtype": "Date",
- "label": "Release Date"
- },
- {
- "fieldname": "cb_17",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "eval:doc.on_hold",
- "fieldname": "hold_comment",
- "fieldtype": "Small Text",
- "label": "Reason For Putting On Hold"
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "bill_no",
- "fieldname": "supplier_invoice_details",
- "fieldtype": "Section Break",
- "label": "Supplier Invoice Details"
- },
- {
- "fieldname": "bill_no",
- "fieldtype": "Data",
- "label": "Supplier Invoice No",
- "oldfieldname": "bill_no",
- "oldfieldtype": "Data",
- "print_hide": 1
- },
- {
- "fieldname": "column_break_15",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "bill_date",
- "fieldtype": "Date",
- "label": "Supplier Invoice Date",
- "oldfieldname": "bill_date",
- "oldfieldtype": "Date",
- "print_hide": 1
- },
- {
- "depends_on": "return_against",
- "fieldname": "returns",
- "fieldtype": "Section Break",
- "label": "Returns"
- },
- {
- "depends_on": "return_against",
- "fieldname": "return_against",
- "fieldtype": "Link",
- "label": "Return Against Purchase Invoice",
- "no_copy": 1,
- "options": "Purchase Invoice",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "section_addresses",
- "fieldtype": "Section Break",
- "label": "Address and Contact"
- },
- {
- "fieldname": "supplier_address",
- "fieldtype": "Link",
- "label": "Select Supplier Address",
- "options": "Address",
- "print_hide": 1
- },
- {
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "label": "Address",
- "read_only": 1
- },
- {
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "in_global_search": 1,
- "label": "Contact Person",
- "options": "Contact",
- "print_hide": 1
- },
- {
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "label": "Contact",
- "read_only": 1
- },
- {
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "label": "Mobile No",
- "read_only": 1
- },
- {
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "label": "Contact Email",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "col_break_address",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "shipping_address",
- "fieldtype": "Link",
- "label": "Select Shipping Address",
- "options": "Address",
- "print_hide": 1
- },
- {
- "fieldname": "shipping_address_display",
- "fieldtype": "Small Text",
- "label": "Shipping Address",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "currency_and_price_list",
- "fieldtype": "Section Break",
- "label": "Currency and Price List",
- "options": "fa fa-tag"
- },
- {
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "print_hide": 1
- },
- {
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Exchange Rate",
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "precision": "9",
- "print_hide": 1
- },
- {
- "fieldname": "column_break2",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "buying_price_list",
- "fieldtype": "Link",
- "label": "Price List",
- "options": "Price List",
- "print_hide": 1
- },
- {
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Exchange Rate",
- "precision": "9",
- "print_hide": 1
- },
- {
- "default": "0",
- "fieldname": "ignore_pricing_rule",
- "fieldtype": "Check",
- "label": "Ignore Pricing Rule",
- "no_copy": 1,
- "permlevel": 1,
- "print_hide": 1
- },
- {
- "fieldname": "sec_warehouse",
- "fieldtype": "Section Break"
- },
- {
- "depends_on": "update_stock",
- "fieldname": "set_warehouse",
- "fieldtype": "Link",
- "label": "Set Accepted Warehouse",
- "options": "Warehouse",
- "print_hide": 1
- },
- {
- "depends_on": "update_stock",
- "description": "Warehouse where you are maintaining stock of rejected items",
- "fieldname": "rejected_warehouse",
- "fieldtype": "Link",
- "label": "Rejected Warehouse",
- "no_copy": 1,
- "options": "Warehouse",
- "print_hide": 1
- },
- {
- "fieldname": "col_break_warehouse",
- "fieldtype": "Column Break"
- },
- {
- "default": "No",
- "fieldname": "is_subcontracted",
- "fieldtype": "Select",
- "label": "Raw Materials Supplied",
- "options": "No\nYes",
- "print_hide": 1
- },
- {
- "depends_on": "eval:doc.is_subcontracted==\"Yes\"",
- "fieldname": "supplier_warehouse",
- "fieldtype": "Link",
- "label": "Supplier Warehouse",
- "no_copy": 1,
- "options": "Warehouse",
- "print_hide": 1,
- "print_width": "50px",
- "width": "50px"
- },
- {
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "oldfieldtype": "Section Break",
- "options": "fa fa-shopping-cart"
- },
- {
- "default": "0",
- "fieldname": "update_stock",
- "fieldtype": "Check",
- "label": "Update Stock",
- "print_hide": 1
- },
- {
- "fieldname": "scan_barcode",
- "fieldtype": "Data",
- "label": "Scan Barcode"
- },
- {
- "allow_bulk_edit": 1,
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "oldfieldname": "entries",
- "oldfieldtype": "Table",
- "options": "Purchase Invoice Item",
- "reqd": 1
- },
- {
- "fieldname": "pricing_rule_details",
- "fieldtype": "Section Break",
- "label": "Pricing Rules"
- },
- {
- "fieldname": "pricing_rules",
- "fieldtype": "Table",
- "label": "Pricing Rule Detail",
- "options": "Pricing Rule Detail",
- "read_only": 1
- },
- {
- "collapsible_depends_on": "supplied_items",
- "fieldname": "raw_materials_supplied",
- "fieldtype": "Section Break",
- "label": "Raw Materials Supplied"
- },
- {
- "fieldname": "supplied_items",
- "fieldtype": "Table",
- "label": "Supplied Items",
- "options": "Purchase Receipt Item Supplied",
- "read_only": 1
- },
- {
- "fieldname": "section_break_26",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "total_qty",
- "fieldtype": "Float",
- "label": "Total Quantity",
- "read_only": 1
- },
- {
- "fieldname": "base_total",
- "fieldtype": "Currency",
- "label": "Total (Company Currency)",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "base_net_total",
- "fieldtype": "Currency",
- "label": "Net Total (Company Currency)",
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_28",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "total",
- "fieldtype": "Currency",
- "label": "Total",
- "options": "currency",
- "read_only": 1
- },
- {
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total",
- "oldfieldname": "net_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "total_net_weight",
- "fieldtype": "Float",
- "label": "Total Net Weight",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "taxes_section",
- "fieldtype": "Section Break",
- "oldfieldtype": "Section Break",
- "options": "fa fa-money"
- },
- {
- "fieldname": "tax_category",
- "fieldtype": "Link",
- "label": "Tax Category",
- "options": "Tax Category",
- "print_hide": 1
- },
- {
- "fieldname": "column_break_49",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "shipping_rule",
- "fieldtype": "Link",
- "label": "Shipping Rule",
- "options": "Shipping Rule",
- "print_hide": 1
- },
- {
- "fieldname": "section_break_51",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "taxes_and_charges",
- "fieldtype": "Link",
- "label": "Purchase Taxes and Charges Template",
- "oldfieldname": "purchase_other_charges",
- "oldfieldtype": "Link",
- "options": "Purchase Taxes and Charges Template",
- "print_hide": 1
- },
- {
- "fieldname": "taxes",
- "fieldtype": "Table",
- "label": "Purchase Taxes and Charges",
- "oldfieldname": "purchase_tax_details",
- "oldfieldtype": "Table",
- "options": "Purchase Taxes and Charges"
- },
- {
- "collapsible": 1,
- "fieldname": "sec_tax_breakup",
- "fieldtype": "Section Break",
- "label": "Tax Breakup"
- },
- {
- "fieldname": "other_charges_calculation",
- "fieldtype": "Text",
- "label": "Taxes and Charges Calculation",
- "no_copy": 1,
- "oldfieldtype": "HTML",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "oldfieldtype": "Section Break",
- "options": "fa fa-money"
- },
- {
- "fieldname": "base_taxes_and_charges_added",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Added (Company Currency)",
- "oldfieldname": "other_charges_added",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "base_taxes_and_charges_deducted",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Deducted (Company Currency)",
- "oldfieldname": "other_charges_deducted",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "base_total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges (Company Currency)",
- "oldfieldname": "total_tax",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_40",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "taxes_and_charges_added",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Added",
- "oldfieldname": "other_charges_added_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "taxes_and_charges_deducted",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Deducted",
- "oldfieldname": "other_charges_deducted_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "total_taxes_and_charges",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "discount_amount",
- "fieldname": "section_break_44",
- "fieldtype": "Section Break",
- "label": "Additional Discount"
- },
- {
- "default": "Grand Total",
- "fieldname": "apply_discount_on",
- "fieldtype": "Select",
- "label": "Apply Additional Discount On",
- "options": "\nGrand Total\nNet Total",
- "print_hide": 1
- },
- {
- "fieldname": "base_discount_amount",
- "fieldtype": "Currency",
- "label": "Additional Discount Amount (Company Currency)",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_46",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "additional_discount_percentage",
- "fieldtype": "Float",
- "label": "Additional Discount Percentage",
- "print_hide": 1
- },
- {
- "fieldname": "discount_amount",
- "fieldtype": "Currency",
- "label": "Additional Discount Amount",
- "options": "currency",
- "print_hide": 1
- },
- {
- "fieldname": "section_break_49",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "base_grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total (Company Currency)",
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "base_rounding_adjustment",
- "fieldtype": "Currency",
- "label": "Rounding Adjustment (Company Currency)",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "depends_on": "eval:!doc.disable_rounded_total",
- "fieldname": "base_rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total (Company Currency)",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "base_in_words",
- "fieldtype": "Data",
- "label": "In Words (Company Currency)",
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break8",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "print_hide": 1,
- "width": "50%"
- },
- {
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total",
- "oldfieldname": "grand_total_import",
- "oldfieldtype": "Currency",
- "options": "currency",
- "read_only": 1
- },
- {
- "fieldname": "rounding_adjustment",
- "fieldtype": "Currency",
- "label": "Rounding Adjustment",
- "no_copy": 1,
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "depends_on": "eval:!doc.disable_rounded_total",
- "fieldname": "rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total",
- "no_copy": 1,
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "oldfieldname": "in_words_import",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "total_advance",
- "fieldtype": "Currency",
- "label": "Total Advance",
- "no_copy": 1,
- "oldfieldname": "total_advance",
- "oldfieldtype": "Currency",
- "options": "party_account_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "outstanding_amount",
- "fieldtype": "Currency",
- "label": "Outstanding Amount",
- "no_copy": 1,
- "oldfieldname": "outstanding_amount",
- "oldfieldtype": "Currency",
- "options": "party_account_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "default": "0",
- "depends_on": "grand_total",
- "fieldname": "disable_rounded_total",
- "fieldtype": "Check",
- "label": "Disable Rounded Total"
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "paid_amount",
- "depends_on": "eval:doc.is_paid===1||(doc.advances && doc.advances.length>0)",
- "fieldname": "payments_section",
- "fieldtype": "Section Break",
- "label": "Payments"
- },
- {
- "fieldname": "mode_of_payment",
- "fieldtype": "Link",
- "label": "Mode of Payment",
- "options": "Mode of Payment",
- "print_hide": 1
- },
- {
- "fieldname": "cash_bank_account",
- "fieldtype": "Link",
- "label": "Cash/Bank Account",
- "options": "Account"
- },
- {
- "fieldname": "clearance_date",
- "fieldtype": "Date",
- "hidden": 1,
- "label": "Clearance Date"
- },
- {
- "fieldname": "col_br_payments",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "is_paid",
- "fieldname": "paid_amount",
- "fieldtype": "Currency",
- "label": "Paid Amount",
- "no_copy": 1,
- "options": "currency",
- "print_hide": 1
- },
- {
- "fieldname": "base_paid_amount",
- "fieldtype": "Currency",
- "label": "Paid Amount (Company Currency)",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "write_off_amount",
- "depends_on": "grand_total",
- "fieldname": "write_off",
- "fieldtype": "Section Break",
- "label": "Write Off"
- },
- {
- "fieldname": "write_off_amount",
- "fieldtype": "Currency",
- "label": "Write Off Amount",
- "no_copy": 1,
- "options": "currency",
- "print_hide": 1
- },
- {
- "fieldname": "base_write_off_amount",
- "fieldtype": "Currency",
- "label": "Write Off Amount (Company Currency)",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_61",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "eval:flt(doc.write_off_amount)!=0",
- "fieldname": "write_off_account",
- "fieldtype": "Link",
- "label": "Write Off Account",
- "options": "Account",
- "print_hide": 1
- },
- {
- "depends_on": "eval:flt(doc.write_off_amount)!=0",
- "fieldname": "write_off_cost_center",
- "fieldtype": "Link",
- "label": "Write Off Cost Center",
- "options": "Cost Center",
- "print_hide": 1
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "advances",
- "fieldname": "advances_section",
- "fieldtype": "Section Break",
- "label": "Advance Payments",
- "oldfieldtype": "Section Break",
- "options": "fa fa-money",
- "print_hide": 1
- },
- {
- "default": "0",
- "fieldname": "allocate_advances_automatically",
- "fieldtype": "Check",
- "label": "Set Advances and Allocate (FIFO)"
- },
- {
- "depends_on": "eval:!doc.allocate_advances_automatically",
- "fieldname": "get_advances",
- "fieldtype": "Button",
- "label": "Get Advances Paid",
- "oldfieldtype": "Button",
- "print_hide": 1
- },
- {
- "fieldname": "advances",
- "fieldtype": "Table",
- "label": "Advances",
- "no_copy": 1,
- "oldfieldname": "advance_allocation_details",
- "oldfieldtype": "Table",
- "options": "Purchase Invoice Advance",
- "print_hide": 1
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "eval:(!doc.is_return)",
- "fieldname": "payment_schedule_section",
- "fieldtype": "Section Break",
- "label": "Payment Terms"
- },
- {
- "fieldname": "payment_terms_template",
- "fieldtype": "Link",
- "label": "Payment Terms Template",
- "options": "Payment Terms Template"
- },
- {
- "fieldname": "payment_schedule",
- "fieldtype": "Table",
- "label": "Payment Schedule",
- "no_copy": 1,
- "options": "Payment Schedule",
- "print_hide": 1
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "terms",
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "Terms and Conditions",
- "options": "fa fa-legal"
- },
- {
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "label": "Terms",
- "options": "Terms and Conditions",
- "print_hide": 1
- },
- {
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Terms and Conditions1"
- },
- {
- "collapsible": 1,
- "fieldname": "printing_settings",
- "fieldtype": "Section Break",
- "label": "Printing Settings"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "options": "Letter Head",
- "print_hide": 1
- },
- {
- "allow_on_submit": 1,
- "default": "0",
- "fieldname": "group_same_items",
- "fieldtype": "Check",
- "label": "Group same items",
- "print_hide": 1
- },
- {
- "fieldname": "column_break_112",
- "fieldtype": "Column Break"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "print_hide": 1,
- "report_hide": 1
- },
- {
- "fieldname": "language",
- "fieldtype": "Data",
- "label": "Print Language",
- "read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "label": "More Information",
- "oldfieldtype": "Section Break",
- "options": "fa fa-file-text",
- "print_hide": 1
- },
- {
- "fieldname": "credit_to",
- "fieldtype": "Link",
- "label": "Credit To",
- "oldfieldname": "credit_to",
- "oldfieldtype": "Link",
- "options": "Account",
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
- "fieldname": "party_account_currency",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Party Account Currency",
- "no_copy": 1,
- "options": "Currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "default": "No",
- "fieldname": "is_opening",
- "fieldtype": "Select",
- "label": "Is Opening",
- "oldfieldname": "is_opening",
- "oldfieldtype": "Select",
- "options": "No\nYes",
- "print_hide": 1
- },
- {
- "fieldname": "against_expense_account",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Against Expense Account",
- "no_copy": 1,
- "oldfieldname": "against_expense_account",
- "oldfieldtype": "Small Text",
- "print_hide": 1
- },
- {
- "fieldname": "column_break_63",
- "fieldtype": "Column Break"
- },
- {
- "default": "Draft",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_standard_filter": 1,
- "label": "Status",
- "options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled"
- },
- {
- "fieldname": "inter_company_invoice_reference",
- "fieldtype": "Link",
- "label": "Inter Company Invoice Reference",
- "options": "Sales Invoice",
- "read_only": 1
- },
- {
- "fieldname": "remarks",
- "fieldtype": "Small Text",
- "label": "Remarks",
- "no_copy": 1,
- "oldfieldname": "remarks",
- "oldfieldtype": "Text",
- "print_hide": 1
- },
- {
- "fieldname": "subscription_section",
- "fieldtype": "Section Break",
- "label": "Subscription Section",
- "print_hide": 1
- },
- {
- "allow_on_submit": 1,
- "description": "Start date of current invoice's period",
- "fieldname": "from_date",
- "fieldtype": "Date",
- "label": "From Date",
- "no_copy": 1,
- "print_hide": 1
- },
- {
- "allow_on_submit": 1,
- "description": "End date of current invoice's period",
- "fieldname": "to_date",
- "fieldtype": "Date",
- "label": "To Date",
- "no_copy": 1,
- "print_hide": 1
- },
- {
- "fieldname": "column_break_114",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "auto_repeat",
- "fieldtype": "Link",
- "label": "Auto Repeat",
- "no_copy": 1,
- "options": "Auto Repeat",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "allow_on_submit": 1,
- "depends_on": "eval: doc.auto_repeat",
- "fieldname": "update_auto_repeat_reference",
- "fieldtype": "Button",
- "label": "Update Auto Repeat Reference"
- },
- {
- "collapsible": 1,
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions "
- },
- {
- "fieldname": "dimension_col_break",
- "fieldtype": "Column Break"
- }
- ],
- "icon": "fa fa-file-text",
- "idx": 204,
- "is_submittable": 1,
- "modified": "2019-06-18 22:04:28.889159",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Purchase Invoice",
- "name_case": "Title Case",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts User",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase User"
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Accounts Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Auditor"
- },
- {
- "permlevel": 1,
- "read": 1,
- "role": "Accounts Manager",
- "write": 1
- }
- ],
- "search_fields": "posting_date, supplier, bill_no, base_grand_total, outstanding_amount",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "supplier",
- "title_field": "title",
- "track_changes": 1
- }
\ No newline at end of file
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-21 16:16:39",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+ "title",
+ "naming_series",
+ "supplier",
+ "supplier_name",
+ "tax_id",
+ "due_date",
+ "is_paid",
+ "is_return",
+ "apply_tds",
+ "column_break1",
+ "company",
+ "posting_date",
+ "posting_time",
+ "set_posting_time",
+ "amended_from",
+ "accounting_dimensions_section",
+ "cost_center",
+ "dimension_col_break",
+ "sb_14",
+ "on_hold",
+ "release_date",
+ "cb_17",
+ "hold_comment",
+ "supplier_invoice_details",
+ "bill_no",
+ "column_break_15",
+ "bill_date",
+ "returns",
+ "return_against",
+ "section_addresses",
+ "supplier_address",
+ "address_display",
+ "contact_person",
+ "contact_display",
+ "contact_mobile",
+ "contact_email",
+ "col_break_address",
+ "shipping_address",
+ "shipping_address_display",
+ "currency_and_price_list",
+ "currency",
+ "conversion_rate",
+ "column_break2",
+ "buying_price_list",
+ "price_list_currency",
+ "plc_conversion_rate",
+ "ignore_pricing_rule",
+ "sec_warehouse",
+ "set_warehouse",
+ "rejected_warehouse",
+ "col_break_warehouse",
+ "is_subcontracted",
+ "supplier_warehouse",
+ "items_section",
+ "update_stock",
+ "scan_barcode",
+ "items",
+ "pricing_rule_details",
+ "pricing_rules",
+ "raw_materials_supplied",
+ "supplied_items",
+ "section_break_26",
+ "total_qty",
+ "base_total",
+ "base_net_total",
+ "column_break_28",
+ "total",
+ "net_total",
+ "total_net_weight",
+ "taxes_section",
+ "tax_category",
+ "column_break_49",
+ "shipping_rule",
+ "section_break_51",
+ "taxes_and_charges",
+ "taxes",
+ "sec_tax_breakup",
+ "other_charges_calculation",
+ "totals",
+ "base_taxes_and_charges_added",
+ "base_taxes_and_charges_deducted",
+ "base_total_taxes_and_charges",
+ "column_break_40",
+ "taxes_and_charges_added",
+ "taxes_and_charges_deducted",
+ "total_taxes_and_charges",
+ "section_break_44",
+ "apply_discount_on",
+ "base_discount_amount",
+ "column_break_46",
+ "additional_discount_percentage",
+ "discount_amount",
+ "section_break_49",
+ "base_grand_total",
+ "base_rounding_adjustment",
+ "base_rounded_total",
+ "base_in_words",
+ "column_break8",
+ "grand_total",
+ "rounding_adjustment",
+ "rounded_total",
+ "in_words",
+ "total_advance",
+ "outstanding_amount",
+ "disable_rounded_total",
+ "payments_section",
+ "mode_of_payment",
+ "cash_bank_account",
+ "clearance_date",
+ "col_br_payments",
+ "paid_amount",
+ "base_paid_amount",
+ "write_off",
+ "write_off_amount",
+ "base_write_off_amount",
+ "column_break_61",
+ "write_off_account",
+ "write_off_cost_center",
+ "advances_section",
+ "allocate_advances_automatically",
+ "get_advances",
+ "advances",
+ "payment_schedule_section",
+ "payment_terms_template",
+ "payment_schedule",
+ "terms_section_break",
+ "tc_name",
+ "terms",
+ "printing_settings",
+ "letter_head",
+ "group_same_items",
+ "column_break_112",
+ "select_print_heading",
+ "language",
+ "more_info",
+ "credit_to",
+ "party_account_currency",
+ "is_opening",
+ "against_expense_account",
+ "column_break_63",
+ "status",
+ "inter_company_invoice_reference",
+ "remarks",
+ "subscription_section",
+ "from_date",
+ "to_date",
+ "column_break_114",
+ "auto_repeat",
+ "update_auto_repeat_reference"
+ ],
+ "fields": [
+ {
+ "allow_on_submit": 1,
+ "default": "{supplier_name}",
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Title",
+ "no_copy": 1,
+ "print_hide": 1
+ },
+ {
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "ACC-PINV-.YYYY.-",
+ "print_hide": 1,
+ "reqd": 1,
+ "set_only_once": 1
+ },
+ {
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "in_standard_filter": 1,
+ "label": "Supplier",
+ "oldfieldname": "supplier",
+ "oldfieldtype": "Link",
+ "options": "Supplier",
+ "print_hide": 1,
+ "search_index": 1
+ },
+ {
+ "bold": 1,
+ "depends_on": "supplier",
+ "fetch_from": "supplier.supplier_name",
+ "fieldname": "supplier_name",
+ "fieldtype": "Data",
+ "in_global_search": 1,
+ "label": "Supplier Name",
+ "oldfieldname": "supplier_name",
+ "oldfieldtype": "Data",
+ "read_only": 1
+ },
+ {
+ "fetch_from": "supplier.tax_id",
+ "fieldname": "tax_id",
+ "fieldtype": "Read Only",
+ "label": "Tax Id",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "due_date",
+ "fieldtype": "Date",
+ "label": "Due Date",
+ "oldfieldname": "due_date",
+ "oldfieldtype": "Date"
+ },
+ {
+ "default": "0",
+ "fieldname": "is_paid",
+ "fieldtype": "Check",
+ "label": "Is Paid",
+ "print_hide": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "is_return",
+ "fieldtype": "Check",
+ "label": "Is Return (Debit Note)",
+ "no_copy": 1,
+ "print_hide": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "apply_tds",
+ "fieldtype": "Check",
+ "label": "Apply Tax Withholding Amount",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_standard_filter": 1,
+ "label": "Company",
+ "options": "Company",
+ "print_hide": 1,
+ "remember_last_selected_value": 1
+ },
+ {
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "label": "Cost Center",
+ "options": "Cost Center"
+ },
+ {
+ "default": "Today",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "Date",
+ "oldfieldname": "posting_date",
+ "oldfieldtype": "Date",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "posting_time",
+ "fieldtype": "Time",
+ "label": "Posting Time",
+ "no_copy": 1,
+ "print_hide": 1,
+ "print_width": "100px",
+ "width": "100px"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval:doc.docstatus==0",
+ "fieldname": "set_posting_time",
+ "fieldtype": "Check",
+ "label": "Edit Posting Date and Time",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Link",
+ "options": "Purchase Invoice",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:doc.on_hold",
+ "fieldname": "sb_14",
+ "fieldtype": "Section Break",
+ "label": "Hold Invoice"
+ },
+ {
+ "default": "0",
+ "fieldname": "on_hold",
+ "fieldtype": "Check",
+ "label": "Hold Invoice"
+ },
+ {
+ "depends_on": "eval:doc.on_hold",
+ "description": "Once set, this invoice will be on hold till the set date",
+ "fieldname": "release_date",
+ "fieldtype": "Date",
+ "label": "Release Date"
+ },
+ {
+ "fieldname": "cb_17",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:doc.on_hold",
+ "fieldname": "hold_comment",
+ "fieldtype": "Small Text",
+ "label": "Reason For Putting On Hold"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "bill_no",
+ "fieldname": "supplier_invoice_details",
+ "fieldtype": "Section Break",
+ "label": "Supplier Invoice Details"
+ },
+ {
+ "fieldname": "bill_no",
+ "fieldtype": "Data",
+ "label": "Supplier Invoice No",
+ "oldfieldname": "bill_no",
+ "oldfieldtype": "Data",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break_15",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "bill_date",
+ "fieldtype": "Date",
+ "label": "Supplier Invoice Date",
+ "oldfieldname": "bill_date",
+ "oldfieldtype": "Date",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "return_against",
+ "fieldname": "returns",
+ "fieldtype": "Section Break",
+ "label": "Returns"
+ },
+ {
+ "depends_on": "return_against",
+ "fieldname": "return_against",
+ "fieldtype": "Link",
+ "label": "Return Against Purchase Invoice",
+ "no_copy": 1,
+ "options": "Purchase Invoice",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "section_addresses",
+ "fieldtype": "Section Break",
+ "label": "Address and Contact"
+ },
+ {
+ "fieldname": "supplier_address",
+ "fieldtype": "Link",
+ "label": "Select Supplier Address",
+ "options": "Address",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "label": "Address",
+ "read_only": 1
+ },
+ {
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "in_global_search": 1,
+ "label": "Contact Person",
+ "options": "Contact",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "label": "Contact",
+ "read_only": 1
+ },
+ {
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "label": "Mobile No",
+ "read_only": 1
+ },
+ {
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "label": "Contact Email",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "col_break_address",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "shipping_address",
+ "fieldtype": "Link",
+ "label": "Select Shipping Address",
+ "options": "Address",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "shipping_address_display",
+ "fieldtype": "Small Text",
+ "label": "Shipping Address",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "currency_and_price_list",
+ "fieldtype": "Section Break",
+ "label": "Currency and Price List",
+ "options": "fa fa-tag"
+ },
+ {
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Exchange Rate",
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "precision": "9",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "buying_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "options": "Price List",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Exchange Rate",
+ "precision": "9",
+ "print_hide": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "ignore_pricing_rule",
+ "fieldtype": "Check",
+ "label": "Ignore Pricing Rule",
+ "no_copy": 1,
+ "permlevel": 1,
+ "print_hide": 1
+ },
+ {
+ "fieldname": "sec_warehouse",
+ "fieldtype": "Section Break"
+ },
+ {
+ "depends_on": "update_stock",
+ "fieldname": "set_warehouse",
+ "fieldtype": "Link",
+ "label": "Set Accepted Warehouse",
+ "options": "Warehouse",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "update_stock",
+ "description": "Warehouse where you are maintaining stock of rejected items",
+ "fieldname": "rejected_warehouse",
+ "fieldtype": "Link",
+ "label": "Rejected Warehouse",
+ "no_copy": 1,
+ "options": "Warehouse",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "col_break_warehouse",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "No",
+ "fieldname": "is_subcontracted",
+ "fieldtype": "Select",
+ "label": "Raw Materials Supplied",
+ "options": "No\nYes",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "eval:doc.is_subcontracted==\"Yes\"",
+ "fieldname": "supplier_warehouse",
+ "fieldtype": "Link",
+ "label": "Supplier Warehouse",
+ "no_copy": 1,
+ "options": "Warehouse",
+ "print_hide": 1,
+ "print_width": "50px",
+ "width": "50px"
+ },
+ {
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-shopping-cart"
+ },
+ {
+ "default": "0",
+ "fieldname": "update_stock",
+ "fieldtype": "Check",
+ "label": "Update Stock",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "scan_barcode",
+ "fieldtype": "Data",
+ "label": "Scan Barcode"
+ },
+ {
+ "allow_bulk_edit": 1,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "oldfieldname": "entries",
+ "oldfieldtype": "Table",
+ "options": "Purchase Invoice Item",
+ "reqd": 1
+ },
+ {
+ "fieldname": "pricing_rule_details",
+ "fieldtype": "Section Break",
+ "label": "Pricing Rules"
+ },
+ {
+ "fieldname": "pricing_rules",
+ "fieldtype": "Table",
+ "label": "Pricing Rule Detail",
+ "options": "Pricing Rule Detail",
+ "read_only": 1
+ },
+ {
+ "collapsible_depends_on": "supplied_items",
+ "fieldname": "raw_materials_supplied",
+ "fieldtype": "Section Break",
+ "label": "Raw Materials Supplied"
+ },
+ {
+ "fieldname": "supplied_items",
+ "fieldtype": "Table",
+ "label": "Supplied Items",
+ "options": "Purchase Receipt Item Supplied",
+ "read_only": 1
+ },
+ {
+ "fieldname": "section_break_26",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "total_qty",
+ "fieldtype": "Float",
+ "label": "Total Quantity",
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_total",
+ "fieldtype": "Currency",
+ "label": "Total (Company Currency)",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total (Company Currency)",
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_28",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "label": "Total",
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total",
+ "oldfieldname": "net_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "total_net_weight",
+ "fieldtype": "Float",
+ "label": "Total Net Weight",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "taxes_section",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-money"
+ },
+ {
+ "fieldname": "tax_category",
+ "fieldtype": "Link",
+ "label": "Tax Category",
+ "options": "Tax Category",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break_49",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "shipping_rule",
+ "fieldtype": "Link",
+ "label": "Shipping Rule",
+ "options": "Shipping Rule",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "section_break_51",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "taxes_and_charges",
+ "fieldtype": "Link",
+ "label": "Purchase Taxes and Charges Template",
+ "oldfieldname": "purchase_other_charges",
+ "oldfieldtype": "Link",
+ "options": "Purchase Taxes and Charges Template",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Purchase Taxes and Charges",
+ "oldfieldname": "purchase_tax_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Taxes and Charges"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "sec_tax_breakup",
+ "fieldtype": "Section Break",
+ "label": "Tax Breakup"
+ },
+ {
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "Text",
+ "label": "Taxes and Charges Calculation",
+ "no_copy": 1,
+ "oldfieldtype": "HTML",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-money"
+ },
+ {
+ "fieldname": "base_taxes_and_charges_added",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Added (Company Currency)",
+ "oldfieldname": "other_charges_added",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_taxes_and_charges_deducted",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Deducted (Company Currency)",
+ "oldfieldname": "other_charges_deducted",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Company Currency)",
+ "oldfieldname": "total_tax",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_40",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "taxes_and_charges_added",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Added",
+ "oldfieldname": "other_charges_added_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "taxes_and_charges_deducted",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Deducted",
+ "oldfieldname": "other_charges_deducted_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "total_taxes_and_charges",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "discount_amount",
+ "fieldname": "section_break_44",
+ "fieldtype": "Section Break",
+ "label": "Additional Discount"
+ },
+ {
+ "default": "Grand Total",
+ "fieldname": "apply_discount_on",
+ "fieldtype": "Select",
+ "label": "Apply Additional Discount On",
+ "options": "\nGrand Total\nNet Total",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "base_discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount (Company Currency)",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_46",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "additional_discount_percentage",
+ "fieldtype": "Float",
+ "label": "Additional Discount Percentage",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "label": "Additional Discount Amount",
+ "options": "currency",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "section_break_49",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "base_grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total (Company Currency)",
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_rounding_adjustment",
+ "fieldtype": "Currency",
+ "label": "Rounding Adjustment (Company Currency)",
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "depends_on": "eval:!doc.disable_rounded_total",
+ "fieldname": "base_rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Company Currency)",
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_in_words",
+ "fieldtype": "Data",
+ "label": "In Words (Company Currency)",
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break8",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "print_hide": 1,
+ "width": "50%"
+ },
+ {
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total",
+ "oldfieldname": "grand_total_import",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "fieldname": "rounding_adjustment",
+ "fieldtype": "Currency",
+ "label": "Rounding Adjustment",
+ "no_copy": 1,
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "depends_on": "eval:!doc.disable_rounded_total",
+ "fieldname": "rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total",
+ "no_copy": 1,
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "oldfieldname": "in_words_import",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "total_advance",
+ "fieldtype": "Currency",
+ "label": "Total Advance",
+ "no_copy": 1,
+ "oldfieldname": "total_advance",
+ "oldfieldtype": "Currency",
+ "options": "party_account_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "outstanding_amount",
+ "fieldtype": "Currency",
+ "label": "Outstanding Amount",
+ "no_copy": 1,
+ "oldfieldname": "outstanding_amount",
+ "oldfieldtype": "Currency",
+ "options": "party_account_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "grand_total",
+ "fieldname": "disable_rounded_total",
+ "fieldtype": "Check",
+ "label": "Disable Rounded Total"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "paid_amount",
+ "depends_on": "eval:doc.is_paid===1||(doc.advances && doc.advances.length>0)",
+ "fieldname": "payments_section",
+ "fieldtype": "Section Break",
+ "label": "Payments"
+ },
+ {
+ "fieldname": "mode_of_payment",
+ "fieldtype": "Link",
+ "label": "Mode of Payment",
+ "options": "Mode of Payment",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "cash_bank_account",
+ "fieldtype": "Link",
+ "label": "Cash/Bank Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "clearance_date",
+ "fieldtype": "Date",
+ "hidden": 1,
+ "label": "Clearance Date"
+ },
+ {
+ "fieldname": "col_br_payments",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "is_paid",
+ "fieldname": "paid_amount",
+ "fieldtype": "Currency",
+ "label": "Paid Amount",
+ "no_copy": 1,
+ "options": "currency",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "base_paid_amount",
+ "fieldtype": "Currency",
+ "label": "Paid Amount (Company Currency)",
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "write_off_amount",
+ "depends_on": "grand_total",
+ "fieldname": "write_off",
+ "fieldtype": "Section Break",
+ "label": "Write Off"
+ },
+ {
+ "fieldname": "write_off_amount",
+ "fieldtype": "Currency",
+ "label": "Write Off Amount",
+ "no_copy": 1,
+ "options": "currency",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "base_write_off_amount",
+ "fieldtype": "Currency",
+ "label": "Write Off Amount (Company Currency)",
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_61",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:flt(doc.write_off_amount)!=0",
+ "fieldname": "write_off_account",
+ "fieldtype": "Link",
+ "label": "Write Off Account",
+ "options": "Account",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "eval:flt(doc.write_off_amount)!=0",
+ "fieldname": "write_off_cost_center",
+ "fieldtype": "Link",
+ "label": "Write Off Cost Center",
+ "options": "Cost Center",
+ "print_hide": 1
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "advances",
+ "fieldname": "advances_section",
+ "fieldtype": "Section Break",
+ "label": "Advance Payments",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-money",
+ "print_hide": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "allocate_advances_automatically",
+ "fieldtype": "Check",
+ "label": "Set Advances and Allocate (FIFO)"
+ },
+ {
+ "depends_on": "eval:!doc.allocate_advances_automatically",
+ "fieldname": "get_advances",
+ "fieldtype": "Button",
+ "label": "Get Advances Paid",
+ "oldfieldtype": "Button",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "advances",
+ "fieldtype": "Table",
+ "label": "Advances",
+ "no_copy": 1,
+ "oldfieldname": "advance_allocation_details",
+ "oldfieldtype": "Table",
+ "options": "Purchase Invoice Advance",
+ "print_hide": 1
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:(!doc.is_return)",
+ "fieldname": "payment_schedule_section",
+ "fieldtype": "Section Break",
+ "label": "Payment Terms"
+ },
+ {
+ "fieldname": "payment_terms_template",
+ "fieldtype": "Link",
+ "label": "Payment Terms Template",
+ "options": "Payment Terms Template"
+ },
+ {
+ "fieldname": "payment_schedule",
+ "fieldtype": "Table",
+ "label": "Payment Schedule",
+ "no_copy": 1,
+ "options": "Payment Schedule",
+ "print_hide": 1
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "terms",
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "Terms and Conditions",
+ "options": "fa fa-legal"
+ },
+ {
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "options": "Terms and Conditions",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions1"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "printing_settings",
+ "fieldtype": "Section Break",
+ "label": "Printing Settings"
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "options": "Letter Head",
+ "print_hide": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "default": "0",
+ "fieldname": "group_same_items",
+ "fieldtype": "Check",
+ "label": "Group same items",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break_112",
+ "fieldtype": "Column Break"
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "print_hide": 1,
+ "report_hide": 1
+ },
+ {
+ "fieldname": "language",
+ "fieldtype": "Data",
+ "label": "Print Language",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Information",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-file-text",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "credit_to",
+ "fieldtype": "Link",
+ "label": "Credit To",
+ "oldfieldname": "credit_to",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "party_account_currency",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "label": "Party Account Currency",
+ "no_copy": 1,
+ "options": "Currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "default": "No",
+ "fieldname": "is_opening",
+ "fieldtype": "Select",
+ "label": "Is Opening",
+ "oldfieldname": "is_opening",
+ "oldfieldtype": "Select",
+ "options": "No\nYes",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "against_expense_account",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Against Expense Account",
+ "no_copy": 1,
+ "oldfieldname": "against_expense_account",
+ "oldfieldtype": "Small Text",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break_63",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_standard_filter": 1,
+ "label": "Status",
+ "options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "inter_company_invoice_reference",
+ "fieldtype": "Link",
+ "label": "Inter Company Invoice Reference",
+ "options": "Sales Invoice",
+ "read_only": 1
+ },
+ {
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "label": "Remarks",
+ "no_copy": 1,
+ "oldfieldname": "remarks",
+ "oldfieldtype": "Text",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "subscription_section",
+ "fieldtype": "Section Break",
+ "label": "Subscription Section",
+ "print_hide": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "description": "Start date of current invoice's period",
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "label": "From Date",
+ "no_copy": 1,
+ "print_hide": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "description": "End date of current invoice's period",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "label": "To Date",
+ "no_copy": 1,
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break_114",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "auto_repeat",
+ "fieldtype": "Link",
+ "label": "Auto Repeat",
+ "no_copy": 1,
+ "options": "Auto Repeat",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "depends_on": "eval: doc.auto_repeat",
+ "fieldname": "update_auto_repeat_reference",
+ "fieldtype": "Button",
+ "label": "Update Auto Repeat Reference"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "accounting_dimensions_section",
+ "fieldtype": "Section Break",
+ "label": "Accounting Dimensions "
+ },
+ {
+ "fieldname": "dimension_col_break",
+ "fieldtype": "Column Break"
+ }
+ ],
+ "icon": "fa fa-file-text",
+ "idx": 204,
+ "is_submittable": 1,
+ "modified": "2019-09-17 22:31:42.666601",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Purchase Invoice",
+ "name_case": "Title Case",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts User",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase User"
+ },
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Accounts Manager",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Auditor"
+ },
+ {
+ "permlevel": 1,
+ "read": 1,
+ "role": "Accounts Manager",
+ "write": 1
+ }
+ ],
+ "search_fields": "posting_date, supplier, bill_no, base_grand_total, outstanding_amount",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "timeline_field": "supplier",
+ "title_field": "title",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index bc2ddff..bc9c178 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -364,7 +364,7 @@
update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes"
make_gl_entries(gl_entries, cancel=(self.docstatus == 2),
- update_outstanding=update_outstanding, merge_entries=False)
+ update_outstanding=update_outstanding, merge_entries=False, from_repost=from_repost)
if update_outstanding == "No":
update_outstanding_amt(self.credit_to, "Supplier", self.supplier,
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 0923a5b..3a19bb1 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -591,7 +591,6 @@
"oldfieldname": "purchase_order",
"oldfieldtype": "Link",
"options": "Purchase Order",
- "print_hide": 1,
"read_only": 1,
"search_index": 1
},
@@ -607,6 +606,7 @@
"fieldname": "include_exploded_items",
"fieldtype": "Check",
"label": "Include Exploded Items",
+ "print_hide": 1,
"read_only": 1
},
{
@@ -758,7 +758,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2019-06-02 06:36:17.078419",
+ "modified": "2019-09-17 22:32:05.984240",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 261363c..7d4fc63 100755
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -238,7 +238,7 @@
customers = [frappe._dict({'name': customers})]
for data in customers:
- contact = frappe.db.sql(""" select email_id, phone from `tabContact`
+ contact = frappe.db.sql(""" select email_id, phone, mobile_no from `tabContact`
where is_primary_contact=1 and name in
(select parent from `tabDynamic Link` where link_doctype = 'Customer' and link_name = %s
and parenttype = 'Contact')""", data.name, as_dict=1)
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index abbac77..e1256a7 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -698,7 +698,7 @@
cint(self.redeem_loyalty_points)) else "Yes"
make_gl_entries(gl_entries, cancel=(self.docstatus == 2),
- update_outstanding=update_outstanding, merge_entries=False)
+ update_outstanding=update_outstanding, merge_entries=False, from_repost=from_repost)
if update_outstanding == "No":
from erpnext.accounts.doctype.gl_entry.gl_entry import update_outstanding_amt
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index ff0c265..8dc00f3 100755
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -817,6 +817,7 @@
if(reg.test(data.name.toLowerCase())
|| reg.test(data.customer_name.toLowerCase())
|| (contact && reg.test(contact["phone"]))
+ || (contact && reg.test(contact["mobile_no"]))
|| (data.customer_group && reg.test(data.customer_group.toLowerCase()))){
return data;
}
@@ -833,6 +834,7 @@
if(contact && !c['phone']) {
c["phone"] = contact["phone"];
c["email_id"] = contact["email_id"];
+ c["mobile_no"] = contact["mobile_no"];
}
me.customers_mapper.push({
@@ -842,9 +844,10 @@
customer_group: c.customer_group,
territory: c.territory,
phone: contact ? contact["phone"] : '',
+ mobile_no: contact ? contact["mobile_no"] : '',
email_id: contact ? contact["email_id"] : '',
searchtext: ['customer_name', 'customer_group', 'name', 'value',
- 'label', 'email_id', 'phone']
+ 'label', 'email_id', 'phone', 'mobile_no']
.map(key => c[key]).join(' ')
.toLowerCase()
});
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 8cbf845..bcbd427 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -59,7 +59,6 @@
self.invoices = set()
def get_data(self):
- t1 = now()
self.get_gl_entries()
self.voucher_balance = OrderedDict()
self.init_voucher_balance() # invoiced, paid, credit_note, outstanding
@@ -73,6 +72,9 @@
# fetch future payments against invoices
self.get_future_payments()
+ # Get return entries
+ self.get_return_entries()
+
self.data = []
for gle in self.gl_entries:
self.update_voucher_balance(gle)
@@ -91,6 +93,7 @@
party = gle.party,
posting_date = gle.posting_date,
remarks = gle.remarks,
+ account_currency = gle.account_currency,
invoiced = 0.0,
paid = 0.0,
credit_note = 0.0,
@@ -106,7 +109,6 @@
# get the row where this balance needs to be updated
# if its a payment, it will return the linked invoice or will be considered as advance
row = self.get_voucher_balance(gle)
-
# gle_balance will be the total "debit - credit" for receivable type reports and
# and vice-versa for payable type reports
gle_balance = self.get_gle_balance(gle)
@@ -131,7 +133,18 @@
if gle.against_voucher:
# find invoice
- voucher_balance = self.voucher_balance.get((gle.against_voucher_type, gle.against_voucher, gle.party))
+ against_voucher = gle.against_voucher
+
+ # If payment is made against credit note
+ # and credit note is made against a Sales Invoice
+ # then consider the payment against original sales invoice.
+ if gle.against_voucher_type in ('Sales Invoice', 'Purchase Invoice'):
+ if gle.against_voucher in self.return_entries:
+ return_against = self.return_entries.get(gle.against_voucher)
+ if return_against:
+ against_voucher = return_against
+
+ voucher_balance = self.voucher_balance.get((gle.against_voucher_type, against_voucher, gle.party))
if not voucher_balance:
# no invoice, this is an invoice / stand-alone payment / credit note
@@ -258,7 +271,6 @@
# customer / supplier name
party_details = self.get_party_details(row.party)
row.update(party_details)
-
if self.filters.get(scrub(self.filters.party_type)):
row.currency = row.account_currency
else:
@@ -423,6 +435,19 @@
if row.future_ref:
row.future_ref = ', '.join(row.future_ref)
+ def get_return_entries(self):
+ doctype = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
+ filters={
+ 'is_return': 1,
+ 'docstatus': 1
+ }
+ party_field = scrub(self.filters.party_type)
+ if self.filters.get(party_field):
+ filters.update({party_field: self.filters.get(party_field)})
+ self.return_entries = frappe._dict(
+ frappe.get_all(doctype, filters, ['name', 'return_against'], as_list=1)
+ )
+
def set_ageing(self, row):
if self.filters.ageing_based_on == "Due Date":
entry_date = row.due_date
@@ -689,11 +714,11 @@
def get_chart_data(self):
rows = []
for row in self.data:
- rows.append(
- {
- 'values': [row.range1, row.range2, row.range3, row.range4, row.range5]
- }
- )
+ values = [row.range1, row.range2, row.range3, row.range4, row.range5]
+ precision = cint(frappe.db.get_default("float_precision")) or 2
+ rows.append({
+ 'values': [flt(val, precision) for val in values]
+ })
self.chart = {
"data": {
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index 2b32fa9..1d13ed1 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -5,6 +5,7 @@
import frappe
from frappe.utils import flt
from frappe import msgprint, _
+from frappe.model.meta import get_field_precision
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
def execute(filters=None):
diff --git a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.json b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.json
index 0490119..557a62d 100644
--- a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.json
+++ b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.json
@@ -1,6 +1,7 @@
{
- "add_total_row": 0,
+ "add_total_row": 1,
"creation": "2018-08-21 11:32:30.874923",
+ "disable_prepared_report": 0,
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
diff --git a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
index 8ca466e..4ac0f65 100644
--- a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
+++ b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
@@ -70,7 +70,7 @@
rate = [i.tax_withholding_rate for i in tds_doc.rates
if i.fiscal_year == gle_map[d][0].fiscal_year]
- if rate and len(rate) > 0:
+ if rate and len(rate) > 0 and tds_deducted:
rate = rate[0]
if getdate(filters.from_date) <= gle_map[d][0].posting_date \
@@ -164,7 +164,7 @@
{
"label": _("TDS Rate %"),
"fieldname": "tds_rate",
- "fieldtype": "Float",
+ "fieldtype": "Percent",
"width": 90
},
{
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 05c4926..66ad97a 100644
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -267,6 +267,7 @@
"fieldtype": "Currency",
"label": "Last Purchase Rate",
"options": "currency",
+ "print_hide": 1,
"read_only": 1
},
{
@@ -561,7 +562,8 @@
"depends_on": "eval:parent.is_subcontracted == 'Yes'",
"fieldname": "include_exploded_items",
"fieldtype": "Check",
- "label": "Include Exploded Items"
+ "label": "Include Exploded Items",
+ "print_hide": 1
},
{
"fieldname": "section_break_56",
@@ -701,7 +703,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2019-06-23 20:03:13.818917",
+ "modified": "2019-09-17 22:32:34.703923",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",
@@ -712,4 +714,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
index 671c14b..97aa922 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -1,1004 +1,316 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "naming_series:",
- "beta": 0,
- "creation": "2016-02-25 01:24:07.224790",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 0,
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2016-02-25 01:24:07.224790",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+ "naming_series",
+ "company",
+ "vendor",
+ "column_break1",
+ "transaction_date",
+ "suppliers_section",
+ "suppliers",
+ "get_suppliers_button",
+ "items_section",
+ "items",
+ "link_to_mrs",
+ "supplier_response_section",
+ "email_template",
+ "message_for_supplier",
+ "terms_section_break",
+ "tc_name",
+ "terms",
+ "printing_settings",
+ "select_print_heading",
+ "letter_head",
+ "more_info",
+ "status",
+ "fiscal_year",
+ "column_break3",
+ "amended_from"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Series",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "PUR-RFQ-.YYYY.-",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 1,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "PUR-RFQ-.YYYY.-",
+ "print_hide": 1,
+ "reqd": 1,
+ "set_only_once": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "company",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Company",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 1,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "remember_last_selected_value": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "For individual supplier",
- "fieldname": "vendor",
- "fieldtype": "Link",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 1,
- "label": "Supplier",
- "length": 0,
- "no_copy": 1,
- "options": "Supplier",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "description": "For individual supplier",
+ "fieldname": "vendor",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "in_standard_filter": 1,
+ "label": "Supplier",
+ "no_copy": 1,
+ "options": "Supplier",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "50%",
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "print_width": "50%",
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "transaction_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Date",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "transaction_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "transaction_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "Date",
+ "oldfieldname": "transaction_date",
+ "oldfieldtype": "Date",
+ "reqd": 1,
+ "search_index": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "suppliers_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "suppliers_section",
+ "fieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "suppliers",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Supplier Detail",
- "length": 0,
- "no_copy": 0,
- "options": "Request for Quotation Supplier",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "suppliers",
+ "fieldtype": "Table",
+ "label": "Supplier Detail",
+ "options": "Request for Quotation Supplier",
+ "print_hide": 1,
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "get_suppliers_button",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Get Suppliers",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "get_suppliers_button",
+ "fieldtype": "Button",
+ "label": "Get Suppliers"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "items_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-shopping-cart",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "items_section",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-shopping-cart"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "items",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Items",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "po_details",
- "oldfieldtype": "Table",
- "options": "Request for Quotation Item",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "oldfieldname": "po_details",
+ "oldfieldtype": "Table",
+ "options": "Request for Quotation Item",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)",
- "fieldname": "link_to_mrs",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Link to material requests",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)",
+ "fieldname": "link_to_mrs",
+ "fieldtype": "Button",
+ "label": "Link to Material Requests"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "supplier_response_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "supplier_response_section",
+ "fieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "email_template",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Email Template",
- "length": 0,
- "no_copy": 0,
- "options": "Email Template",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "email_template",
+ "fieldtype": "Link",
+ "label": "Email Template",
+ "options": "Email Template",
+ "print_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "message_for_supplier",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Message for Supplier",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "message_for_supplier",
+ "fieldtype": "Text Editor",
+ "in_list_view": 1,
+ "label": "Message for Supplier",
+ "print_hide": 1,
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "terms",
- "columns": 0,
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Terms and Conditions",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-legal",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "collapsible_depends_on": "terms",
+ "fieldname": "terms_section_break",
+ "fieldtype": "Section Break",
+ "label": "Terms and Conditions",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-legal"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "tc_name",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Terms",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "tc_name",
- "oldfieldtype": "Link",
- "options": "Terms and Conditions",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "tc_name",
+ "fieldtype": "Link",
+ "label": "Terms",
+ "oldfieldname": "tc_name",
+ "oldfieldtype": "Link",
+ "options": "Terms and Conditions",
+ "print_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Terms and Conditions",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "terms",
- "oldfieldtype": "Text Editor",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions",
+ "oldfieldname": "terms",
+ "oldfieldtype": "Text Editor"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "printing_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Printing Settings",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "fieldname": "printing_settings",
+ "fieldtype": "Section Break",
+ "label": "Printing Settings"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Print Heading",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 1,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "print_hide": 1,
+ "report_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Letter Head",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "Letter Head",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "Letter Head",
+ "print_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "more_info",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "More Information",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-file-text",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Information",
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-file-text"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "status",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Status",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "\nDraft\nSubmitted\nCancelled",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "\nDraft\nSubmitted\nCancelled",
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Fiscal Year",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "Fiscal Year",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Select",
+ "options": "Fiscal Year",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Amended From",
- "length": 0,
- "no_copy": 1,
- "options": "Request for Quotation",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Request for Quotation",
+ "print_hide": 1,
+ "read_only": 1
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-shopping-cart",
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-08-21 14:44:22.102552",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Request for Quotation",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "icon": "fa fa-shopping-cart",
+ "is_submittable": 1,
+ "modified": "2019-09-24 15:08:32.750661",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Request for Quotation",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Manufacturing Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Manufacturing Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase User",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "amend": 1,
+ "create": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase User",
+ "share": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
- },
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User"
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 1,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Purchase Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "permlevel": 1,
+ "read": 1,
+ "role": "Purchase Manager",
"write": 1
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 1,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "All",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
+ "permlevel": 1,
+ "read": 1,
+ "role": "All"
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 1,
- "search_fields": "status, transaction_date",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "",
- "title_field": "",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ ],
+ "search_fields": "status, transaction_date",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC"
}
\ No newline at end of file
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 37548ea..31a78c3 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -143,7 +143,7 @@
if not self.cash_bank_account:
# show message that the amount is not paid
frappe.throw(_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"))
-
+
if cint(self.is_return) and self.grand_total > self.paid_amount:
self.paid_amount = flt(flt(self.grand_total), self.precision("paid_amount"))
@@ -1195,8 +1195,10 @@
child_item.rate = flt(d.get("rate"))
if flt(child_item.price_list_rate):
- child_item.discount_percentage = flt((1 - flt(child_item.rate) / flt(child_item.price_list_rate)) * 100.0, \
+ discount = flt((1 - flt(child_item.rate) / flt(child_item.price_list_rate)) * 100.0,
child_item.precision("discount_percentage"))
+ if discount > 0:
+ child_item.discount_percentage = discount
child_item.flags.ignore_validate_update_after_submit = True
if new_child_flag:
@@ -1220,7 +1222,6 @@
parent.update_status_updater()
else:
parent.check_credit_limit()
-
parent.save()
if parent_doctype == 'Purchase Order':
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 084f84b..9d37df0 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -598,6 +598,7 @@
'item_code': d.item_code,
'via_stock_ledger': False,
'company': self.company,
+ 'supplier': self.supplier,
'actual_qty': d.qty,
'purchase_document_type': self.doctype,
'purchase_document_no': self.name,
@@ -625,6 +626,7 @@
'asset_category': item_data.get('asset_category'),
'location': row.asset_location,
'company': self.company,
+ 'supplier': self.supplier,
'purchase_date': self.posting_date,
'calculate_depreciation': 1,
'purchase_receipt_amount': purchase_amount,
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index dee71dc..29f8dd5 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -283,7 +283,7 @@
if 'description' not in allow_fields:
if not variant.description:
variant.description = ""
-
+ else:
if item.variant_based_on=='Item Attribute':
if variant.attributes:
attributes_description = item.description + " "
@@ -291,7 +291,7 @@
attributes_description += "<div>" + d.attribute + ": " + cstr(d.attribute_value) + "</div>"
if attributes_description not in variant.description:
- variant.description += attributes_description
+ variant.description = attributes_description
def make_variant_item_code(template_item_code, template_item_name, variant):
"""Uses template's item code and abbreviations to make variant's item code"""
diff --git a/erpnext/crm/doctype/opportunity/test_opportunity.py b/erpnext/crm/doctype/opportunity/test_opportunity.py
index 8f61edf..33d9007 100644
--- a/erpnext/crm/doctype/opportunity/test_opportunity.py
+++ b/erpnext/crm/doctype/opportunity/test_opportunity.py
@@ -53,7 +53,7 @@
"link_name": customer.name
}]
})
- contact.add_email(new_lead_email_id)
+ contact.add_email(new_lead_email_id, is_primary=True)
contact.insert(ignore_permissions=True)
opp_doc = frappe.get_doc(args).insert(ignore_permissions=True)
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 7e33a14..b165b13 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -352,3 +352,53 @@
'personal_fields': ['contact_mobile', 'contact_display', 'customer_name'],
}
]
+
+global_search_doctypes = [
+ {"doctype": "Customer", "index": 0},
+ {"doctype": "Supplier", "index": 1},
+ {"doctype": "Item", "index": 2},
+ {"doctype": "Warehouse", "index": 3},
+ {"doctype": "Account", "index": 4},
+ {"doctype": "Employee", "index": 5},
+ {"doctype": "BOM", "index": 6},
+ {"doctype": "Sales Invoice", "index": 7},
+ {"doctype": "Sales Order", "index": 8},
+ {"doctype": "Quotation", "index": 9},
+ {"doctype": "Work Order", "index": 10},
+ {"doctype": "Purchase Receipt", "index": 11},
+ {"doctype": "Purchase Invoice", "index": 12},
+ {"doctype": "Delivery Note", "index": 13},
+ {"doctype": "Stock Entry", "index": 14},
+ {"doctype": "Material Request", "index": 15},
+ {"doctype": "Delivery Trip", "index": 16},
+ {"doctype": "Pick List", "index": 17},
+ {"doctype": "Salary Slip", "index": 18},
+ {"doctype": "Leave Application", "index": 19},
+ {"doctype": "Expense Claim", "index": 20},
+ {"doctype": "Payment Entry", "index": 21},
+ {"doctype": "Lead", "index": 22},
+ {"doctype": "Opportunity", "index": 23},
+ {"doctype": "Item Price", "index": 24},
+ {"doctype": "Purchase Taxes and Charges Template", "index": 25},
+ {"doctype": "Sales Taxes and Charges", "index": 26},
+ {"doctype": "Asset", "index": 27},
+ {"doctype": "Project", "index": 28},
+ {"doctype": "Task", "index": 29},
+ {"doctype": "Timesheet", "index": 30},
+ {"doctype": "Issue", "index": 31},
+ {"doctype": "Serial No", "index": 32},
+ {"doctype": "Batch", "index": 33},
+ {"doctype": "Branch", "index": 34},
+ {"doctype": "Department", "index": 35},
+ {"doctype": "Employee Grade", "index": 36},
+ {"doctype": "Designation", "index": 37},
+ {"doctype": "Job Opening", "index": 38},
+ {"doctype": "Job Applicant", "index": 39},
+ {"doctype": "Job Offer", "index": 40},
+ {"doctype": "Salary Structure Assignment", "index": 41},
+ {"doctype": "Appraisal", "index": 42},
+ {"doctype": "Loan", "index": 43},
+ {"doctype": "Maintenance Schedule", "index": 44},
+ {"doctype": "Maintenance Visit", "index": 45},
+ {"doctype": "Warranty Claim", "index": 46},
+]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index e9de393..b0cddc2 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "HR-APP-.YYYY.-.#####",
"beta": 0,
"creation": "2013-01-29 19:25:37",
@@ -346,7 +346,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2019-06-21 16:15:43.552049",
+ "modified": "2019-07-21 16:15:43.552049",
"modified_by": "Administrator",
"module": "HR",
"name": "Job Applicant",
diff --git a/erpnext/hub_node/legacy.py b/erpnext/hub_node/legacy.py
index 85eb1b2..b61b88b 100644
--- a/erpnext/hub_node/legacy.py
+++ b/erpnext/hub_node/legacy.py
@@ -73,7 +73,7 @@
{'link_doctype': 'Supplier', 'link_name': supplier.supplier_name}
]
})
- contact.add_email(supplier.supplier_email)
+ contact.add_email(supplier.supplier_email, is_primary=True)
contact.insert()
else:
contact = frappe.get_doc('Contact', contact_name)
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index a636b87..24b798b 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -213,6 +213,9 @@
self.db_set(fieldname, qty)
+ from erpnext.selling.doctype.sales_order.sales_order import update_produced_qty_in_so_item
+ update_produced_qty_in_so_item(self.sales_order_item)
+
if self.production_plan:
self.update_production_plan_status()
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index a001d16..722baaf 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -636,4 +636,5 @@
erpnext.patches.v12_0.move_credit_limit_to_customer_credit_limit
erpnext.patches.v12_0.add_variant_of_in_item_attribute_table
erpnext.patches.v12_0.rename_bank_account_field_in_journal_entry_account
-erpnext.patches.v12_0.create_default_energy_point_rules
\ No newline at end of file
+erpnext.patches.v12_0.create_default_energy_point_rules
+erpnext.patches.v12_0.set_produced_qty_field_in_sales_order_for_work_order
diff --git a/erpnext/patches/v12_0/set_priority_for_support.py b/erpnext/patches/v12_0/set_priority_for_support.py
index 5096ed4..a5490ef 100644
--- a/erpnext/patches/v12_0/set_priority_for_support.py
+++ b/erpnext/patches/v12_0/set_priority_for_support.py
@@ -3,6 +3,7 @@
def execute():
frappe.reload_doc("support", "doctype", "issue_priority")
frappe.reload_doc("support", "doctype", "service_level_priority")
+ frappe.reload_doc('support', 'doctype', 'issue')
set_issue_priority()
set_priority_for_issue()
diff --git a/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py b/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py
new file mode 100644
index 0000000..44d8fa7
--- /dev/null
+++ b/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py
@@ -0,0 +1,10 @@
+import frappe
+from frappe.utils import flt
+from erpnext.selling.doctype.sales_order.sales_order import update_produced_qty_in_so_item
+
+def execute():
+ frappe.reload_doctype('Sales Order Item')
+ frappe.reload_doctype('Sales Order')
+ sales_order_items = frappe.db.get_all('Sales Order Item', ['name'])
+ for so_item in sales_order_items:
+ update_produced_qty_in_so_item(so_item.get('name'))
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index dc221bc..205f895 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -123,6 +123,7 @@
"fieldtype": "Column Break"
},
{
+ "allow_in_quick_entry": 1,
"fieldname": "project_template",
"fieldtype": "Link",
"label": "From Template",
@@ -443,7 +444,7 @@
"icon": "fa fa-puzzle-piece",
"idx": 29,
"max_attachments": 4,
- "modified": "2019-07-16 11:11:12.343658",
+ "modified": "2019-09-24 15:02:50.208301",
"modified_by": "Administrator",
"module": "Projects",
"name": "Project",
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index d49b9a9..a8e3ce4 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -350,8 +350,10 @@
'link_name': args.get('name')
}]
})
- contact.add_email(args.get('email_id'))
- contact.add_phone(args.get('mobile_no'))
+ if args.get('email_id'):
+ contact.add_email(args.get('email_id'), is_primary=True)
+ if args.get('mobile_no'):
+ contact.add_phone(args.get('mobile_no'), is_primary_mobile_no=True)
contact.insert()
return contact
diff --git a/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json b/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
index e26f798..c28021c 100644
--- a/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
+++ b/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
@@ -34,11 +34,11 @@
"fieldname": "bypass_credit_limit_check",
"fieldtype": "Check",
"in_list_view": 1,
- "label": "Bypass credit limit_check"
+ "label": "Bypass Credit Limit Check"
}
],
"istable": 1,
- "modified": "2019-08-29 20:46:36.073953",
+ "modified": "2019-09-24 15:05:26.069911",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer Credit Limit",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 12b9a8e..e60be5a 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -1023,3 +1023,15 @@
doc.set_item_locations()
return doc
+
+def update_produced_qty_in_so_item(sales_order_item):
+ #for multiple work orders against same sales order item
+ linked_wo_with_so_item = frappe.db.get_all('Work Order', ['produced_qty'], {
+ 'sales_order_item': sales_order_item,
+ 'docstatus': 1
+ })
+ if len(linked_wo_with_so_item) > 0:
+ total_produced_qty = 0
+ for wo in linked_wo_with_so_item:
+ total_produced_qty += flt(wo.get('produced_qty'))
+ frappe.db.set_value('Sales Order Item', sales_order_item, 'produced_qty', total_produced_qty)
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 01dfc7d..b94dce1 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -110,6 +110,7 @@
"read_only": 1
},
{
+ "default": "0",
"fieldname": "ensure_delivery_based_on_produced_serial_no",
"fieldtype": "Check",
"label": "Ensure Delivery Based on Produced Serial No"
@@ -381,6 +382,7 @@
"read_only": 1
},
{
+ "default": "0",
"fieldname": "is_free_item",
"fieldtype": "Check",
"label": "Is Free Item",
@@ -436,6 +438,7 @@
"print_hide": 1
},
{
+ "default": "0",
"fieldname": "delivered_by_supplier",
"fieldtype": "Check",
"label": "Supplier delivers to Customer",
@@ -662,6 +665,7 @@
},
{
"allow_on_submit": 1,
+ "default": "0",
"fieldname": "page_break",
"fieldtype": "Check",
"label": "Page Break",
@@ -689,7 +693,6 @@
"description": "For Production",
"fieldname": "produced_qty",
"fieldtype": "Float",
- "hidden": 1,
"label": "Produced Quantity",
"oldfieldname": "produced_qty",
"oldfieldtype": "Currency",
@@ -740,7 +743,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2019-05-01 17:52:32.810797",
+ "modified": "2019-09-13 12:18:54.903107",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",
diff --git a/erpnext/selling/doctype/sms_center/sms_center.py b/erpnext/selling/doctype/sms_center/sms_center.py
index 289b045..bb6ba1f 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.py
+++ b/erpnext/selling/doctype/sms_center/sms_center.py
@@ -31,7 +31,7 @@
self.sales_partner.replace("'", "\'") or " and ifnull(dl.link_name, '') != ''"
if self.send_to in ['All Contact', 'All Customer Contact', 'All Supplier Contact', 'All Sales Partner Contact']:
rec = frappe.db.sql("""select CONCAT(ifnull(c.first_name,''), ' ', ifnull(c.last_name,'')),
- c.phone from `tabContact` c, `tabDynamic Link` dl where ifnull(c.phone,'')!='' and
+ c.mobile_no from `tabContact` c, `tabDynamic Link` dl where ifnull(c.mobile_no,'')!='' and
c.docstatus != 2 and dl.parent = c.name%s""" % where_clause)
elif self.send_to == 'All Lead (Open)':
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index b657165..66598f4 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -9,6 +9,7 @@
from frappe.desk.page.setup_wizard.setup_wizard import make_records
from frappe.utils import cstr, getdate
from erpnext.accounts.doctype.account.account import RootNotEditable
+from frappe.desk.doctype.global_search_settings.global_search_settings import update_global_search_doctypes
default_lead_sources = ["Existing Customer", "Reference", "Advertisement",
"Cold Calling", "Exhibition", "Supplier Reference", "Mass Mailing",
@@ -274,6 +275,8 @@
set_more_defaults()
+ update_global_search_doctypes()
+
# path = frappe.get_app_path('erpnext', 'regional', frappe.scrub(country))
# if os.path.exists(path.encode("utf-8")):
# frappe.get_attr("erpnext.regional.{0}.setup.setup_company_independent_fixtures".format(frappe.scrub(country)))()
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index db2c327..40cb7c8 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -55,8 +55,6 @@
cart_settings = frappe.db.get_value("Shopping Cart Settings", None,
["company", "allow_items_not_in_stock"], as_dict=1)
quotation.company = cart_settings.company
- if not quotation.get("customer_address"):
- throw(_("{0} is required").format(_(quotation.meta.get_label("customer_address"))))
quotation.flags.ignore_permissions = True
quotation.submit()
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index a88bb2a..2ee6872 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -85,26 +85,13 @@
refresh: function(frm) {
if (frm.doc.docstatus === 1 && frm.doc.is_return === 1 && frm.doc.per_billed !== 100) {
frm.add_custom_button(__('Credit Note'), function() {
- frappe.confirm(__("Are you sure you want to make credit note?"),
- function() {
- frm.trigger("make_credit_note");
- }
- );
+ frappe.model.open_mapped_doc({
+ method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
+ frm: cur_frm,
+ })
}, __('Create'));
-
frm.page.set_inner_btn_group_as_primary(__('Create'));
}
- },
-
- make_credit_note: function(frm) {
- frm.call({
- method: "make_return_invoice",
- doc: frm.doc,
- freeze: true,
- callback: function() {
- frm.reload_doc();
- }
- });
}
});
@@ -123,6 +110,9 @@
setup: function(doc) {
this.setup_posting_date_time_check();
this._super(doc);
+ this.frm.make_methods = {
+ 'Delivery Trip': this.make_delivery_trip,
+ };
},
refresh: function(doc, dt, dn) {
var me = this;
@@ -239,7 +229,7 @@
make_delivery_trip: function() {
frappe.model.open_mapped_doc({
method: "erpnext.stock.doctype.delivery_note.delivery_note.make_delivery_trip",
- frm: this.frm
+ frm: cur_frm
})
},
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index bdb49e4..c98dfe3 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -458,6 +458,9 @@
doc = get_mapped_doc("Delivery Note", source_name, {
"Delivery Note": {
"doctype": "Sales Invoice",
+ "field_map": {
+ "is_return": "is_return"
+ },
"validation": {
"docstatus": ["=", 1]
}
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 8266055..2e8bc64 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -41,28 +41,15 @@
if (frm.doc.docstatus === 1 && frm.doc.is_return === 1 && frm.doc.per_billed !== 100) {
frm.add_custom_button(__('Debit Note'), function() {
- frappe.confirm(__("Are you sure you want to make debit note?"),
- function() {
- frm.trigger("make_debit_note");
- }
- );
+ frappe.model.open_mapped_doc({
+ method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
+ frm: cur_frm,
+ })
}, __('Create'));
-
frm.page.set_inner_btn_group_as_primary(__('Create'));
}
},
- make_debit_note: function(frm) {
- frm.call({
- method: "make_return_invoice",
- doc: frm.doc,
- freeze: true,
- callback: function() {
- frm.reload_doc();
- }
- });
- },
-
company: function(frm) {
frm.trigger("toggle_display_account_head");
},
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 0c8e9a0..fae4de3 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -426,16 +426,6 @@
self.load_from_db()
- def make_return_invoice(self):
- return_invoice = make_purchase_invoice(self.name)
- return_invoice.is_return = True
- return_invoice.save()
- return_invoice.submit()
-
- debit_note_link = frappe.utils.get_link_to_form('Purchase Invoice', return_invoice.name)
-
- frappe.msgprint(_("Debit Note {0} has been created automatically").format(debit_note_link))
-
def update_billed_amount_based_on_po(po_detail, update_modified=True):
# Billed against Sales Order directly
billed_against_po = frappe.db.sql("""select sum(amount) from `tabPurchase Invoice Item`
@@ -510,7 +500,8 @@
"Purchase Receipt": {
"doctype": "Purchase Invoice",
"field_map": {
- "supplier_warehouse":"supplier_warehouse"
+ "supplier_warehouse":"supplier_warehouse",
+ "is_return": "is_return"
},
"validation": {
"docstatus": ["=", 1],
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 70b62b0..446a488 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -1,830 +1,830 @@
{
- "autoname": "hash",
- "creation": "2013-05-24 19:29:10",
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "barcode",
- "section_break_2",
- "item_code",
- "supplier_part_no",
- "column_break_2",
- "item_name",
- "section_break_4",
- "description",
- "item_group",
- "brand",
- "image_section",
- "image",
- "image_view",
- "manufacture_details",
- "manufacturer",
- "column_break_16",
- "manufacturer_part_no",
- "received_and_accepted",
- "received_qty",
- "qty",
- "rejected_qty",
- "col_break2",
- "uom",
- "stock_uom",
- "conversion_factor",
- "retain_sample",
- "sample_quantity",
- "rate_and_amount",
- "price_list_rate",
- "discount_percentage",
- "discount_amount",
- "col_break3",
- "base_price_list_rate",
- "sec_break1",
- "rate",
- "amount",
- "col_break4",
- "base_rate",
- "base_amount",
- "pricing_rules",
- "is_free_item",
- "section_break_29",
- "net_rate",
- "net_amount",
- "item_tax_template",
- "column_break_32",
- "base_net_rate",
- "base_net_amount",
- "valuation_rate",
- "item_tax_amount",
- "rm_supp_cost",
- "landed_cost_voucher_amount",
- "billed_amt",
- "item_weight_details",
- "weight_per_unit",
- "total_weight",
- "column_break_41",
- "weight_uom",
- "warehouse_and_reference",
- "warehouse",
- "rejected_warehouse",
- "quality_inspection",
- "purchase_order",
- "material_request",
- "purchase_order_item",
- "material_request_item",
- "column_break_40",
- "is_fixed_asset",
- "asset",
- "asset_location",
- "schedule_date",
- "stock_qty",
- "section_break_45",
- "serial_no",
- "batch_no",
- "column_break_48",
- "rejected_serial_no",
- "expense_account",
- "col_break5",
- "allow_zero_valuation_rate",
- "bom",
- "include_exploded_items",
- "item_tax_rate",
- "accounting_dimensions_section",
- "project",
- "dimension_col_break",
- "cost_center",
- "section_break_80",
- "page_break"
- ],
- "fields": [
- {
- "fieldname": "barcode",
- "fieldtype": "Data",
- "label": "Barcode"
- },
- {
- "fieldname": "section_break_2",
- "fieldtype": "Section Break"
- },
- {
- "bold": 1,
- "columns": 3,
- "fieldname": "item_code",
- "fieldtype": "Link",
- "in_global_search": 1,
- "in_list_view": 1,
- "label": "Item Code",
- "oldfieldname": "item_code",
- "oldfieldtype": "Link",
- "options": "Item",
- "print_width": "100px",
- "reqd": 1,
- "search_index": 1,
- "width": "100px"
- },
- {
- "fieldname": "supplier_part_no",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Supplier Part Number",
- "read_only": 1
- },
- {
- "fieldname": "column_break_2",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "item_name",
- "fieldtype": "Data",
- "in_global_search": 1,
- "label": "Item Name",
- "oldfieldname": "item_name",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "reqd": 1
- },
- {
- "collapsible": 1,
- "fieldname": "section_break_4",
- "fieldtype": "Section Break",
- "label": "Description"
- },
- {
- "fieldname": "description",
- "fieldtype": "Text Editor",
- "label": "Description",
- "oldfieldname": "description",
- "oldfieldtype": "Text",
- "print_width": "300px",
- "reqd": 1,
- "width": "300px"
- },
- {
- "fieldname": "image",
- "fieldtype": "Attach",
- "hidden": 1,
- "label": "Image"
- },
- {
- "fieldname": "image_view",
- "fieldtype": "Image",
- "label": "Image View",
- "options": "image",
- "print_hide": 1
- },
- {
- "fieldname": "received_and_accepted",
- "fieldtype": "Section Break",
- "label": "Received and Accepted"
- },
- {
- "bold": 1,
- "fieldname": "received_qty",
- "fieldtype": "Float",
- "label": "Received Quantity",
- "oldfieldname": "received_qty",
- "oldfieldtype": "Currency",
- "print_hide": 1,
- "print_width": "100px",
- "reqd": 1,
- "width": "100px"
- },
- {
- "columns": 2,
- "fieldname": "qty",
- "fieldtype": "Float",
- "in_list_view": 1,
- "label": "Accepted Quantity",
- "oldfieldname": "qty",
- "oldfieldtype": "Currency",
- "print_width": "100px",
- "width": "100px"
- },
- {
- "fieldname": "rejected_qty",
- "fieldtype": "Float",
- "label": "Rejected Quantity",
- "oldfieldname": "rejected_qty",
- "oldfieldtype": "Currency",
- "print_hide": 1,
- "print_width": "100px",
- "width": "100px"
- },
- {
- "fieldname": "col_break2",
- "fieldtype": "Column Break",
- "print_hide": 1
- },
- {
- "fieldname": "uom",
- "fieldtype": "Link",
- "label": "UOM",
- "oldfieldname": "uom",
- "oldfieldtype": "Link",
- "options": "UOM",
- "print_hide": 1,
- "print_width": "100px",
- "reqd": 1,
- "width": "100px"
- },
- {
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "label": "Stock UOM",
- "oldfieldname": "stock_uom",
- "oldfieldtype": "Data",
- "options": "UOM",
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
- "reqd": 1,
- "width": "100px"
- },
- {
- "fieldname": "conversion_factor",
- "fieldtype": "Float",
- "label": "Conversion Factor",
- "oldfieldname": "conversion_factor",
- "oldfieldtype": "Currency",
- "print_hide": 1,
- "print_width": "100px",
- "reqd": 1,
- "width": "100px"
- },
- {
- "default": "0",
- "fetch_from": "item_code.retain_sample",
- "fieldname": "retain_sample",
- "fieldtype": "Check",
- "label": "Retain Sample",
- "read_only": 1
- },
- {
- "depends_on": "retain_sample",
- "fetch_from": "item_code.sample_quantity",
- "fieldname": "sample_quantity",
- "fieldtype": "Int",
- "label": "Sample Quantity"
- },
- {
- "fieldname": "rate_and_amount",
- "fieldtype": "Section Break",
- "label": "Rate and Amount"
- },
- {
- "fieldname": "price_list_rate",
- "fieldtype": "Currency",
- "label": "Price List Rate",
- "options": "currency",
- "print_hide": 1
- },
- {
- "depends_on": "price_list_rate",
- "fieldname": "discount_percentage",
- "fieldtype": "Percent",
- "label": "Discount on Price List Rate (%)",
- "print_hide": 1
- },
- {
- "depends_on": "price_list_rate",
- "fieldname": "discount_amount",
- "fieldtype": "Currency",
- "label": "Discount Amount",
- "options": "currency"
- },
- {
- "fieldname": "col_break3",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "base_price_list_rate",
- "fieldtype": "Currency",
- "label": "Price List Rate (Company Currency)",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "sec_break1",
- "fieldtype": "Section Break"
- },
- {
- "bold": 1,
- "columns": 3,
- "fieldname": "rate",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Rate",
- "oldfieldname": "import_rate",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_width": "100px",
- "width": "100px"
- },
- {
- "fieldname": "amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Amount",
- "oldfieldname": "import_amount",
- "oldfieldtype": "Currency",
- "options": "currency",
- "read_only": 1
- },
- {
- "fieldname": "col_break4",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "base_rate",
- "fieldtype": "Currency",
- "label": "Rate (Company Currency)",
- "oldfieldname": "purchase_rate",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
- "reqd": 1,
- "width": "100px"
- },
- {
- "fieldname": "base_amount",
- "fieldtype": "Currency",
- "label": "Amount (Company Currency)",
- "oldfieldname": "amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
- "width": "100px"
- },
- {
- "fieldname": "pricing_rules",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Pricing Rules",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "default": "0",
- "fieldname": "is_free_item",
- "fieldtype": "Check",
- "label": "Is Free Item",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "section_break_29",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "net_rate",
- "fieldtype": "Currency",
- "label": "Net Rate",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "columns": 2,
- "fieldname": "net_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Net Amount",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_32",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "base_net_rate",
- "fieldtype": "Currency",
- "label": "Net Rate (Company Currency)",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "base_net_amount",
- "fieldtype": "Currency",
- "label": "Net Amount (Company Currency)",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "item_weight_details",
- "fieldtype": "Section Break",
- "label": "Item Weight Details"
- },
- {
- "fieldname": "weight_per_unit",
- "fieldtype": "Float",
- "label": "Weight Per Unit"
- },
- {
- "fieldname": "total_weight",
- "fieldtype": "Float",
- "label": "Total Weight",
- "read_only": 1
- },
- {
- "fieldname": "column_break_41",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "weight_uom",
- "fieldtype": "Link",
- "label": "Weight UOM",
- "options": "UOM"
- },
- {
- "fieldname": "warehouse_and_reference",
- "fieldtype": "Section Break",
- "label": "Warehouse and Reference"
- },
- {
- "bold": 1,
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Accepted Warehouse",
- "oldfieldname": "warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "print_hide": 1,
- "print_width": "100px",
- "width": "100px"
- },
- {
- "fieldname": "rejected_warehouse",
- "fieldtype": "Link",
- "label": "Rejected Warehouse",
- "no_copy": 1,
- "oldfieldname": "rejected_warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "print_hide": 1,
- "print_width": "100px",
- "width": "100px"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "quality_inspection",
- "fieldtype": "Link",
- "label": "Quality Inspection",
- "no_copy": 1,
- "oldfieldname": "qa_no",
- "oldfieldtype": "Link",
- "options": "Quality Inspection",
- "print_hide": 1
- },
- {
- "fieldname": "column_break_40",
- "fieldtype": "Column Break"
- },
- {
- "default": "0",
- "fieldname": "is_fixed_asset",
- "fieldtype": "Check",
- "hidden": 1,
- "label": "Is Fixed Asset",
- "no_copy": 1,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "depends_on": "is_fixed_asset",
- "fieldname": "asset",
- "fieldtype": "Link",
- "label": "Asset",
- "no_copy": 1,
- "options": "Asset"
- },
- {
- "depends_on": "is_fixed_asset",
- "fieldname": "asset_location",
- "fieldtype": "Link",
- "label": "Asset Location",
- "options": "Location"
- },
- {
- "fieldname": "purchase_order",
- "fieldtype": "Link",
- "label": "Purchase Order",
- "no_copy": 1,
- "oldfieldname": "prevdoc_docname",
- "oldfieldtype": "Link",
- "options": "Purchase Order",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "search_index": 1,
- "width": "150px"
- },
- {
- "fieldname": "schedule_date",
- "fieldtype": "Date",
- "label": "Required By",
- "oldfieldname": "schedule_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "stock_qty",
- "fieldtype": "Float",
- "label": "Qty as per Stock UOM",
- "oldfieldname": "stock_qty",
- "oldfieldtype": "Currency",
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
- "width": "100px"
- },
- {
- "fieldname": "section_break_45",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "serial_no",
- "fieldtype": "Small Text",
- "in_list_view": 1,
- "label": "Serial No",
- "no_copy": 1,
- "oldfieldname": "serial_no",
- "oldfieldtype": "Text"
- },
- {
- "fieldname": "batch_no",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Batch No",
- "no_copy": 1,
- "oldfieldname": "batch_no",
- "oldfieldtype": "Link",
- "options": "Batch",
- "print_hide": 1
- },
- {
- "fieldname": "column_break_48",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "rejected_serial_no",
- "fieldtype": "Small Text",
- "label": "Rejected Serial No",
- "no_copy": 1,
- "print_hide": 1
- },
- {
- "fieldname": "item_tax_template",
- "fieldtype": "Link",
- "label": "Item Tax Template",
- "options": "Item Tax Template",
- "print_hide": 1
- },
- {
- "fieldname": "project",
- "fieldtype": "Link",
- "label": "Project",
- "options": "Project",
- "print_hide": 1
- },
- {
- "default": ":Company",
- "depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))",
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center",
- "print_hide": 1
- },
- {
- "fieldname": "purchase_order_item",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Purchase Order Item",
- "no_copy": 1,
- "oldfieldname": "prevdoc_detail_docname",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "search_index": 1,
- "width": "150px"
- },
- {
- "fieldname": "col_break5",
- "fieldtype": "Column Break"
- },
- {
- "default": "0",
- "fieldname": "allow_zero_valuation_rate",
- "fieldtype": "Check",
- "label": "Allow Zero Valuation Rate",
- "no_copy": 1,
- "print_hide": 1
- },
- {
- "fieldname": "bom",
- "fieldtype": "Link",
- "label": "BOM",
- "no_copy": 1,
- "options": "BOM",
- "print_hide": 1
- },
- {
- "default": "0",
- "depends_on": "eval:parent.is_subcontracted == 'Yes'",
- "fieldname": "include_exploded_items",
- "fieldtype": "Check",
- "label": "Include Exploded Items",
- "read_only": 1
- },
- {
- "fieldname": "billed_amt",
- "fieldtype": "Currency",
- "label": "Billed Amt",
- "no_copy": 1,
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "allow_on_submit": 1,
- "fieldname": "landed_cost_voucher_amount",
- "fieldtype": "Currency",
- "label": "Landed Cost Voucher Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "brand",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Brand",
- "oldfieldname": "brand",
- "oldfieldtype": "Link",
- "options": "Brand",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "item_group",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Item Group",
- "oldfieldname": "item_group",
- "oldfieldtype": "Link",
- "options": "Item Group",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "rm_supp_cost",
- "fieldtype": "Currency",
- "hidden": 1,
- "label": "Raw Materials Supplied Cost",
- "no_copy": 1,
- "oldfieldname": "rm_supp_cost",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "width": "150px"
- },
- {
- "fieldname": "item_tax_amount",
- "fieldtype": "Currency",
- "hidden": 1,
- "label": "Item Tax Amount Included in Value",
- "no_copy": 1,
- "oldfieldname": "item_tax_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "width": "150px"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "valuation_rate",
- "fieldtype": "Currency",
- "hidden": 1,
- "label": "Valuation Rate",
- "no_copy": 1,
- "oldfieldname": "valuation_rate",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "80px",
- "read_only": 1,
- "width": "80px"
- },
- {
- "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
- "fieldname": "item_tax_rate",
- "fieldtype": "Code",
- "hidden": 1,
- "label": "Item Tax Rate",
- "oldfieldname": "item_tax_rate",
- "oldfieldtype": "Small Text",
- "print_hide": 1,
- "read_only": 1,
- "report_hide": 1
- },
- {
- "allow_on_submit": 1,
- "default": "0",
- "fieldname": "page_break",
- "fieldtype": "Check",
- "label": "Page Break",
- "oldfieldname": "page_break",
- "oldfieldtype": "Check",
- "print_hide": 1
- },
- {
- "fieldname": "section_break_80",
- "fieldtype": "Section Break"
- },
- {
- "collapsible": 1,
- "fieldname": "image_section",
- "fieldtype": "Section Break",
- "label": "Image"
- },
- {
- "fieldname": "material_request",
- "fieldtype": "Link",
- "label": "Material Request",
- "options": "Material Request"
- },
- {
- "fieldname": "material_request_item",
- "fieldtype": "Data",
- "label": "Material Request Item"
- },
- {
- "fieldname": "expense_account",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Expense Account",
- "options": "Account",
- "read_only": 1
- },
- {
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
- },
- {
- "fieldname": "dimension_col_break",
- "fieldtype": "Column Break"
- },
- {
- "collapsible": 1,
- "fieldname": "manufacture_details",
- "fieldtype": "Section Break",
- "label": "Manufacture"
- },
- {
- "fieldname": "manufacturer",
- "fieldtype": "Link",
- "label": "Manufacturer",
- "options": "Manufacturer"
- },
- {
- "fieldname": "column_break_16",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "manufacturer_part_no",
- "fieldtype": "Data",
- "label": "Manufacturer Part Number",
- "read_only": 1
- }
- ],
- "idx": 1,
- "istable": 1,
- "modified": "2019-06-02 06:37:48.198745",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Purchase Receipt Item",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
- }
\ No newline at end of file
+ "autoname": "hash",
+ "creation": "2013-05-24 19:29:10",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "barcode",
+ "section_break_2",
+ "item_code",
+ "supplier_part_no",
+ "column_break_2",
+ "item_name",
+ "section_break_4",
+ "description",
+ "item_group",
+ "brand",
+ "image_section",
+ "image",
+ "image_view",
+ "manufacture_details",
+ "manufacturer",
+ "column_break_16",
+ "manufacturer_part_no",
+ "received_and_accepted",
+ "received_qty",
+ "qty",
+ "rejected_qty",
+ "col_break2",
+ "uom",
+ "stock_uom",
+ "conversion_factor",
+ "retain_sample",
+ "sample_quantity",
+ "rate_and_amount",
+ "price_list_rate",
+ "discount_percentage",
+ "discount_amount",
+ "col_break3",
+ "base_price_list_rate",
+ "sec_break1",
+ "rate",
+ "amount",
+ "col_break4",
+ "base_rate",
+ "base_amount",
+ "pricing_rules",
+ "is_free_item",
+ "section_break_29",
+ "net_rate",
+ "net_amount",
+ "item_tax_template",
+ "column_break_32",
+ "base_net_rate",
+ "base_net_amount",
+ "valuation_rate",
+ "item_tax_amount",
+ "rm_supp_cost",
+ "landed_cost_voucher_amount",
+ "billed_amt",
+ "item_weight_details",
+ "weight_per_unit",
+ "total_weight",
+ "column_break_41",
+ "weight_uom",
+ "warehouse_and_reference",
+ "warehouse",
+ "rejected_warehouse",
+ "quality_inspection",
+ "purchase_order",
+ "material_request",
+ "purchase_order_item",
+ "material_request_item",
+ "column_break_40",
+ "is_fixed_asset",
+ "asset",
+ "asset_location",
+ "schedule_date",
+ "stock_qty",
+ "section_break_45",
+ "serial_no",
+ "batch_no",
+ "column_break_48",
+ "rejected_serial_no",
+ "expense_account",
+ "col_break5",
+ "allow_zero_valuation_rate",
+ "bom",
+ "include_exploded_items",
+ "item_tax_rate",
+ "accounting_dimensions_section",
+ "project",
+ "dimension_col_break",
+ "cost_center",
+ "section_break_80",
+ "page_break"
+ ],
+ "fields": [
+ {
+ "fieldname": "barcode",
+ "fieldtype": "Data",
+ "label": "Barcode"
+ },
+ {
+ "fieldname": "section_break_2",
+ "fieldtype": "Section Break"
+ },
+ {
+ "bold": 1,
+ "columns": 3,
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "in_global_search": 1,
+ "in_list_view": 1,
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Link",
+ "options": "Item",
+ "print_width": "100px",
+ "reqd": 1,
+ "search_index": 1,
+ "width": "100px"
+ },
+ {
+ "fieldname": "supplier_part_no",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Supplier Part Number",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "in_global_search": 1,
+ "label": "Item Name",
+ "oldfieldname": "item_name",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "reqd": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "label": "Description"
+ },
+ {
+ "fieldname": "description",
+ "fieldtype": "Text Editor",
+ "label": "Description",
+ "oldfieldname": "description",
+ "oldfieldtype": "Text",
+ "print_width": "300px",
+ "reqd": 1,
+ "width": "300px"
+ },
+ {
+ "fieldname": "image",
+ "fieldtype": "Attach",
+ "hidden": 1,
+ "label": "Image"
+ },
+ {
+ "fieldname": "image_view",
+ "fieldtype": "Image",
+ "label": "Image View",
+ "options": "image",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "received_and_accepted",
+ "fieldtype": "Section Break",
+ "label": "Received and Accepted"
+ },
+ {
+ "bold": 1,
+ "fieldname": "received_qty",
+ "fieldtype": "Float",
+ "label": "Received Quantity",
+ "oldfieldname": "received_qty",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "columns": 2,
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Accepted Quantity",
+ "oldfieldname": "qty",
+ "oldfieldtype": "Currency",
+ "print_width": "100px",
+ "width": "100px"
+ },
+ {
+ "fieldname": "rejected_qty",
+ "fieldtype": "Float",
+ "label": "Rejected Quantity",
+ "oldfieldname": "rejected_qty",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "width": "100px"
+ },
+ {
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "label": "UOM",
+ "oldfieldname": "uom",
+ "oldfieldtype": "Link",
+ "options": "UOM",
+ "print_hide": 1,
+ "print_width": "100px",
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "label": "Stock UOM",
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Data",
+ "options": "UOM",
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "fieldname": "conversion_factor",
+ "fieldtype": "Float",
+ "label": "Conversion Factor",
+ "oldfieldname": "conversion_factor",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "default": "0",
+ "fetch_from": "item_code.retain_sample",
+ "fieldname": "retain_sample",
+ "fieldtype": "Check",
+ "label": "Retain Sample",
+ "read_only": 1
+ },
+ {
+ "depends_on": "retain_sample",
+ "fetch_from": "item_code.sample_quantity",
+ "fieldname": "sample_quantity",
+ "fieldtype": "Int",
+ "label": "Sample Quantity"
+ },
+ {
+ "fieldname": "rate_and_amount",
+ "fieldtype": "Section Break",
+ "label": "Rate and Amount"
+ },
+ {
+ "fieldname": "price_list_rate",
+ "fieldtype": "Currency",
+ "label": "Price List Rate",
+ "options": "currency",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "price_list_rate",
+ "fieldname": "discount_percentage",
+ "fieldtype": "Percent",
+ "label": "Discount on Price List Rate (%)",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "price_list_rate",
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "label": "Discount Amount",
+ "options": "currency"
+ },
+ {
+ "fieldname": "col_break3",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "base_price_list_rate",
+ "fieldtype": "Currency",
+ "label": "Price List Rate (Company Currency)",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "sec_break1",
+ "fieldtype": "Section Break"
+ },
+ {
+ "bold": 1,
+ "columns": 3,
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Rate",
+ "oldfieldname": "import_rate",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_width": "100px",
+ "width": "100px"
+ },
+ {
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Amount",
+ "oldfieldname": "import_amount",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "fieldname": "col_break4",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "base_rate",
+ "fieldtype": "Currency",
+ "label": "Rate (Company Currency)",
+ "oldfieldname": "purchase_rate",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "fieldname": "base_amount",
+ "fieldtype": "Currency",
+ "label": "Amount (Company Currency)",
+ "oldfieldname": "amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
+ "width": "100px"
+ },
+ {
+ "fieldname": "pricing_rules",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Pricing Rules",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "is_free_item",
+ "fieldtype": "Check",
+ "label": "Is Free Item",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "section_break_29",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "net_rate",
+ "fieldtype": "Currency",
+ "label": "Net Rate",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "columns": 2,
+ "fieldname": "net_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Net Amount",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_32",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "base_net_rate",
+ "fieldtype": "Currency",
+ "label": "Net Rate (Company Currency)",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_net_amount",
+ "fieldtype": "Currency",
+ "label": "Net Amount (Company Currency)",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "item_weight_details",
+ "fieldtype": "Section Break",
+ "label": "Item Weight Details"
+ },
+ {
+ "fieldname": "weight_per_unit",
+ "fieldtype": "Float",
+ "label": "Weight Per Unit"
+ },
+ {
+ "fieldname": "total_weight",
+ "fieldtype": "Float",
+ "label": "Total Weight",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_41",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "weight_uom",
+ "fieldtype": "Link",
+ "label": "Weight UOM",
+ "options": "UOM"
+ },
+ {
+ "fieldname": "warehouse_and_reference",
+ "fieldtype": "Section Break",
+ "label": "Warehouse and Reference"
+ },
+ {
+ "bold": 1,
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Accepted Warehouse",
+ "oldfieldname": "warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "print_hide": 1,
+ "print_width": "100px",
+ "width": "100px"
+ },
+ {
+ "fieldname": "rejected_warehouse",
+ "fieldtype": "Link",
+ "label": "Rejected Warehouse",
+ "no_copy": 1,
+ "oldfieldname": "rejected_warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "print_hide": 1,
+ "print_width": "100px",
+ "width": "100px"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "quality_inspection",
+ "fieldtype": "Link",
+ "label": "Quality Inspection",
+ "no_copy": 1,
+ "oldfieldname": "qa_no",
+ "oldfieldtype": "Link",
+ "options": "Quality Inspection",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break_40",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "fieldname": "is_fixed_asset",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "label": "Is Fixed Asset",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "depends_on": "is_fixed_asset",
+ "fieldname": "asset",
+ "fieldtype": "Link",
+ "label": "Asset",
+ "no_copy": 1,
+ "options": "Asset"
+ },
+ {
+ "depends_on": "is_fixed_asset",
+ "fieldname": "asset_location",
+ "fieldtype": "Link",
+ "label": "Asset Location",
+ "options": "Location"
+ },
+ {
+ "fieldname": "purchase_order",
+ "fieldtype": "Link",
+ "label": "Purchase Order",
+ "no_copy": 1,
+ "oldfieldname": "prevdoc_docname",
+ "oldfieldtype": "Link",
+ "options": "Purchase Order",
+ "print_width": "150px",
+ "read_only": 1,
+ "search_index": 1,
+ "width": "150px"
+ },
+ {
+ "fieldname": "schedule_date",
+ "fieldtype": "Date",
+ "label": "Required By",
+ "oldfieldname": "schedule_date",
+ "oldfieldtype": "Date",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "stock_qty",
+ "fieldtype": "Float",
+ "label": "Qty as per Stock UOM",
+ "oldfieldname": "stock_qty",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
+ "width": "100px"
+ },
+ {
+ "fieldname": "section_break_45",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "serial_no",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Serial No",
+ "no_copy": 1,
+ "oldfieldname": "serial_no",
+ "oldfieldtype": "Text"
+ },
+ {
+ "fieldname": "batch_no",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Batch No",
+ "no_copy": 1,
+ "oldfieldname": "batch_no",
+ "oldfieldtype": "Link",
+ "options": "Batch",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "column_break_48",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "rejected_serial_no",
+ "fieldtype": "Small Text",
+ "label": "Rejected Serial No",
+ "no_copy": 1,
+ "print_hide": 1
+ },
+ {
+ "fieldname": "item_tax_template",
+ "fieldtype": "Link",
+ "label": "Item Tax Template",
+ "options": "Item Tax Template",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "label": "Project",
+ "options": "Project",
+ "print_hide": 1
+ },
+ {
+ "default": ":Company",
+ "depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "label": "Cost Center",
+ "options": "Cost Center",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "purchase_order_item",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Purchase Order Item",
+ "no_copy": 1,
+ "oldfieldname": "prevdoc_detail_docname",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "search_index": 1,
+ "width": "150px"
+ },
+ {
+ "fieldname": "col_break5",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "fieldname": "allow_zero_valuation_rate",
+ "fieldtype": "Check",
+ "label": "Allow Zero Valuation Rate",
+ "no_copy": 1,
+ "print_hide": 1
+ },
+ {
+ "fieldname": "bom",
+ "fieldtype": "Link",
+ "label": "BOM",
+ "no_copy": 1,
+ "options": "BOM",
+ "print_hide": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "eval:parent.is_subcontracted == 'Yes'",
+ "fieldname": "include_exploded_items",
+ "fieldtype": "Check",
+ "label": "Include Exploded Items",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "billed_amt",
+ "fieldtype": "Currency",
+ "label": "Billed Amt",
+ "no_copy": 1,
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "landed_cost_voucher_amount",
+ "fieldtype": "Currency",
+ "label": "Landed Cost Voucher Amount",
+ "no_copy": 1,
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "brand",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "label": "Brand",
+ "oldfieldname": "brand",
+ "oldfieldtype": "Link",
+ "options": "Brand",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "label": "Item Group",
+ "oldfieldname": "item_group",
+ "oldfieldtype": "Link",
+ "options": "Item Group",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "rm_supp_cost",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "label": "Raw Materials Supplied Cost",
+ "no_copy": 1,
+ "oldfieldname": "rm_supp_cost",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "fieldname": "item_tax_amount",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "label": "Item Tax Amount Included in Value",
+ "no_copy": 1,
+ "oldfieldname": "item_tax_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "valuation_rate",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "label": "Valuation Rate",
+ "no_copy": 1,
+ "oldfieldname": "valuation_rate",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "80px",
+ "read_only": 1,
+ "width": "80px"
+ },
+ {
+ "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
+ "fieldname": "item_tax_rate",
+ "fieldtype": "Code",
+ "hidden": 1,
+ "label": "Item Tax Rate",
+ "oldfieldname": "item_tax_rate",
+ "oldfieldtype": "Small Text",
+ "print_hide": 1,
+ "read_only": 1,
+ "report_hide": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "default": "0",
+ "fieldname": "page_break",
+ "fieldtype": "Check",
+ "label": "Page Break",
+ "oldfieldname": "page_break",
+ "oldfieldtype": "Check",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "section_break_80",
+ "fieldtype": "Section Break"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "image_section",
+ "fieldtype": "Section Break",
+ "label": "Image"
+ },
+ {
+ "fieldname": "material_request",
+ "fieldtype": "Link",
+ "label": "Material Request",
+ "options": "Material Request"
+ },
+ {
+ "fieldname": "material_request_item",
+ "fieldtype": "Data",
+ "label": "Material Request Item"
+ },
+ {
+ "fieldname": "expense_account",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "label": "Expense Account",
+ "options": "Account",
+ "read_only": 1
+ },
+ {
+ "fieldname": "accounting_dimensions_section",
+ "fieldtype": "Section Break",
+ "label": "Accounting Dimensions"
+ },
+ {
+ "fieldname": "dimension_col_break",
+ "fieldtype": "Column Break"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "manufacture_details",
+ "fieldtype": "Section Break",
+ "label": "Manufacture"
+ },
+ {
+ "fieldname": "manufacturer",
+ "fieldtype": "Link",
+ "label": "Manufacturer",
+ "options": "Manufacturer"
+ },
+ {
+ "fieldname": "column_break_16",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "manufacturer_part_no",
+ "fieldtype": "Data",
+ "label": "Manufacturer Part Number",
+ "read_only": 1
+ }
+ ],
+ "idx": 1,
+ "istable": 1,
+ "modified": "2019-09-17 22:33:01.109004",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Purchase Receipt Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 409a864..19eb398 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -362,6 +362,7 @@
sr.batch_no = args.get('batch_no')
sr.location = args.get('location')
sr.company = args.get('company')
+ sr.supplier = args.get('supplier')
if sr.sales_order and args.get('voucher_type') == "Stock Entry" \
and not args.get('actual_qty', 0) > 0:
sr.sales_order = None
@@ -396,10 +397,12 @@
sr.via_stock_ledger = args.get('via_stock_ledger') or True
sr.asset = args.get('asset')
sr.location = args.get('location')
+
if args.get('purchase_document_type'):
sr.purchase_document_type = args.get('purchase_document_type')
sr.purchase_document_no = args.get('purchase_document_no')
+ sr.supplier = args.get('supplier')
sr.insert()
if args.get('warehouse'):
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index b810e35..69c624b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -540,6 +540,21 @@
total_allowed = required_qty + (required_qty * (qty_allowance/100))
if not required_qty:
+ bom_no = frappe.db.get_value("Purchase Order Item",
+ {"parent": self.purchase_order, "item_code": se_item.subcontracted_item},
+ "bom")
+
+ allow_alternative_item = frappe.get_value("BOM", bom_no, "allow_alternative_item")
+
+ if allow_alternative_item:
+ original_item_code = frappe.get_value("Item Alternative", {"alternative_item_code": item_code}, "item_code")
+
+ required_qty = sum([flt(d.required_qty) for d in purchase_order.supplied_items \
+ if d.rm_item_code == original_item_code])
+
+ total_allowed = required_qty + (required_qty * (qty_allowance/100))
+
+ if not required_qty:
frappe.throw(_("Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1}")
.format(se_item.item_code, self.purchase_order))
total_supplied = frappe.db.sql("""select sum(transfer_qty)
diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index d68f979..e5dc6b1 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -3,10 +3,10 @@
from __future__ import print_function, unicode_literals
import frappe
-
from frappe.utils import flt, cstr, nowdate, nowtime
from erpnext.stock.utils import update_bin
from erpnext.stock.stock_ledger import update_entries_after
+from erpnext.controllers.stock_controller import update_gl_entries_after
def repost(only_actual=False, allow_negative_stock=False, allow_zero_rate=False, only_bin=False):
"""
@@ -18,23 +18,29 @@
existing_allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock")
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
- for d in frappe.db.sql("""select distinct item_code, warehouse from
- (select item_code, warehouse from tabBin
- union
- select item_code, warehouse from `tabStock Ledger Entry`) a"""):
- try:
- repost_stock(d[0], d[1], allow_zero_rate, only_actual, only_bin)
- frappe.db.commit()
- except:
- frappe.db.rollback()
+ item_warehouses = frappe.db.sql("""
+ select distinct item_code, warehouse
+ from
+ (select item_code, warehouse from tabBin
+ union
+ select item_code, warehouse from `tabStock Ledger Entry`) a
+ """)
+ for d in item_warehouses:
+ try:
+ repost_stock(d[0], d[1], allow_zero_rate, only_actual, only_bin, allow_negative_stock)
+ frappe.db.commit()
+ except:
+ frappe.db.rollback()
if allow_negative_stock:
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
frappe.db.auto_commit_on_many_writes = 0
-def repost_stock(item_code, warehouse, allow_zero_rate=False, only_actual=False, only_bin=False):
+def repost_stock(item_code, warehouse, allow_zero_rate=False,
+ only_actual=False, only_bin=False, allow_negative_stock=False):
+
if not only_bin:
- repost_actual_qty(item_code, warehouse, allow_zero_rate)
+ repost_actual_qty(item_code, warehouse, allow_zero_rate, allow_negative_stock)
if item_code and warehouse and not only_actual:
qty_dict = {
@@ -50,11 +56,8 @@
update_bin_qty(item_code, warehouse, qty_dict)
-def repost_actual_qty(item_code, warehouse, allow_zero_rate=False):
- try:
- update_entries_after({ "item_code": item_code, "warehouse": warehouse }, allow_zero_rate)
- except:
- pass
+def repost_actual_qty(item_code, warehouse, allow_zero_rate=False, allow_negative_stock=False): update_entries_after({ "item_code": item_code, "warehouse": warehouse },
+ allow_zero_rate=allow_zero_rate, allow_negative_stock=allow_negative_stock)
def get_balance_qty_from_sle(item_code, warehouse):
balance_qty = frappe.db.sql("""select qty_after_transaction from `tabStock Ledger Entry`
@@ -227,39 +230,14 @@
except:
pass
-def repost_all_stock_vouchers():
- warehouses_with_account = frappe.db.sql_list("""select warehouse from tabAccount
- where ifnull(account_type, '') = 'Stock' and (warehouse is not null and warehouse != '')
- and is_group=0""")
+def repost_gle_for_stock_transactions(posting_date=None, posting_time=None, for_warehouses=None):
+ frappe.db.auto_commit_on_many_writes = 1
- vouchers = frappe.db.sql("""select distinct voucher_type, voucher_no
- from `tabStock Ledger Entry` sle
- where voucher_type != "Serial No" and sle.warehouse in (%s)
- order by posting_date, posting_time, creation""" %
- ', '.join(['%s']*len(warehouses_with_account)), tuple(warehouses_with_account))
+ if not posting_date:
+ posting_date = "1900-01-01"
+ if not posting_time:
+ posting_time = "00:00"
- rejected = []
- i = 0
- for voucher_type, voucher_no in vouchers:
- i+=1
- print(i, "/", len(vouchers), voucher_type, voucher_no)
- try:
- for dt in ["Stock Ledger Entry", "GL Entry"]:
- frappe.db.sql("""delete from `tab%s` where voucher_type=%s and voucher_no=%s"""%
- (dt, '%s', '%s'), (voucher_type, voucher_no))
+ update_gl_entries_after(posting_date, posting_time, for_warehouses=for_warehouses)
- doc = frappe.get_doc(voucher_type, voucher_no)
- if voucher_type=="Stock Entry" and doc.purpose in ["Manufacture", "Repack"]:
- doc.calculate_rate_and_amount(force=1)
- elif voucher_type=="Purchase Receipt" and doc.is_subcontracted == "Yes":
- doc.validate()
-
- doc.update_stock_ledger()
- doc.make_gl_entries(repost_future_gle=False)
- frappe.db.commit()
- except Exception:
- print(frappe.get_traceback())
- rejected.append([voucher_type, voucher_no])
- frappe.db.rollback()
-
- print(rejected)
+ frappe.db.auto_commit_on_many_writes = 0
diff --git a/erpnext/templates/includes/footer/footer_powered.html b/erpnext/templates/includes/footer/footer_powered.html
index d4deaae..cf7661e 100644
--- a/erpnext/templates/includes/footer/footer_powered.html
+++ b/erpnext/templates/includes/footer/footer_powered.html
@@ -1,3 +1,18 @@
{% set domains = frappe.get_doc("Domain Settings").active_domains %}
+{% set links = {
+ 'Manufacturing': '/manufacturing',
+ 'Services': '/services',
+ 'Retail': '/retail',
+ 'Distribution': '/distribution',
+ 'Non Profit': '/non-profit',
+ 'Education': '/education',
+ 'Healthcare': '/healthcare',
+ 'Agriculture': '/agriculture',
+ 'Hospitality': ''
+} %}
+{% set link = '' %}
+{% if domains %}
+ {% set link = links[domains[0].domain] %}
+{% endif %}
-<a href="https://erpnext.com?source=website_footer" target="_blank" class="text-muted">Powered by ERPNext - ERP Software {{ ('for ' + domains[0].domain + ' Companies') if domains else '' }}</a>
+<a href="https://erpnext.com{{ link }}?source=website_footer" target="_blank" class="text-muted">Powered by ERPNext - {{ '' if domains else 'Open Source' }} ERP Software {{ ('for ' + domains[0].domain + ' Companies') if domains else '' }}</a>
diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py
index 7024b0d..dfd3ed7 100644
--- a/erpnext/tests/utils.py
+++ b/erpnext/tests/utils.py
@@ -10,27 +10,32 @@
frappe.db.sql('delete from tabAddress')
frappe.db.sql('delete from `tabDynamic Link`')
- frappe.get_doc(dict(
- doctype='Address',
- address_title='_Test Address for Customer',
- address_type='Office',
- address_line1='Station Road',
- city='_Test City',
- state='Test State',
- country='India',
- links = [dict(
- link_doctype='Customer',
- link_name='_Test Customer'
- )]
- )).insert()
+ frappe.get_doc({
+ "doctype": "Address",
+ "address_title": "_Test Address for Customer",
+ "address_type": "Office",
+ "address_line1": "Station Road",
+ "city": "_Test City",
+ "state": "Test State",
+ "country": "India",
+ "links": [
+ {
+ "link_doctype": "Customer",
+ "link_name": "_Test Customer"
+ }
+ ]
+ }).insert()
- frappe.get_doc(dict(
- doctype='Contact',
- email_id='test_contact_customer@example.com',
- phone='+91 0000000000',
- first_name='_Test Contact for _Test Customer',
- links = [dict(
- link_doctype='Customer',
- link_name='_Test Customer'
- )]
- )).insert()
+ contact = frappe.get_doc({
+ "doctype": 'Contact',
+ "first_name": "_Test Contact for _Test Customer",
+ "links": [
+ {
+ "link_doctype": "Customer",
+ "link_name": "_Test Customer"
+ }
+ ]
+ })
+ contact.add_email("test_contact_customer@example.com", is_primary=True)
+ contact.add_phone("+91 0000000000", is_primary_phone=True)
+ contact.insert()