Merge pull request #21213 from gavindsouza/freeze-v10

chore(v10): pin python dependencies

.travis.yml

@@ -1,5 +1,12 @@
 language: python
-dist: trusty
+
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - "python3"
+      - "python3-pip"
 
 python:
   - "2.7"
@@ -9,14 +16,13 @@ services:
 
 install:
   - pip install flake8==3.3.0
-  - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+  - sudo -H python3 -m pip install --upgrade setuptools pip
-  - sudo rm /etc/apt/sources.list.d/docker.list
   - sudo apt-get install hhvm && rm -rf /home/travis/.kiex/
   - sudo apt-get purge -y mysql-common mysql-server mysql-client
   - nvm install v7.10.0
   - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
-  - sudo python install.py --develop --user travis --without-bench-setup
+  - sudo python3 install.py --develop --user travis --without-bench-setup
-  - sudo pip install -e ~/bench
+  - sudo python3 -m pip install -e ~/bench
 
   - rm $TRAVIS_BUILD_DIR/.git/shallow
   - bash $TRAVIS_BUILD_DIR/travis/bench_init.sh

MANIFEST.in

@@ -1,20 +0,0 @@
-include MANIFEST.in
-include requirements.txt
-include *.json
-include *.md
-include *.py
-include *.txt
-include .travis.yml
-recursive-include erpnext *.txt
-recursive-include erpnext *.css
-recursive-include erpnext *.csv
-recursive-include erpnext *.html
-recursive-include erpnext *.ico
-recursive-include erpnext *.js
-recursive-include erpnext *.json
-recursive-include erpnext *.md
-recursive-include erpnext *.png
-recursive-include erpnext *.py
-recursive-include erpnext *.svg
-recursive-include erpnext/public *
-recursive-exclude * *.pyc

erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json

@@ -1,465 +1,466 @@
 {
-    "country_code": "ae", 
+    "country_code": "ae",
-    "name": "U.A.E - Chart of Accounts", 
+    "name": "U.A.E - Chart of Accounts",
     "tree": {
         "Assets": {
             "Current Assets": {
                 "Accounts Receivable": {
                     "Corporate Credit Cards": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Other Receivable": {
                         "Accrued Rebates Due from Suppliers": {
                             "account_type": "Receivable"
-                        }, 
+                        },
-                        "Accured Income from Suppliers": {
+                        "Accrued Income from Suppliers": {
                             "account_type": "Receivable"
-                        }, 
+                        },
                         "Other Debtors": {
                             "account_type": "Receivable"
-                        }, 
+                        },
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Post Dated Cheques Received": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Staff Receivable": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Trade Receivable": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Trade in Opening Fees": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "account_type": "Receivable"
-                }, 
+                },
                 "Cash in Hand & Banks": {
                     "Banks": {
-                        "Bank Margin On LC & LG": {}, 
+                        "Bank Margin On LC & LG": {},
-                        "Banks Blocked Deposits": {}, 
+                        "Banks Blocked Deposits": {},
-                        "Banks Call Deposit Accounts": {}, 
+                        "Banks Call Deposit Accounts": {},
                         "Banks Current Accounts": {
                             "account_type": "Bank"
-                        }, 
+                        },
                         "account_type": "Bank"
-                    }, 
+                    },
                     "Cash in Hand": {
                         "Cash in Safe": {
                             "Main Safe": {
                                 "account_type": "Cash"
-                            }, 
+                            },
                             "Main Safe - Foreign Currency": {
                                 "account_type": "Cash"
                             }
-                        }, 
+                        },
                         "Petty Cash": {
                             "Petty Cash - Admininistration": {
                                 "account_type": "Cash"
-                            }, 
+                            },
                             "Petty Cash - Others": {
                                 "account_type": "Cash"
                             }
-                        }, 
+                        },
                         "account_type": "Cash"
-                    }, 
+                    },
                     "Cash in Transit": {
                         "Credit Cards": {
                             "Gateway Credit Cards": {
                                 "account_type": "Bank"
-                            }, 
+                            },
                             "Manual Visa & Master Cards": {
                                 "account_type": "Bank"
-                            }, 
+                            },
                             "PayPal Account": {
                                 "account_type": "Bank"
-                            }, 
+                            },
                             "Visa & Master Credit Cards": {
                                 "account_type": "Bank"
                             }
                         }
                     }
-                }, 
+                },
                 "Inventory": {
                     "Consigned Stock": {
-                        "Handling Difference in Inventory": {
+                        "Handling Difference in Inventory": {},
-                            "account_type": "Stock Adjustment"
+                        "Items Delivered to Customs on temporary Base": {}
-                        }, 
+                    },
-                        "Items Delivered to Customs on temprary Base": {}
-                    }, 
                     "Stock in Hand": {
                         "account_type": "Stock"
                     }
-                }, 
+                },
-                "Perliminary and Preoperating Expenses": {
+                "Preliminary and Preoperating Expenses": {
                     "Preoperating Expenses": {}
-                }, 
+                },
                 "Prepayments & Deposits": {
                     "Deposits": {
-                        "Deposit - Office Rent": {}, 
+                        "Deposit - Office Rent": {},
-                        "Deposit Others": {}, 
+                        "Deposit Others": {},
-                        "Deposit to Immigration (Visa)": {}, 
+                        "Deposit to Immigration (Visa)": {},
                         "Deposits - Customs": {}
-                    }, 
+                    },
                     "Prepaid Taxes": {
-                        "Sales Taxes Receivables": {}, 
+                        "Sales Taxes Receivables": {},
                         "Withholding Tax Receivables": {}
-                    }, 
+                    },
                     "Prepayments": {
-                        "Other Prepayments": {}, 
+                        "Other Prepayments": {},
-                        "PrePaid Advertisement Expenses": {}, 
+                        "PrePaid Advertisement Expenses": {},
-                        "Prepaid Bank Guarantee": {}, 
+                        "Prepaid Bank Guarantee": {},
-                        "Prepaid Consultancy Fees": {}, 
+                        "Prepaid Consultancy Fees": {},
-                        "Prepaid Employees Housing": {}, 
+                        "Prepaid Employees Housing": {},
-                        "Prepaid Finance charge for Loans": {}, 
+                        "Prepaid Finance charge for Loans": {},
-                        "Prepaid Legal Fees": {}, 
+                        "Prepaid Legal Fees": {},
-                        "Prepaid License Fees": {}, 
+                        "Prepaid License Fees": {},
-                        "Prepaid Life Insurance": {}, 
+                        "Prepaid Life Insurance": {},
-                        "Prepaid Maintenance": {}, 
+                        "Prepaid Maintenance": {},
-                        "Prepaid Medical Insurance": {}, 
+                        "Prepaid Medical Insurance": {},
-                        "Prepaid Office Rent": {}, 
+                        "Prepaid Office Rent": {},
-                        "Prepaid Other Insurance": {}, 
+                        "Prepaid Other Insurance": {},
-                        "Prepaid Schooling Fees": {}, 
+                        "Prepaid Schooling Fees": {},
-                        "Prepaid Site Hosting Fees": {}, 
+                        "Prepaid Site Hosting Fees": {},
                         "Prepaid Sponsorship Fees": {}
                     }
                 }
-            }, 
+            },
             "Long Term Assets": {
                 "Fixed Assets": {
                     "Accumulated Depreciation": {
                         "Acc. Depreciation of Motor Vehicles": {
                             "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                         "Acc. Deprn.Computer Hardware & Software": {
                             "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                         "Acc.Deprn.of Furniture & Office Equipment": {
                             "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                         "Amortisation on Leasehold Improvement": {
                             "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                         "account_type": "Accumulated Depreciation"
-                    }, 
+                    },
                     "Fixed Assets (Cost Price)": {
                         "Computer Hardware & Software": {
                             "account_type": "Fixed Asset"
-                        }, 
+                        },
                         "Furniture and Equipment": {
                             "account_type": "Fixed Asset"
-                        }, 
+                        },
-                        "Leasehold Improvement": {}, 
+                        "Leasehold Improvement": {},
-                        "Motor Vehicules": {
+                        "Motor Vehicles": {
                             "account_type": "Fixed Asset"
-                        }, 
+                        },
-                        "Work In Progrees": {}, 
+                        "Work In Progress": {},
                         "account_type": "Fixed Asset"
                     }
-                }, 
+                },
                 "Intangible Assets": {
-                    "Computer Card Renewal": {}, 
+                    "Computer Card Renewal": {},
-                    "Dispoal of Outlets": {}, 
+                    "Disposal of Outlets": {},
                     "Registration of Trademarks": {}
-                }, 
+                },
-                "Intercompany Accounts": {}, 
+                "Intercompany Accounts": {},
                 "Investments": {
                     "Investments in Subsidiaries": {}
                 }
-            }, 
+            },
             "root_type": "Asset"
-        }, 
+        },
         "Closing And Temporary Accounts": {
             "Closing Accounts": {
                 "Closing Account": {}
-            }, 
+            },
             "root_type": "Liability"
-        }, 
+        },
         "Expenses": {
             "Commercial Expenses": {
-                "Consultancy Fees": {}, 
+                "Consultancy Fees": {},
                 "Provision for Doubtful Debts": {}
-            }, 
+            },
             "Cost of Sale": {
                 "Cost Of Goods Sold": {
-                    "Cost Of Goods Sold I/C Sales": {}, 
+                    "Cost Of Goods Sold I/C Sales": {},
                     "Cost of Goods Sold in Trading": {
                         "account_type": "Cost of Goods Sold"
-                    }, 
+                    },
                     "account_type": "Cost of Goods Sold"
-                }, 
+                },
                 "Expenses Included In Valuation": {
                     "account_type": "Expenses Included In Valuation"
+                },
+                "Stock Adjustment": {
+                    "account_type": "Stock Adjustment"
                 }
-            }, 
+            },
             "Depreciation": {
                 "Depreciation & Amortization": {
-                    "Amortization on Leasehold Improvement": {}, 
+                    "Amortization on Leasehold Improvement": {},
                     "Depreciation Of Computer Hard & Soft": {
                         "account_type": "Depreciation"
-                    }, 
+                    },
                     "Depreciation Of Furniture & Office Equipment\n\t\t\t": {
                         "account_type": "Depreciation"
-                    }, 
+                    },
                     "Depreciation Of Motor Vehicles": {
                         "account_type": "Depreciation"
                     }
                 }
-            }, 
+            },
             "Direct Expenses": {
                 "Financial Charges": {
-                    "Air Miles Card Charges": {}, 
+                    "Air Miles Card Charges": {},
-                    "Amex Credit Cards Charges": {}, 
+                    "Amex Credit Cards Charges": {},
-                    "Bank Finance & Loan Charges": {}, 
+                    "Bank Finance & Loan Charges": {},
-                    "Credit Card Charges": {}, 
+                    "Credit Card Charges": {},
-                    "Credit Card Swipe Charges": {}, 
+                    "Credit Card Swipe Charges": {},
                     "PayPal Charges": {}
                 }
-            }, 
+            },
             "MISC Charges": {
                 "Other Charges": {
-                    "Captial Loss": {
+                    "Capital Loss": {
-                        "Disposal of Business Branch": {}, 
+                        "Disposal of Business Branch": {},
-                        "Loss On Fixed Assets Disposal": {}, 
+                        "Loss On Fixed Assets Disposal": {},
                         "Loss on Difference on Exchange": {}
-                    }, 
+                    },
                     "Other Non Operating Exp": {
                         "Other Non Operating Expenses": {}
-                    }, 
+                    },
                     "Previous Year Adjustments": {
                         "Previous Year Adjustments Account": {}
-                    }, 
+                    },
                     "Royalty Fees": {
                         "Royalty to Parent Co.": {}
-                    }, 
+                    },
                     "Tax / Zakat Expenses": {
                         "Income Tax": {
                             "account_type": "Tax"
-                        }, 
+                        },
-                        "Zakat": {}, 
+                        "Zakat": {},
                         "account_type": "Tax"
                     }
                 }
-            }, 
+            },
             "Share Resources": {
                 "Share Resource Expenses Account": {}
-            }, 
+            },
             "Store Operating Expenses": {
                 "Selling, General & Admin Expenses": {
                     "Advertising Expenses": {
                         "Other - Advertising Expenses": {}
-                    }, 
+                    },
                     "Bank & Finance Charges": {
                         "Other Bank Charges": {}
-                    }, 
+                    },
                     "Communications": {
-                        "Courrier": {}, 
+                        "Courier": {},
-                        "Others - Communication": {}, 
+                        "Others - Communication": {},
-                        "Telephone": {}, 
+                        "Telephone": {},
                         "Web Site Hosting Fees": {}
-                    }, 
+                    },
                     "Office & Various Expenses": {
-                        "Cleaning": {}, 
+                        "Cleaning": {},
-                        "Convoyance Expenses": {}, 
+                        "Conveyance Expenses": {},
-                        "Gifts & Donations": {}, 
+                        "Gifts & Donations": {},
-                        "Insurance": {}, 
+                        "Insurance": {},
-                        "Kitchen and Buffet Expenses": {}, 
+                        "Kitchen and Buffet Expenses": {},
-                        "Maintenance": {}, 
+                        "Maintenance": {},
-                        "Others - Office Various Expenses": {}, 
+                        "Others - Office Various Expenses": {},
-                        "Security & Guard": {}, 
+                        "Security & Guard": {},
-                        "Stationary From Suppliers": {}, 
+                        "Stationary From Suppliers": {},
-                        "Stationary Out Of Stock": {}, 
+                        "Stationary Out Of Stock": {},
-                        "Subscriptions": {}, 
+                        "Subscriptions": {},
-                        "Training": {}, 
+                        "Training": {},
                         "Vehicle Expenses": {}
-                    }, 
+                    },
                     "Personnel Cost": {
-                        "Basic Salary": {}, 
+                        "Basic Salary": {},
-                        "End Of Service Indemnity": {}, 
+                        "End Of Service Indemnity": {},
-                        "Housing Allowance": {}, 
+                        "Housing Allowance": {},
-                        "Leave Salary": {}, 
+                        "Leave Salary": {},
-                        "Leave Ticket": {}, 
+                        "Leave Ticket": {},
-                        "Life Insurance": {}, 
+                        "Life Insurance": {},
-                        "Medical Insurance": {}, 
+                        "Medical Insurance": {},
-                        "Personnel Cost Others": {}, 
+                        "Personnel Cost Others": {},
-                        "Sales Commission": {}, 
+                        "Sales Commission": {},
-                        "Staff School Allowances": {}, 
+                        "Staff School Allowances": {},
-                        "Transportation Allowance": {}, 
+                        "Transportation Allowance": {},
-                        "Uniform": {}, 
+                        "Uniform": {},
                         "Visa Expenses": {}
-                    }, 
+                    },
                     "Professional & Legal Fees": {
-                        "Audit Fees": {}, 
+                        "Audit Fees": {},
-                        "Legal fees": {}, 
+                        "Legal fees": {},
-                        "Others - Professional Fees": {}, 
+                        "Others - Professional Fees": {},
-                        "Sponsorship Fees": {}, 
+                        "Sponsorship Fees": {},
                         "Trade License Fees": {}
-                    }, 
+                    },
                     "Provision & Write Off": {
-                        "Amortisation of Preoperating Expenses": {}, 
+                        "Amortisation of Preoperating Expenses": {},
-                        "Cash Shortage": {}, 
+                        "Cash Shortage": {},
-                        "Others - Provision & Write off": {}, 
+                        "Others - Provision & Write off": {},
-                        "Write Off Inventory": {}, 
+                        "Write Off Inventory": {},
                         "Write Off Receivables & Payables": {}
-                    }, 
+                    },
                     "Rent Expenses": {
-                        "Office Rent": {}, 
+                        "Office Rent": {},
                         "Warehouse Rent": {}
-                    }, 
+                    },
                     "Travel Expenses": {
-                        "Air tickets": {}, 
+                        "Air tickets": {},
-                        "Hotel": {}, 
+                        "Hotel": {},
-                        "Meals": {}, 
+                        "Meals": {},
-                        "Others": {}, 
+                        "Others": {},
                         "Per Diem": {}
-                    }, 
+                    },
                     "Utilities": {
-                        "Other Utility Cahrges": {}, 
+                        "Other Utility Cahrges": {},
                         "Water & Electricity": {}
                     }
                 }
-            }, 
+            },
             "root_type": "Expense"
-        }, 
+        },
         "Liabilities": {
             "Current Liabilities": {
                 "Accounts Payable": {
                     "Payables": {
                         "Advance Paybale to Suppliers": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "Consigned Payable": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "Other Payable": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "Post Dated Cheques Paid": {
                             "account_type": "Payable"
-                        }, 
+                        },
-                        "Staff Payable": {}, 
+                        "Staff Payable": {},
                         "Suppliers Price Protection": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "Trade Payable": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "account_type": "Payable"
                     }
-                }, 
+                },
                 "Accruals & Provisions": {
                     "Accruals": {
                         "Accrued Personnel Cost": {
-                            "Accrued - Commissions": {}, 
+                            "Accrued - Commissions": {},
-                            "Accrued - Leave Salary": {}, 
+                            "Accrued - Leave Salary": {},
-                            "Accrued - Leave Tickets": {}, 
+                            "Accrued - Leave Tickets": {},
-                            "Accrued - Salaries": {}, 
+                            "Accrued - Salaries": {},
-                            "Accrued Other Personnel Cost": {}, 
+                            "Accrued Other Personnel Cost": {},
-                            "Accrued Salaries Increment": {}, 
+                            "Accrued Salaries Increment": {},
                             "Accrued-Staff Bonus": {}
                         }
-                    }, 
+                    },
                     "Accrued Expenses": {
                         "Accrued Other Expenses": {
-                            "Accrued - Audit Fees": {}, 
+                            "Accrued - Audit Fees": {},
-                            "Accrued - Office Rent": {}, 
+                            "Accrued - Office Rent": {},
-                            "Accrued - Sponsorship": {}, 
+                            "Accrued - Sponsorship": {},
-                            "Accrued - Telephone": {}, 
+                            "Accrued - Telephone": {},
-                            "Accrued - Utilities": {}, 
+                            "Accrued - Utilities": {},
                             "Accrued Others": {}
                         }
-                    }, 
+                    },
                     "Other Current Liabilities": {
-                        "Accrued Dubai Customs": {}, 
+                        "Accrued Dubai Customs": {},
-                        "Deferred income": {}, 
+                        "Deferred income": {},
                         "Shipping & Handling": {}
-                    }, 
+                    },
                     "Provisions": {
                         "Tax Payables": {
-                            "Income Tax Payable": {}, 
+                            "Income Tax Payable": {},
-                            "Sales Tax Payable": {}, 
+                            "Sales Tax Payable": {},
                             "Withholding Tax Payable": {}
                         }
-                    }, 
+                    },
                     "Short Term Loan": {}
-                }, 
+                },
                 "Duties and Taxes": {
-                    "account_type": "Tax", 
+                    "account_type": "Tax",
                     "is_group": 1
-                }, 
+                },
                 "Reservations & Credit Notes": {
                     "Credit Notes": {
-                        "Credit Notes to Customers": {}, 
+                        "Credit Notes to Customers": {},
                         "Reservations": {}
                     }
-                }, 
+                },
                 "Stock Liabilities": {
                     "Stock Received But Not Billed": {
                         "account_type": "Stock Received But Not Billed"
                     }
-                }, 
+                },
                 "Unearned Income": {}
-            }, 
+            },
             "Long Term Liabilities": {
                 "Long Term Loans & Provisions": {}
-            }, 
+            },
             "root_type": "Liability"
-        }, 
+        },
         "Revenue": {
             "Direct Revenue": {
                 "Other Direct Revenue": {
                     "Other Revenue - Operating": {
-                        "Advertising Income": {}, 
+                        "Advertising Income": {},
-                        "Branding Income": {}, 
+                        "Branding Income": {},
-                        "Early Setmt Margin from Suppliers": {}, 
+                        "Early Setmt Margin from Suppliers": {},
-                        "Marketing Rebate from Suppliers": {}, 
+                        "Marketing Rebate from Suppliers": {},
-                        "Rebate from Suppliers": {}, 
+                        "Rebate from Suppliers": {},
-                        "Service Income": {}, 
+                        "Service Income": {},
                         "Space Rental Income": {}
                     }
                 }
-            }, 
+            },
             "Indirect Revenue": {
                 "Other Indirect Revenue": {
-                    "Capital Gain": {}, 
+                    "Capital Gain": {},
-                    "Excess In Till": {}, 
+                    "Excess In Till": {},
-                    "Gain On Difference Of Exchange": {}, 
+                    "Gain On Difference Of Exchange": {},
-                    "Management Consultancy Fees": {}, 
+                    "Management Consultancy Fees": {},
                     "Other Income": {}
-                }, 
+                },
                 "Other Revenue - Non Operating": {
-                    "Interest Revenue": {}, 
+                    "Interest Revenue": {},
-                    "Interest from FD": {}, 
+                    "Interest from FD": {},
-                    "Products Listing Fees from Suppliers": {}, 
+                    "Products Listing Fees from Suppliers": {},
                     "Trade Opening Fees from suppliers": {}
                 }
-            }, 
+            },
             "Sales": {
                 "Sales from Other Regions": {
                     "Sales from Other Region": {}
-                }, 
+                },
                 "Sales of same region": {
-                    "Management Consultancy Fees 1": {}, 
+                    "Management Consultancy Fees 1": {},
-                    "Sales Account": {}, 
+                    "Sales Account": {},
                     "Sales of I/C": {}
                 }
-            }, 
+            },
             "root_type": "Income"
-        }, 
+        },
         "Share Holder Equity": {
             "Capital": {
-                "Contributed Capital": {}, 
+                "Contributed Capital": {},
-                "Share Capital": {}, 
+                "Share Capital": {},
-                "Shareholders Current A/c": {}, 
+                "Shareholders Current A/c": {},
-                "Sub Ordinated Loan": {}, 
+                "Sub Ordinated Loan": {},
                 "Treasury Stocks": {}
-            }, 
+            },
             "Retained Earnings": {
-                "Current Year Results": {}, 
+                "Current Year Results": {},
-                "Dividends Paid": {}, 
+                "Dividends Paid": {},
                 "Previous Years Results": {}
-            }, 
+            },
-            "account_type": "Equity", 
+            "account_type": "Equity",
             "root_type": "Equity"
         }
     }

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -216,7 +216,7 @@ def get_accountwise_gle(filters, gl_entries, gle_map):
 		if gle.posting_date < from_date or cstr(gle.is_opening) == "Yes":
 			update_value_in_dict(gle_map[gle.account].totals, 'opening', gle)
 			update_value_in_dict(totals, 'opening', gle)
-			
+
 			update_value_in_dict(gle_map[gle.account].totals, 'closing', gle)
 			update_value_in_dict(totals, 'closing', gle)
 
@@ -323,7 +323,7 @@ def get_columns(filters):
 			{
 				"label": _("Balance") + " (" + filters.account_currency + ")",
 				"fieldname": "balance_in_account_currency",
-				"fieldtype": "Data",
+				"fieldtype": "Float",
 				"width": 100
 			}
 		])

erpnext/hooks.py

@@ -13,8 +13,6 @@ source_link = "https://github.com/frappe/erpnext"
 
 develop_version = '10.x.x-develop'
 
-error_report_email = "support@erpnext.com"
-
 app_include_js = "assets/js/erpnext.min.js"
 app_include_css = "assets/css/erpnext.css"
 web_include_js = "assets/js/erpnext-web.min.js"

erpnext/hr/doctype/leave_application/leave_application.py

@@ -381,6 +381,19 @@ def get_leave_balance_on(employee, leave_type, date, allocation_records=None,
 
 	return flt(allocation.total_leaves_allocated) - flt(leaves_taken)
 
+def get_total_allocated_leaves(employee, leave_type, date):
+	filters= {
+		'from_date': ['<=', date],
+		'to_date': ['>=', date],
+		'docstatus': 1,
+		'leave_type': leave_type,
+		'employee': employee
+	}
+
+	leave_allocation_records = frappe.db.get_all('Leave Allocation', filters=filters, fields=['total_leaves_allocated'])
+
+	return flt(leave_allocation_records[0]['total_leaves_allocated']) if leave_allocation_records else flt(0)
+
 def get_approved_leaves_for_period(employee, leave_type, from_date, to_date):
 	leave_applications = frappe.db.sql("""
 		select employee, leave_type, from_date, to_date, total_leave_days

erpnext/hr/report/employee_leave_balance/employee_leave_balance.py

@@ -5,21 +5,21 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from erpnext.hr.doctype.leave_application.leave_application \
-	import get_leave_allocation_records, get_leave_balance_on, get_approved_leaves_for_period
+	import get_leave_allocation_records, get_leave_balance_on, get_approved_leaves_for_period, get_total_allocated_leaves
 
 
 def execute(filters=None):
 	leave_types = frappe.db.sql_list("select name from `tabLeave Type` order by name asc")
-	
+
 	columns = get_columns(leave_types)
 	data = get_data(filters, leave_types)
-	
+
 	return columns, data
-	
+
 def get_columns(leave_types):
 	columns = [
-		_("Employee") + ":Link/Employee:150", 
+		_("Employee") + ":Link/Employee:150",
-		_("Employee Name") + "::200", 
+		_("Employee Name") + "::200",
 		_("Department") +"::150"
 	]
 
@@ -27,18 +27,18 @@ def get_columns(leave_types):
 		columns.append(_(leave_type) + " " + _("Opening") + ":Float:160")
 		columns.append(_(leave_type) + " " + _("Taken") + ":Float:160")
 		columns.append(_(leave_type) + " " + _("Balance") + ":Float:160")
-	
+
 	return columns
-	
+
 def get_data(filters, leave_types):
 	user = frappe.session.user
 	allocation_records_based_on_to_date = get_leave_allocation_records(filters.to_date)
 	allocation_records_based_on_from_date = get_leave_allocation_records(filters.from_date)
 
-	active_employees = frappe.get_all("Employee", 
+	active_employees = frappe.get_all("Employee",
-		filters = { "status": "Active", "company": filters.company}, 
+		filters = { "status": "Active", "company": filters.company},
 		fields = ["name", "employee_name", "department", "user_id"])
-	
+
 	data = []
 	for employee in active_employees:
 		leave_approvers = [l.leave_approver for l in frappe.db.sql("""select leave_approver from `tabEmployee Leave Approver` where parent = %s""",
@@ -52,15 +52,14 @@ def get_data(filters, leave_types):
 					filters.from_date, filters.to_date)
 
 				# opening balance
-				opening = get_leave_balance_on(employee.name, leave_type, filters.from_date,
+				opening = get_total_allocated_leaves(employee.name, leave_type, filters.to_date)
-					allocation_records_based_on_from_date.get(employee.name, frappe._dict()))
 
 				# closing balance
 				closing = get_leave_balance_on(employee.name, leave_type, filters.to_date,
 					allocation_records_based_on_to_date.get(employee.name, frappe._dict()))
 
 				row += [opening, leaves_taken, closing]
-			
+
 			data.append(row)
-		
+
 	return data

erpnext/patches.txt

@@ -411,7 +411,7 @@ erpnext.patches.v8_0.save_system_settings
 erpnext.patches.v8_1.delete_deprecated_reports
 erpnext.patches.v9_0.remove_subscription_module
 erpnext.patches.v8_7.make_subscription_from_recurring_data
-erpnext.patches.v8_1.setup_gst_india #2017-06-27
+erpnext.patches.v8_1.setup_gst_india #2019-04-04
 execute:frappe.reload_doc('regional', 'doctype', 'gst_hsn_code')
 erpnext.patches.v8_1.removed_roles_from_gst_report_non_indian_account
 erpnext.patches.v8_1.gst_fixes #2017-07-06
@@ -498,6 +498,7 @@ erpnext.patches.v10_0.update_hub_connector_domain
 erpnext.patches.v10_0.set_student_party_type
 erpnext.patches.v10_0.update_project_in_sle
 erpnext.patches.v10_0.fix_reserved_qty_for_sub_contract
+erpnext.patches.v10_0.repost_requested_qty_for_non_stock_uom_items
 erpnext.patches.v10_0.taxes_issue_with_pos
 erpnext.patches.v10_0.set_qty_in_transactions_based_on_serial_no_input
 erpnext.patches.v10_0.show_leaves_of_all_department_members_in_calendar
@@ -508,4 +509,5 @@ erpnext.patches.v10_0.recalculate_gross_margin_for_project
 erpnext.patches.v10_0.delete_hub_documents
 erpnext.patches.v10_0.update_user_image_in_employee
 erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items
-erpnext.patches.v10_0.allow_operators_in_supplier_scorecard
+erpnext.patches.v10_0.allow_operators_in_supplier_scorecard
+erpnext.patches.v10_0.gst_hsn_fixes

erpnext/patches/v10_0/gst_hsn_fixes.py

@@ -0,0 +1,18 @@
+import frappe
+from erpnext.regional.india.setup import setup
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+
+def execute():
+	company = frappe.get_all('Company', filters = {'country': 'India'})
+	if not company:
+		return
+
+	hsn_sac_field = dict(fieldname='gst_hsn_code', label='HSN/SAC',
+		fieldtype='Data', options='item_code.gst_hsn_code', insert_after='description',
+		allow_on_submit=1, print_hide=1)
+
+	custom_fields = {
+		'Material Request Item': [hsn_sac_field]
+	}
+
+	create_custom_fields(custom_fields)

erpnext/patches/v10_0/repost_requested_qty_for_non_stock_uom_items.py

@@ -0,0 +1,21 @@
+# Copyright (c) 2019, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty
+
+	count=0
+	for item_code, warehouse in frappe.db.sql("""select distinct item_code, warehouse
+		from `tabMaterial Request Item` where docstatus = 1 and stock_uom<>uom"""):
+			try:
+				count += 1
+				update_bin_qty(item_code, warehouse, {
+					"indented_qty": get_indented_qty(item_code, warehouse),
+				})
+				if count % 200 == 0:
+					frappe.db.commit()
+			except:
+				frappe.db.rollback()

erpnext/projects/doctype/task/task.py

@@ -143,6 +143,13 @@ class Task(NestedSet):
 
 		self.update_nsm_model()
 
+	def update_status(self):
+		if self.status not in ('Cancelled', 'Closed') and self.exp_end_date:
+			from datetime import datetime
+			if self.exp_end_date < datetime.now().date():
+				self.db_set('status', 'Overdue')
+				self.update_project()
+
 @frappe.whitelist()
 def check_if_child_exists(name):
 	return frappe.db.sql("""select name from `tabTask`
@@ -168,10 +175,9 @@ def set_multiple_status(names, status):
 		task.save()
 
 def set_tasks_as_overdue():
-	frappe.db.sql("""update tabTask set `status`='Overdue'
+	tasks = frappe.get_all("Task", filters={'status':['not in',['Cancelled', 'Closed']]})
-		where exp_end_date is not null
+	for task in tasks:
-		and exp_end_date < CURDATE()
+		frappe.get_doc("Task", task.name).update_status()
-		and `status` not in ('Closed', 'Cancelled')""")
 
 @frappe.whitelist()
 def get_children(doctype, parent, task=None, project=None, is_root=False):

erpnext/regional/india/setup.py

@@ -180,7 +180,8 @@ def make_custom_fields():
 		'Sales Invoice Item': [hsn_sac_field],
 		'Purchase Order Item': [hsn_sac_field],
 		'Purchase Receipt Item': [hsn_sac_field],
-		'Purchase Invoice Item': [hsn_sac_field]
+		'Purchase Invoice Item': [hsn_sac_field],
+		'Material Request Item': [hsn_sac_field]
 	}
 
 	create_custom_fields(custom_fields)

erpnext/stock/doctype/delivery_note/delivery_note.js

@@ -93,6 +93,29 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 	refresh: function(doc, dt, dn) {
 		var me = this;
 		this._super();
+
+		if((!doc.is_return) && (doc.status!="Closed" || this.frm.is_new())) {
+			if (this.frm.doc.docstatus===0) {
+				this.frm.add_custom_button(__('Sales Order'),
+					function() {
+						erpnext.utils.map_current_doc({
+							method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
+							source_doctype: "Sales Order",
+							target: me.frm,
+							setters: {
+								customer: me.frm.doc.customer || undefined,
+							},
+							get_query_filters: {
+								docstatus: 1,
+								status: ["!=", "Closed"],
+								per_delivered: ["<", 99.99],
+								company: me.frm.doc.company,
+								project: me.frm.doc.project || undefined,
+							}
+						})
+					}, __("Get items from"));
+			}
+		}
 		if (!doc.is_return && doc.status!="Closed") {
 			if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
 				this.frm.add_custom_button(__('Installation Note'), function() {
@@ -114,27 +137,6 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 			if (!doc.__islocal && doc.docstatus==1) {
 				this.frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
-
-			if (this.frm.doc.docstatus===0) {
-				this.frm.add_custom_button(__('Sales Order'),
-					function() {
-						erpnext.utils.map_current_doc({
-							method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
-							source_doctype: "Sales Order",
-							target: me.frm,
-							setters: {
-								customer: me.frm.doc.customer || undefined,
-							},
-							get_query_filters: {
-								docstatus: 1,
-								status: ["!=", "Closed"],
-								per_delivered: ["<", 99.99],
-								company: me.frm.doc.company,
-								project: me.frm.doc.project || undefined,
-							}
-						})
-					}, __("Get items from"));
-			}
 		}
 
 		if (doc.docstatus==1) {

erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

@@ -381,6 +381,9 @@ def make_purchase_invoice(source_name, target_doc=None):
 	doclist = get_mapped_doc("Purchase Receipt", source_name,	{
 		"Purchase Receipt": {
 			"doctype": "Purchase Invoice",
+			"field_map": {
+				"supplier_warehouse": "supplier_warehouse"
+			},
 			"validation": {
 				"docstatus": ["=", 1],
 			},

erpnext/stock/stock_balance.py

@@ -110,7 +110,7 @@ def get_reserved_qty(item_code, warehouse):
 	return flt(reserved_qty[0][0]) if reserved_qty else 0
 
 def get_indented_qty(item_code, warehouse):
-	indented_qty = frappe.db.sql("""select sum(mr_item.qty - mr_item.ordered_qty)
+	indented_qty = frappe.db.sql("""select sum((mr_item.qty - mr_item.ordered_qty) * mr_item.conversion_factor)
 		from `tabMaterial Request Item` mr_item, `tabMaterial Request` mr
 		where mr_item.item_code=%s and mr_item.warehouse=%s
 		and mr_item.qty > mr_item.ordered_qty and mr_item.parent=mr.name

erpnext/utilities/activation.py

@@ -4,50 +4,35 @@
 import frappe, erpnext
 
 from frappe import _
+from six import iteritems
 
 def get_level():
+
 	activation_level = 0
+	sales_data = []
+	doctypes = {"Item": 5, "Customer": 5, "Sales Order": 2, "Sales Invoice": 2, "Purchase Order": 2, "Employee": 3, "Lead": 3, "Quotation": 3,
+					"Payment Entry": 2, "User": 5, "Student": 5, "Instructor": 5, "BOM": 3, "Journal Entry": 3, "Stock Entry": 3}
+	for doctype, min_count in iteritems(doctypes):
+		count = frappe.db.count(doctype)
+		if count > min_count:
+			activation_level += 1
+		sales_data.append({doctype: count})
+
 	if frappe.db.get_single_value('System Settings', 'setup_complete'):
-		activation_level = 1
-
-	if frappe.db.count('Item') > 5:
 		activation_level += 1
 
-	if frappe.db.count('Customer') > 5:
+	communication_number = frappe.db.count('Communication', dict(communication_medium='Email'))
-		activation_level += 1
+	if communication_number > 10:
-
-	if frappe.db.count('Sales Order') > 2:
-		activation_level += 1
-
-	if frappe.db.count('Purchase Order') > 2:
-		activation_level += 1
-
-	if frappe.db.count('Employee') > 3:
-		activation_level += 1
-
-	if frappe.db.count('Lead') > 3:
-		activation_level += 1
-
-	if frappe.db.count('Payment Entry') > 2:
-		activation_level += 1
-
-	if frappe.db.count('Communication', dict(communication_medium='Email')) > 10:
-		activation_level += 1
-
-	if frappe.db.count('User') > 5:
-		activation_level += 1
-
-	if frappe.db.count('Student') > 5:
-		activation_level += 1
-
-	if frappe.db.count('Instructor') > 5:
 		activation_level += 1
+	sales_data.append({"Communication": communication_number})
 
 	# recent login
 	if frappe.db.sql('select name from tabUser where last_login > date_sub(now(), interval 2 day) limit 1'):
 		activation_level += 1
 
-	return activation_level
+	level = {"activation_level": activation_level, "sales_data": sales_data}
+
+	return level
 
 def get_help_messages():
 	'''Returns help messages to be shown on Desktop'''

requirements.txt

@@ -1,4 +1,4 @@
 frappe
-unidecode
+Unidecode==1.1.1
-pygithub
+PyGithub==1.43.8
-googlemaps
+googlemaps==3.0.2