From 2aa577f11064bf998d47bc4f906277b943069cf5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 2 Jun 2015 11:12:25 +0530 Subject: [PATCH 01/16] [hot] patch-fix --- erpnext/patches/v5_0/portal_fixes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/patches/v5_0/portal_fixes.py b/erpnext/patches/v5_0/portal_fixes.py index 83c6d6856d..26f4ac26e6 100644 --- a/erpnext/patches/v5_0/portal_fixes.py +++ b/erpnext/patches/v5_0/portal_fixes.py @@ -1,3 +1,4 @@ def execute(): + frappe.reload_doctype("Web Form Field") import erpnext.setup.install erpnext.setup.install.add_web_forms() From c8b406d05003b3ed18169761b3217355b1075041 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 2 Jun 2015 12:17:14 +0530 Subject: [PATCH 02/16] [fix] duplicate status for Submitted, Cancelled --- erpnext/controllers/status_updater.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 2f83cb9a71..c7d24396af 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -78,7 +78,7 @@ class StatusUpdater(Document): self.status = s[0] break - if self.status != _status: + if self.status != _status and self.status not in ("Submitted", "Cancelled"): self.add_comment("Label", _(self.status)) if update: From d3fe7ec8581775b65c9ec59606cdd17cc31d26c3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 2 Jun 2015 12:21:17 +0530 Subject: [PATCH 03/16] [cleanup] customer not buying since long time report --- .../customers_not_buying_since_long_time.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py index 2b2c550b47..de4c655be9 100644 --- a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +++ b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py @@ -43,8 +43,8 @@ def get_so_details(): def get_last_so_amt(customer): res = frappe.db.sql("""select base_net_total from `tabSales Order` - where customer ='%(customer)s' and docstatus = 1 order by transaction_date desc - limit 1""" % {'customer': frappe.db.escape(customer)}) + where customer = %s and docstatus = 1 order by transaction_date desc + limit 1""", customer) return res and res[0][0] or 0 From ed43f8015c3e29df746a28757ee8e23fa123e9e6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 2 Jun 2015 12:31:03 +0530 Subject: [PATCH 04/16] [lang] let locale be en in setup wizard (?) --- erpnext/setup/page/setup_wizard/setup_wizard.js | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js index 6d4d826002..d521adab25 100644 --- a/erpnext/setup/page/setup_wizard/setup_wizard.js +++ b/erpnext/setup/page/setup_wizard/setup_wizard.js @@ -215,6 +215,7 @@ $.extend(erpnext.wiz, { slide.get_field("language") .set_input(erpnext.wiz.welcome.data.default_language || "english"); + moment.locale("en"); } }); }, From 64aa6620be9dd130f48c0278e1202dd92538a6b9 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 2 Jun 2015 11:53:17 -0400 Subject: [PATCH 05/16] [hotfix] portal fixes patch --- erpnext/patches/v5_0/portal_fixes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/patches/v5_0/portal_fixes.py b/erpnext/patches/v5_0/portal_fixes.py index 26f4ac26e6..b01064fc86 100644 --- a/erpnext/patches/v5_0/portal_fixes.py +++ b/erpnext/patches/v5_0/portal_fixes.py @@ -1,4 +1,6 @@ +import frappe +import erpnext.setup.install + def execute(): frappe.reload_doctype("Web Form Field") - import erpnext.setup.install erpnext.setup.install.add_web_forms() From f7c1743b2841112c1614dd688ff3f2706bbacd2d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 2 Jun 2015 15:20:25 -0400 Subject: [PATCH 06/16] [hotfix] cart - get_address_docs --- erpnext/shopping_cart/cart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py index 1db656a7c8..18bdba60a5 100644 --- a/erpnext/shopping_cart/cart.py +++ b/erpnext/shopping_cart/cart.py @@ -282,7 +282,7 @@ def get_lead_or_customer(): return lead_doc -def get_address_docs(doctype, txt, filters, limit_start, limit_page_length=20, party=None): +def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None): if not party: party = get_lead_or_customer() From 42dcffdad4ab1e2c598beaa408f08f3f566e369a Mon Sep 17 00:00:00 2001 From: William Moreno Date: Tue, 2 Jun 2015 16:48:47 -0600 Subject: [PATCH 07/16] Update Chart of Account for Nicaragua Hi The Law 891 reform some taxes rates, please update the Chart of Account for Nicaragua so it can reflect the new tax rates. --- .../verified/ni_ni_chart_template.json | 49 ++++++++++++++++--- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json index eafc30982f..bea2c6dbf2 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json @@ -1,6 +1,6 @@ { "country_code": "ni", - "name": "Catalogo de Cuentas", + "name": "Catalogo de Cuentas Nicaragua", "is_active": "Yes", "tree": { "Activo": { @@ -72,7 +72,7 @@ "IVA Acreditable por Importaciones": { "account_type": "Tax" }, - "IVA Acreditable por Prestacion de Servicios": { + "IVA Acreditable por Prestacion de Servicios y Uso y Goce de Bienes": { "account_type": "Tax" }, "Acreditacion Proporcional": {} @@ -229,11 +229,19 @@ "Impuesto al Valor Agregado por Pagar": { "account_type": "Tax" }, - "Impuesto sobre la Renta": { + "Impuesto sobre la Renta por Actividades Economicas": { "account_type": "Tax" }, "Impuestos Municipales": { - "account_type": "Tax" + "Impuesto Municipal Sobre Ingresos": { + "account_type": "Tax" + }, + "Recoleccion Basura": { + "account_type": "Tax" + }, + "Matricula Municipal": { + "account_type": "Tax" + } } }, "Retenciones por Pagar": { @@ -241,7 +249,13 @@ "Retencion Rentas del Trabajo Tarifa Progresiva": { "account_type": "Tax" }, - "Retencion Definitiva por Rentas del Trabajo": { + "Retencion Definitiva 10% por Rentas del Trabajo - Indemnizacion Adicional": { + "account_type": "Tax" + }, + "Retencion Definitiva 12.5% por Rentas del Trabajo - Dietas": { + "account_type": "Tax" + }, + "Retencion Definitiva 15% por Rentas del Trabajo - No Residentes": { "account_type": "Tax" } }, @@ -258,11 +272,26 @@ "Retencion 5% compra Madera en Rollo": { "account_type": "Tax" }, + "Retencion Definitiva 1.5% Actividades Economicas No Residentes": { + "account_type": "Tax" + }, + "Retencion Definitiva 3% Actividades Economicas No Residentes": { + "account_type": "Tax" + }, + "Retencion Definitiva 10% Actividades Economicas No Residentes": { + "account_type": "Tax" + }, + "Retencion Definitiva 15% Actividades Economicas No Residentes": { + "account_type": "Tax" + }, "Otras Retenciones 10%": { "account_type": "Tax" } }, "Rentas y Ganancias de Capital": { + "Retencion Defintiva 15% por Rentas de Capital": { + "account_type": "Tax" + }, "Retencion Defintiva 10% por Rentas de Capital": { "account_type": "Tax" }, @@ -272,10 +301,16 @@ "Retencion Definitiva 10% por Ganancia de Capital": { "account_type": "Tax" }, - "Retencion Definitiva Actividades Economicas No Residentes": { + "Retencion Definitiva 0.25% Transacciones Bursatiles": { "account_type": "Tax" }, - "Retencion Definitiva Transacciones Bursatiles": { + "Retencion Definitiva 1% Transacciones Bursatiles": { + "account_type": "Tax" + }, + "Retencion Definitiva 1.5% Transacciones Bursatiles": { + "account_type": "Tax" + }, + "Retencion Definitiva 2% Transacciones Bursatiles": { "account_type": "Tax" }, "Retenciones Defintiva 5% Fondos de Inversion": { From 5359f2651a85e5a538fde3b7799079b44c21a7b5 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 1 Jun 2015 17:22:56 +0530 Subject: [PATCH 08/16] [fix] sales register report --- erpnext/accounts/report/sales_register/sales_register.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py index 79a54ae09d..ffb274c32d 100644 --- a/erpnext/accounts/report/sales_register/sales_register.py +++ b/erpnext/accounts/report/sales_register/sales_register.py @@ -30,7 +30,8 @@ def execute(filters=None): delivery_note = list(set(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", []))) row = [inv.name, inv.posting_date, inv.customer, inv.customer_name, - customer_map.get(inv.customer)["customer_group"], customer_map.get(inv.customer)["territory"], + customer_map.get(inv.customer, {}).get("customer_group"), + customer_map.get(inv.customer, {}).get("territory"), inv.debit_to, inv.project_name, inv.remarks, ", ".join(sales_order), ", ".join(delivery_note)] # map income values From 42f2674cbafb27542c0ab2f669dfaa8478d60f76 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 1 Jun 2015 18:23:57 +0530 Subject: [PATCH 09/16] dynamic link in quotation item --- .../selling/doctype/quotation_item/quotation_item.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index 29b7d7cfb3..17208b7810 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -298,12 +298,13 @@ }, { "fieldname": "prevdoc_doctype", - "fieldtype": "Data", + "fieldtype": "Link", "hidden": 1, "label": "Against Doctype", "no_copy": 1, "oldfieldname": "prevdoc_doctype", "oldfieldtype": "Data", + "options": "DocType", "permlevel": 0, "print_hide": 1, "print_width": "150px", @@ -313,11 +314,12 @@ }, { "fieldname": "prevdoc_docname", - "fieldtype": "Data", + "fieldtype": "Dynamic Link", "label": "Against Docname", "no_copy": 1, "oldfieldname": "prevdoc_docname", "oldfieldtype": "Data", + "options": "prevdoc_doctype", "permlevel": 0, "print_hide": 1, "print_width": "150px", @@ -390,7 +392,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-05-27 02:47:15.474119", + "modified": "2015-06-01 18:22:28.595765", "modified_by": "Administrator", "module": "Selling", "name": "Quotation Item", From c87595b2da17e06bf90b6aa7c1da8fd4f6a95c92 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 2 Jun 2015 14:32:18 +0530 Subject: [PATCH 10/16] show item description in item grid view if marked for 'In List View' --- .../doctype/purchase_invoice_item/purchase_invoice_item.json | 4 ++-- .../doctype/sales_invoice_item/sales_invoice_item.json | 4 ++-- .../doctype/purchase_order_item/purchase_order_item.json | 4 ++-- .../supplier_quotation_item/supplier_quotation_item.json | 4 ++-- erpnext/crm/doctype/opportunity_item/opportunity_item.json | 4 ++-- erpnext/manufacturing/doctype/bom/bom.py | 2 +- erpnext/selling/doctype/quotation_item/quotation_item.json | 4 ++-- .../stock/doctype/delivery_note_item/delivery_note_item.json | 4 ++-- .../doctype/material_request_item/material_request_item.json | 4 ++-- .../doctype/purchase_receipt_item/purchase_receipt_item.json | 4 ++-- erpnext/templates/form_grid/includes/visible_cols.html | 2 +- erpnext/templates/form_grid/item_grid.html | 2 +- erpnext/templates/form_grid/material_request_grid.html | 2 +- erpnext/templates/form_grid/stock_entry_grid.html | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) 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 29173e2c71..1280cc0c1e 100755 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -40,7 +40,7 @@ { "fieldname": "description", "fieldtype": "Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Text", @@ -452,7 +452,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-05-27 02:47:16.341373", + "modified": "2015-06-02 14:18:56.294949", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item", diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 612a89e8e5..4ace40a672 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -58,7 +58,7 @@ { "fieldname": "description", "fieldtype": "Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Text", @@ -505,7 +505,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-05-27 02:47:15.645114", + "modified": "2015-06-02 14:18:45.176726", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", 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 43a0e0b7c4..9f80ba3342 100755 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -75,7 +75,7 @@ { "fieldname": "description", "fieldtype": "Small Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Small Text", @@ -538,7 +538,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-05-27 02:47:16.553472", + "modified": "2015-06-02 14:19:21.459032", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Item", diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json index ccfade2b28..c591b9652e 100644 --- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json +++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json @@ -59,7 +59,7 @@ { "fieldname": "description", "fieldtype": "Small Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Small Text", @@ -413,7 +413,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-05-27 02:47:15.853886", + "modified": "2015-06-02 14:19:33.922968", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation Item", diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json index d33fdcaeb2..d809f5b9fd 100644 --- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json +++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json @@ -85,7 +85,7 @@ { "fieldname": "description", "fieldtype": "Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Text", @@ -134,7 +134,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-05-14 14:55:18.325286", + "modified": "2015-06-02 14:18:16.622288", "modified_by": "Administrator", "module": "CRM", "name": "Opportunity Item", diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index d4fa02c752..f550a8afe4 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -425,5 +425,5 @@ def validate_bom_no(item, bom_no): if not getattr(frappe.flags, "in_test", False): frappe.throw(_("BOM {0} must be submitted").format(bom_no)) if item and not (bom.item.lower() == item.lower() or \ - bom.item.lower() == frappe.db.get_value("Item", item, "variant_of").lower()): + bom.item.lower() == cstr(frappe.db.get_value("Item", item, "variant_of")).lower()): frappe.throw(_("BOM {0} does not belong to Item {1}").format(bom_no, item)) diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index 17208b7810..ec10b59273 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -55,7 +55,7 @@ { "fieldname": "description", "fieldtype": "Small Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Small Text", @@ -392,7 +392,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-06-01 18:22:28.595765", + "modified": "2015-06-02 14:18:00.266748", "modified_by": "Administrator", "module": "Selling", "name": "Quotation Item", diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json index 956f57698a..4bb326bd10 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -65,7 +65,7 @@ { "fieldname": "description", "fieldtype": "Small Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Small Text", @@ -523,7 +523,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-05-27 02:47:16.946934", + "modified": "2015-06-02 14:18:34.512236", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Item", diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json index 3b659e3ac2..c4bebebe64 100644 --- a/erpnext/stock/doctype/material_request_item/material_request_item.json +++ b/erpnext/stock/doctype/material_request_item/material_request_item.json @@ -48,7 +48,7 @@ { "fieldname": "description", "fieldtype": "Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Text", @@ -264,7 +264,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-02-19 01:07:00.695393", + "modified": "2015-06-02 14:19:45.611733", "modified_by": "Administrator", "module": "Stock", "name": "Material Request Item", 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 4cf4107d93..c48aa2c269 100755 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -49,7 +49,7 @@ { "fieldname": "description", "fieldtype": "Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Text", @@ -642,7 +642,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-05-27 02:47:16.086625", + "modified": "2015-06-02 14:19:13.528248", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt Item", diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html index e9be40ceb2..285c1254b6 100644 --- a/erpnext/templates/form_grid/includes/visible_cols.html +++ b/erpnext/templates/form_grid/includes/visible_cols.html @@ -1,6 +1,6 @@ {% $.each(visible_columns || [], function(i, df) { %} {% var val = doc.get_formatted(df.fieldname); - if((df.fieldname !== "description") && val) { %} + if(val) { %}
{%= __(df.label) %}: diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html index bc8e23ec9d..9905f99480 100644 --- a/erpnext/templates/form_grid/item_grid.html +++ b/erpnext/templates/form_grid/item_grid.html @@ -1,4 +1,4 @@ -{% var visible_columns = row.get_visible_columns(["item_code", "item_name", "description", "qty", "rate", "amount", "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse", "against_sales_order", "sales_order"]); %} +{% var visible_columns = row.get_visible_columns(["item_code", "item_name", "qty", "rate", "amount", "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse", "against_sales_order", "sales_order"]); %} {% if(!doc) { %}
diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html index be7fb29387..8016316cd8 100644 --- a/erpnext/templates/form_grid/material_request_grid.html +++ b/erpnext/templates/form_grid/material_request_grid.html @@ -1,5 +1,5 @@ {% var visible_columns = row.get_visible_columns(["item_code", "warehouse", - "item_name", "description", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %} + "item_name", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %} {% if(!doc) { %}
diff --git a/erpnext/templates/form_grid/stock_entry_grid.html b/erpnext/templates/form_grid/stock_entry_grid.html index efb4ab64c0..1782b82007 100644 --- a/erpnext/templates/form_grid/stock_entry_grid.html +++ b/erpnext/templates/form_grid/stock_entry_grid.html @@ -1,5 +1,5 @@ {% var visible_columns = row.get_visible_columns(["item_code", - "item_name", "description", "amount", "stock_uom", "uom", "qty", + "item_name", "amount", "stock_uom", "uom", "qty", "s_warehouse", "t_warehouse", "incoming_rate"]); %} From 030ade428b506c60f7b171065ba703b97cc34210 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 2 Jun 2015 17:29:21 +0530 Subject: [PATCH 11/16] dont reset company on deleting company transactions --- .../setup/doctype/company/delete_company_transactions.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py index f27ba86211..87c13754bf 100644 --- a/erpnext/setup/doctype/company/delete_company_transactions.py +++ b/erpnext/setup/doctype/company/delete_company_transactions.py @@ -27,12 +27,7 @@ def delete_for_doctype(doctype, company_name): company_fieldname = meta.get("fields", {"fieldtype": "Link", "options": "Company"})[0].fieldname - if meta.issingle: - single = frappe.get_doc(doctype, doctype) - single.set(company_fieldname, "") - single.flags.ignore_mandatory = True - single.save() - else: + if not meta.issingle: if not meta.istable: # delete children for df in meta.get_table_fields(): From c6d8121f4a9be6ba732aa584b9ba3e0c2c42029a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 2 Jun 2015 17:29:51 +0530 Subject: [PATCH 12/16] delete fields inline description --- erpnext/buying/doctype/purchase_order/purchase_order.json | 4 ++-- .../buying/doctype/supplier_quotation/supplier_quotation.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 6eb23709d8..bae6496be7 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -26,7 +26,7 @@ "reqd": 1 }, { - "description": "Supplier (vendor) name as entered in supplier master", + "description": "", "fieldname": "supplier", "fieldtype": "Link", "in_filter": 1, @@ -873,7 +873,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-05-27 02:48:02.452899", + "modified": "2015-06-02 17:15:44.711032", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index 20abaad0ba..374258bd92 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -26,7 +26,7 @@ "reqd": 1 }, { - "description": "Supplier (vendor) name as entered in supplier master", + "description": "", "fieldname": "supplier", "fieldtype": "Link", "in_filter": 1, @@ -660,7 +660,7 @@ "icon": "icon-shopping-cart", "idx": 1, "is_submittable": 1, - "modified": "2015-05-27 02:48:02.098540", + "modified": "2015-06-02 17:15:57.283516", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", From 352187bee64b365643f4d9d43db55f31cd6d5918 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 3 Jun 2015 12:06:19 +0530 Subject: [PATCH 13/16] purchase register fix --- .../report/purchase_register/purchase_register.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py index a104ced598..6f80029fc9 100644 --- a/erpnext/accounts/report/purchase_register/purchase_register.py +++ b/erpnext/accounts/report/purchase_register/purchase_register.py @@ -12,7 +12,6 @@ def execute(filters=None): invoice_list = get_invoices(filters) columns, expense_accounts, tax_accounts = get_columns(invoice_list) - if not invoice_list: msgprint(_("No record found")) return columns, invoice_list @@ -30,7 +29,8 @@ def execute(filters=None): purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", []))) project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", []))) - row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, supplier_details.get(inv.supplier), + row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, + supplier_details.get(inv.supplier), inv.credit_to, ", ".join(project_name), inv.bill_no, inv.bill_date, inv.remarks, ", ".join(purchase_order), ", ".join(purchase_receipt)] @@ -54,8 +54,7 @@ def execute(filters=None): # total tax, grand total, outstanding amount & rounded total row += [total_tax, inv.base_grand_total, flt(inv.base_grand_total, 2), inv.outstanding_amount] - data.append(row) - # raise Exception + data.append(row) return columns, data @@ -107,7 +106,7 @@ def get_conditions(filters): def get_invoices(filters): conditions = get_conditions(filters) - return frappe.db.sql("""select name, posting_date, credit_to, supplier, supplier_name + return frappe.db.sql("""select name, posting_date, credit_to, supplier, supplier_name, bill_no, bill_date, remarks, base_net_total, base_grand_total, outstanding_amount from `tabPurchase Invoice` where docstatus = 1 %s order by posting_date desc, name desc""" % conditions, filters, as_dict=1) From 995a78421ada807dd390bfdd9836f311e86e4bc3 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 3 Jun 2015 16:44:26 +0530 Subject: [PATCH 14/16] [fix] Stock analytics report fixed for fifo stack related to stock reco --- erpnext/public/js/stock_analytics.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js index 6b3e3f2a98..e07e3d4c5b 100644 --- a/erpnext/public/js/stock_analytics.js +++ b/erpnext/public/js/stock_analytics.js @@ -139,7 +139,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ if(sl.voucher_type=="Stock Reconciliation") { var diff = (sl.qty_after_transaction * sl.valuation_rate) - item.closing_qty_value; - wh.fifo_stack.push([sl.qty_after_transaction, sl.valuation_rate, sl.posting_date]); + wh.fifo_stack = [[sl.qty_after_transaction, sl.valuation_rate, sl.posting_date]]; wh.balance_qty = sl.qty_after_transaction; wh.balance_value = sl.valuation_rate * sl.qty_after_transaction; } else { @@ -167,7 +167,6 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ }, update_groups: function() { var me = this; - $.each(this.data, function(i, item) { // update groups if(!item.is_group && me.apply_filter(item, "brand")) { From 2c214e03623f174b56caed129b76da172d655c73 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 3 Jun 2015 17:41:55 +0530 Subject: [PATCH 15/16] [fix][patch] force reload web-form-field in portal fixes patch --- erpnext/patches/v5_0/portal_fixes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v5_0/portal_fixes.py b/erpnext/patches/v5_0/portal_fixes.py index b01064fc86..d80869221a 100644 --- a/erpnext/patches/v5_0/portal_fixes.py +++ b/erpnext/patches/v5_0/portal_fixes.py @@ -2,5 +2,5 @@ import frappe import erpnext.setup.install def execute(): - frappe.reload_doctype("Web Form Field") + frappe.reload_doc("website", "doctype", "web_form_field", force=True) erpnext.setup.install.add_web_forms() From cf89fa2253dbf59f1485cb52358d0212fb5357d8 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Wed, 3 Jun 2015 18:13:38 +0600 Subject: [PATCH 16/16] bumped to version 5.0.17 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 4be421125f..1f6e8304ff 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '5.0.16' +__version__ = '5.0.17' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 9b13128581..73afe899f5 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "5.0.16" +app_version = "5.0.17" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index 3f0e70896e..96539e8ed0 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.0.16" +version = "5.0.17" with open("requirements.txt", "r") as f: install_requires = f.readlines()