brotherton-erpnext/erpnext
Josh Reeder c8b9648c53
Changed instructions
No need to copy and paste into text editor, problems with error message have to do with the form needing saved before Allow Access button is used.
2018-01-20 15:56:15 -06:00
..
accounts Fixed merge conflict 2018-01-17 18:56:02 +05:30
agriculture Update agriculture_analysis_criteria.json (#12478) 2018-01-15 12:33:03 +05:30
assets GL Entry on asset sale (#12514) 2018-01-17 14:39:05 +05:30
buying add posting_date/transaction_date to list_view (#12453) 2018-01-12 16:27:29 +05:30
change_log Version 10 change log 2017-12-25 12:25:52 +05:30
commands [demo] make it faster, do not send user email 2017-06-16 16:55:32 +05:30
config Add desk icons for healthcare - fixes 11838 (#12518) 2018-01-17 16:11:09 +05:30
controllers Fixed merge conflict 2018-01-17 18:56:02 +05:30
crm Get default tax template only if tax template not selected or template is for other company (#12492) 2018-01-15 17:45:46 +05:30
demo [fix] set asset owner demo data 2017-12-19 14:52:07 +05:30
docs Changed instructions 2018-01-20 15:56:15 -06:00
domains Set the guardian role automatically. (#12136) 2017-12-22 10:50:10 +05:30
education resolved merge conflicts 2018-01-12 16:58:32 +05:30
erpnext_integrations Add Github Connector (#11259) 2017-11-13 19:19:13 +05:30
healthcare Patient medical record and Consulatation (#12198) 2017-12-29 14:32:13 +05:30
hr Deleted Previous Chat Reference for Leave Application Approval (#12482) 2018-01-15 14:12:41 +05:30
hub Hub (#10934) 2017-10-05 11:17:30 +05:30
hub_node Employee advance (#11875) 2017-12-14 13:25:57 +05:30
maintenance Added maintenance to Asset and enhanced maintenance for Asset Maintenance 2017-11-28 15:14:56 +05:30
manufacturing Exploded view for BOM Stock Report (#12506) 2018-01-17 16:12:55 +05:30
non_profit Merge branch 'master' into develop 2018-01-15 18:36:35 +05:30
patches resolved merge conflicts 2018-01-12 16:58:32 +05:30
portal Set the guardian role automatically. (#12136) 2017-12-22 10:50:10 +05:30
projects [Minor] Fix adding child to root task issue (#12121) 2017-12-22 11:00:19 +05:30
public Fixed merge conflict 2018-01-17 18:56:02 +05:30
regional Update utils.py 2018-01-15 12:22:28 +05:30
restaurant Fix travis (#11882) 2017-12-08 14:57:38 +05:30
selling Fixed merge conflict 2018-01-17 18:56:02 +05:30
setup Fixed merge conflict 2018-01-17 18:56:02 +05:30
shopping_cart [fix] Add to cart issue fixed (#12474) 2018-01-15 14:01:05 +05:30
startup [hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409) 2017-11-02 18:12:14 +05:30
stock Fixed merge conflict 2018-01-17 18:56:02 +05:30
support change the resolution field to the text editor (#12449) 2018-01-12 12:00:13 +05:30
templates Update total.html (#12511) 2018-01-17 14:41:38 +05:30
tests [Minor] Fix adding child to root task issue (#12121) 2017-12-22 11:00:19 +05:30
translations [Translation] Updated Translations 2018-01-16 09:37:11 +02:00
utilities Merge branch 'master' into develop 2018-01-15 18:36:35 +05:30
__init__.py bumped to version 10.0.10 2018-01-17 19:21:20 +06:00
exceptions.py
hooks.py GSTR1 for B2B (#12296) 2018-01-10 17:48:03 +05:30
modules.txt [Agriculture Domain] (#11663) 2017-12-06 18:36:27 +05:30
patches.txt resolved merge conflicts 2018-01-12 16:58:32 +05:30