brotherton-erpnext/erpnext
Rushabh Mehta cef681942f merge fix
2014-01-20 17:41:13 +05:30
..
accounts Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
buying Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
controllers Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
home Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
hr Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
manufacturing Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
patches Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
projects Fixed conflict while merging with master 2013-12-31 16:09:22 +05:30
public Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
selling Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
setup Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
startup Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
stock Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
support Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +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 Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +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 Moved webnotes scheduler event hooks 2014-01-13 21:22:23 +05:30
modules.txt step 0: install 2013-12-11 15:32:14 +05:30
patches.txt flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30