brotherton-erpnext/erpnext
2018-05-15 13:02:40 +05:30
..
accounts Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
agriculture Agriculture module corrections (#13438) 2018-04-02 10:51:53 +05:30
assets Code cleanup 2018-05-14 19:09:44 +05:30
buying Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
change_log Version 10 change log 2017-12-25 12:25:52 +05:30
commands
config Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
controllers [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
crm Fixed merge conflict 2018-04-13 14:38:57 +05:30
demo config/utility level changes 2018-05-14 11:45:38 +05:30
docs Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
domains [ Enhance ] Production to Work Order (#12902) 2018-03-20 12:38:43 +05:30
education Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
erpnext_integrations Woocommerce Integration (#13217) 2018-04-03 11:17:03 +05:30
healthcare [Healthcare] Fix UI (#14011) 2018-05-14 14:06:31 +05:30
hotels Use range instead xrange (#13128) 2018-02-28 16:12:51 +05:30
hr [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
hub Hub (#10934) 2017-10-05 11:17:30 +05:30
hub_node controller and other changes 2018-05-14 11:45:38 +05:30
maintenance Use range instead xrange (#13128) 2018-02-28 16:12:51 +05:30
manufacturing [fix] Get items from BOM error in python 3 (#14012) 2018-05-14 14:05:52 +05:30
non_profit Remove the duplicate description 2018-04-27 12:46:56 +05:30
patches [fix] reload Leave Period and Staffing Plan doctypes 2018-05-15 08:35:25 +05:30
portal Set the guardian role automatically. (#12136) 2017-12-22 10:50:10 +05:30
projects [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
public [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
regional Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
restaurant self.assertEqual 2018-02-28 21:13:51 +05:30
selling [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
setup Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
shopping_cart [fix] honour the shopping cart setting when showing the stock and non-stock item (#13988) 2018-05-14 14:30:30 +05:30
startup Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
stock remove duplicate fields occured due to merge conflicts 2018-05-14 22:11:17 +05:30
support Email Account field added in Issue 2018-04-13 14:30:26 +05:30
templates [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
tests Loan Management for the Members (Non Profit Module) (#13149) 2018-04-24 12:19:36 +05:30
translations [Translation] Updated Translations (#13570) 2018-04-12 13:36:55 +05:30
utilities Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
__init__.py bumped to version 10.1.32 2018-05-15 13:28:15 +06:00
exceptions.py
hooks.py Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
modules.txt Hotels (#11907) 2018-02-12 11:57:12 +05:30
patches.txt Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30