From 72d412567c33e90c24cd9da3a28c77e3625a313e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 29 Feb 2012 10:43:21 +0530 Subject: [PATCH 1/2] Update erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py --- .../analysis/search_criteria/trend_analyzer/trend_analyzer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py b/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py index 42a7c5cc7e..d92330a0e7 100644 --- a/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py +++ b/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py @@ -91,7 +91,7 @@ if item or based_on == 'Item': # Item Group if item_group or based_on == 'Item Group': add_tab += ' ,`tabItem` t3, `tabItem Group` t4 ' - add_cond += ' AND t3.name = t2.item_code AND t3.item_group = t4.name and (t4.name = "%s" or t4.name IN (SELECT t5.name FROM `tabItem Group` t5,`tabItem Group` t6 WHERE t5.lft BETWEEN t6.lft and t6.rgt and t5.docstatus !=2 and ifnull(t5.is_group,"No") = "No" and t6.name = "%s"))' % (based_on != 'Item Group' and item_group or '%(value)s', based_on != 'Item Group' and item_group or '%(value)s') + add_cond += ' AND t3.name = t2.item_code AND t3.item_group = t4.name and (t4.name = "%s" or t4.name IN (SELECT t5.name FROM `tabItem Group` t5,`tabItem Group` t6 WHERE t5.lft BETWEEN t6.lft and t6.rgt and t5.docstatus !=2 and t6.name = "%s"))' % (based_on != 'Item Group' and item_group or '%(value)s', based_on != 'Item Group' and item_group or '%(value)s') # Customer if customer or based_on == 'Customer': From 1304d9741699c6f1714ed873f08feb40c560d31d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 29 Feb 2012 14:05:43 +0530 Subject: [PATCH 2/2] fix in import data page --- .../setup/page/import_data/import_data.html | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/erpnext/setup/page/import_data/import_data.html b/erpnext/setup/page/import_data/import_data.html index 5f9556b5af..29f0cc3dd8 100644 --- a/erpnext/setup/page/import_data/import_data.html +++ b/erpnext/setup/page/import_data/import_data.html @@ -41,6 +41,7 @@
  • Select the saved CSV file, identify the date format if any
  • Click on "Import"
    • +

    Over-writing Guide

    1. To over-write data, click on "Do you want to over-write records?" and then download template
      2. @@ -48,6 +49,30 @@
    2. Over-writing of child table data will delete all previous data of child table and re-import. so before over-writing child tables, export all data from system, modify them and then re-import
    3. Over-write checkbox will be checked while importing
    +
    +

    Do you have Non-English data?

    + You may need to save the file with UTF-8 encoding for data to be imported correctly. +

    + Microsoft Excel Users:
    + There is no obvious way of saving a CSV file with UTF-8 encoding.
    + You will need to follow these steps: +
      +
    1. In Excel, save the file in CSV (Comma Delimited) format
      2. +
    2. Open this saved file in Notepad
      3. +
    3. Click on File -> Save As
      4. +
    4. File Name: <your filename>.csv
      + Save as type: Text Documents (*.txt)
      + Encoding: UTF-8 +
      5. +
    5. Click on Save
      6. +
    +
    + OpenOffice or LibreOffice Users:
    +
      +
    1. While saving as CSV, check "Edit Filter Settings".
      2. +
    2. You will be prompted for Encoding.
      3. +
    3. Make sure it is "UTF-8" and click on OK.
      4. +