Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cb39e0878e
brotherton-erpnext/erpnext
History
Anand Doshi cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 
Conflicts:
	config.json
	erpnext/accounts/utils.py
	erpnext/patches/patch_list.py
	erpnext/stock/doctype/price_list/price_list.txt
	erpnext/stock/doctype/warehouse/warehouse.py
	portal/templates/sale.html
	portal/utils.py
	selling/doctype/sales_order/templates/pages/order.py
	selling/utils/cart.py
	selling/utils/product.py
	utilities/demo/demo_docs/Fiscal_Year.csv
	utilities/demo/make_demo.py
2014-01-24 21:44:36 +05:30
..
accounts Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 2014-01-24 21:44:36 +05:30
buying Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 2014-01-24 21:44:36 +05:30
controllers Fix in testcases 2014-01-23 16:45:22 +05:30
home Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
hr updates for restriction 2014-01-24 11:10:24 +05:30
manufacturing added explicit delete perimssions 2014-01-20 17:52:13 +05:30
patches Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 2014-01-24 21:44:36 +05:30
projects added title_fields for Task, Newsletter 2014-01-24 15:33:42 +05:30
public updated Bootstrap 2014-01-22 12:44:46 +05:30
selling Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 2014-01-24 21:44:36 +05:30
setup Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 2014-01-24 21:44:36 +05:30
startup Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
stock Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 2014-01-24 21:44:36 +05:30
support added title_fields for Task, Newsletter 2014-01-24 15:33:42 +05:30
templates Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes 2013-12-31 17:38:21 +05:30
translations fixed languages, moved framework strings to framework 2013-12-26 14:44:08 +05:30
utilities updates for restriction 2014-01-24 11:10:24 +05:30
__init__.py added setup.py 2013-12-11 11:32:21 +05:30
desktop.json Added Applications page and fixed issues in translations and hooks 2013-12-23 16:09:00 +05:30
hooks.txt Auto closing of tickets through schedulers 2014-01-20 17:46:37 +05:30
modules.txt step 0: install 2013-12-11 15:32:14 +05:30
patches.txt Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 2014-01-24 21:44:36 +05:30