Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,417 Commits 3 Branches 0 Tags 1 GiB
0c1611219e
Commit Graph

206 Commits

Author SHA1 Message Date
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Nabin Hait
d5d54c24b5 fixed conflict 2012-12-13 18:39:08 +05:30
Nabin Hait
9db3b6dc71 replace createlocal 2012-12-13 18:36:49 +05:30
Rushabh Mehta
8a4ceb98c2 remove hyphen from file_list 2012-12-13 15:24:33 +05:30
Anand Doshi
d3e04c3185 fixed syntax error in patch list 2012-12-11 15:25:06 +05:30
Anand Doshi
c551964d5d Merge branch 'master' into production 
Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt
 2012-12-11 14:59:19 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Nabin Hait
05de088473 merge, fixed production cleanup patch 2012-12-10 19:28:38 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Nabin Hait
822022082d removed BOM Control and Production Control 2012-12-10 18:13:34 +05:30
Rushabh Mehta
87192da372 website updates and leave balance bugfix 2012-12-06 16:45:00 +05:30
Nabin Hait
27184e0e05 default filters set in debtors and creditors ledger 2012-12-06 11:46:41 +05:30
Rushabh Mehta
38f19104d8 merge 2012-12-05 16:49:58 +05:30
Nabin Hait
598dd99144 repost projected qty 2012-12-05 15:58:57 +05:30
Nabin Hait
ec83e0abee repost ordered qty 2012-12-05 15:51:05 +05:30
Rushabh Mehta
39c356393b refactored leave and expense 2012-12-05 14:27:50 +05:30
Nabin Hait
b24e783aef deprecated tds 2012-12-04 18:58:15 +05:30
Nabin Hait
995b5c617b Patch for fixing floating point issue in gl entry 2012-11-30 19:40:37 +05:30
Nabin Hait
3e0612db83 fixed conflict 2012-11-30 15:02:20 +05:30
Nabin Hait
9d4e5569c8 Patch for production fieldlevel changes 2012-11-30 14:37:17 +05:30
Rushabh Mehta
71d6a0ce1d cleaned up leave application 2012-11-30 12:41:46 +05:30
Rushabh Mehta
86adcaa113 fixed employee permissions, fixed bug in import_merge of timestamps 2012-11-30 12:02:00 +05:30
Rushabh Mehta
d7fe2bfe1b webnotes.model.doctype (new version) 2012-11-29 11:49:56 +05:30
Nabin Hait
0af1959a63 remove basic info patch not required 2012-11-28 16:56:50 +05:30
Nabin Hait
c4fb30dc8d Removed basic info section 2012-11-28 16:49:18 +05:30
Rushabh Mehta
40d73ed9db profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:21:04 +05:30
Rushabh Mehta
bd919caa9b profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:19:51 +05:30
Nabin Hait
d9eb526b27 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 12:40:52 +05:30
Anand Doshi
55ffa7e14d Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	patches/patch_list.py
 2012-11-27 18:56:32 +05:30
Anand Doshi
a22bd841eb patch to update cancelled BOMs 2012-11-27 18:55:17 +05:30
Rushabh Mehta
80127bfb6a refactored communication and added to Lead / Contact 2012-11-27 18:41:35 +05:30
Rushabh Mehta
bf09c672cd support ticket response deprecated, moved to communication 2012-11-24 15:26:48 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
01f689bfe5 change cancelled profiles to disabled and show in profile list 2012-11-22 19:22:38 +05:30
Rushabh Mehta
04b9579b24 appraisal cleanup, removed un-necessary logic 2012-11-16 10:37:14 +05:30
Rushabh Mehta
2a44bf8245 customer_issue: moved allocated to assigned 2012-11-15 15:11:15 +05:30
Rushabh Mehta
09a53376bb query-report patch, now report manager can save, but must give a new name if standard report 2012-11-12 12:53:44 +05:30
Rushabh Mehta
fced017aad renamed employee leave balance report 2012-11-12 12:07:28 +05:30
Nabin Hait
6885bb2365 delete duplicate itemwise sales register 2012-11-06 17:40:18 +05:30
Nabin Hait
03d5d6dd36 delete duplicate itemwise sales register 2012-11-06 17:39:39 +05:30
Nabin Hait
3073068506 reload stock ledger report 2012-11-06 10:42:47 +05:30
Anand Doshi
7a617b83fb fix in insert after of custom field 2012-11-01 12:11:16 +05:30
Anand Doshi
c4bcbea927 added delete permissions for custom script and added autoname method 2012-10-26 13:23:51 +05:30
Nabin Hait
27b1c30735 fix cancelled gl entries :patch 2012-10-10 15:34:38 +05:30
Anand Doshi
10667521da fix in setup control and patch to fix existing docstatus problem 2012-10-05 15:12:32 +05:30
Anand Doshi
ae09b37a08 fix in setup control and patch to fix existing docstatus problem 2012-10-05 15:10:40 +05:30
Nabin Hait
68b8a90ee0 removed old triaL balance report 2012-10-05 14:47:46 +05:30
Nabin Hait
ee442dc104 update account property as per root 2012-10-05 14:32:36 +05:30
Nabin Hait
3e32040ae0 customer addresses and contacts report (query) 2012-10-04 18:35:17 +05:30
Nabin Hait
30f7da49c8 patch list updated 2012-10-03 18:42:57 +05:30
Nabin Hait
cd2f40ffef reload purchase invoice gl mapper 2012-10-03 11:17:37 +05:30
Anand Doshi
05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
 2012-10-02 14:35:20 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Anand Doshi
8bde7cb8db Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-28 12:36:22 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-09-26 12:24:28 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30