Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0527a393aa
brotherton-erpnext/erpnext
History
Anand Doshi 8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
2013-12-26 19:12:51 +05:30
..
accounts Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
buying Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
controllers Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
home Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
hr Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
manufacturing Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
patches Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
projects Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
public Merge with 3.3.8 2013-12-26 11:07:46 +05:30
selling Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
setup Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
startup Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:48:38 +05:30
stock Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
support Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
templates Redesigned templates. Now all templates must be inside templates/pages templates/generators 2013-12-25 15:19:22 +05:30
translations fixed languages, moved framework strings to framework 2013-12-26 14:44:08 +05:30
utilities Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +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 Merge with 3.3.8 2013-12-26 11:07:46 +05:30
modules.txt step 0: install 2013-12-11 15:32:14 +05:30
patches.txt Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30