Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,331 Commits 3 Branches 0 Tags 1 GiB
996abdd155
Commit Graph

1431 Commits

Author SHA1 Message Date
Nabin Hait
2453740621 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-26 13:03:18 +05:30
Nabin Hait
a6b7886175 resolved conflict while merging with master 2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
5a6e641565 fixed batch issue 2012-04-26 11:11:34 +05:30
Rushabh Mehta
44279f87b4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-25 18:25:29 +05:30
Nabin Hait
aa577ed82e serial no fixes: sle creation through import data 2012-04-25 18:25:13 +05:30
Rushabh Mehta
dcfdfc317c fixes to website module and fixed rename and double column bugs 2012-04-25 18:24:44 +05:30
Nabin Hait
04a276c934 Error fixed in gl netry when negative entry and cancel event 2012-04-25 16:08:45 +05:30
Nabin Hait
ed7de5fee2 posting time format validation 2012-04-25 15:07:46 +05:30
Nabin Hait
4626b27038 updated sales bom document 2012-04-24 15:17:56 +05:30
Nabin Hait
d98ca01082 fixed wrong serial no qty validation 2012-04-24 14:07:04 +05:30
Nabin Hait
3afecb9e30 update permission in appraisal 2012-04-24 13:32:26 +05:30
Nabin Hait
9a6dbfca8f updated permlevel in address 2012-04-24 12:40:50 +05:30
Nabin Hait
dd828be432 updated patch list 2012-04-24 12:25:39 +05:30
Nabin Hait
3fb741c3ef update role in address 2012-04-24 12:23:12 +05:30
Nabin Hait
663e971557 Make next document button hide/unhide 2012-04-24 11:39:54 +05:30
Nabin Hait
e6d808820a Error fixed in notification control 2012-04-24 11:06:48 +05:30
Nabin Hait
4c9525139d Error fixed in stock ledger netry batch related 2012-04-24 10:38:37 +05:30
Nabin Hait
8f9a953931 Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py 2012-04-23 19:00:39 +05:30
Nabin Hait
69f6d79791 patch list modified 2012-04-23 18:27:53 +05:30
Nabin Hait
a45f44d805 remove def val from rv detail cost center 2012-04-23 18:26:08 +05:30
Nabin Hait
e848300958 patch list modified 2012-04-23 18:24:22 +05:30
Nabin Hait
ca102d567e change cacheitem schema 2012-04-23 18:23:17 +05:30
Nabin Hait
2bbb086b10 Update erpnext/accounts/doctype/rv_detail/rv_detail.txt 2012-04-23 17:57:18 +05:30
Nabin Hait
9ceaccce86 create custom flds for bullows account 2012-04-23 16:04:41 +05:30
Nabin Hait
c425d8bd16 after sync cleanup 2012-04-23 16:04:16 +05:30
Nabin Hait
708917db50 some fixes in cleanup 2012-04-23 16:03:38 +05:30
Nabin Hait
6dbfcdbe5c Merge branch 'master' of github.com:webnotes/erpnext 2012-04-23 14:03:22 +05:30
Nabin Hait
b743bb6c10 ledger bal export format changed 2012-04-23 14:03:07 +05:30
Nabin Hait
51834a45a7 purchase invoice with write off feature 2012-04-23 12:47:12 +05:30
Nabin Hait
15230eb955 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-23 12:17:41 +05:30
Nabin Hait
6ed865f89a Fld label based on currency 2012-04-23 10:37:28 +05:30
Rushabh Mehta
f4a8c87db5 kb bug fix 2012-04-23 10:31:29 +05:30
Nabin Hait
a8d83b6c51 update modified date 2012-04-20 14:02:44 +05:30
Nabin Hait
f19bb52b2a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:59:22 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Anand Doshi
3d9f436ce9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:43:05 +05:30
Anand Doshi
0f8e491bdd removed Knowledge Base module, fixed questions page name 2012-04-20 13:42:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Rushabh Mehta
5bce61d58e merge 2012-04-20 13:40:48 +05:30
Rushabh Mehta
f30d1a0515 report builder - sort, save, pre-select columns, Report DocType 2012-04-20 13:37:49 +05:30
Nabin Hait
0788570ce7 automatically write off feature in sales invoice 2012-04-20 13:31:05 +05:30
Anand Doshi
b301251090 Store base currency on client side 2012-04-20 11:51:27 +05:30
Anand Doshi
9e0221c58e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 11:22:38 +05:30
Anand Doshi
b8660fb51c fixes in production, porjects, packing slip 2012-04-20 11:21:47 +05:30
Anand Doshi
37df8abfc7 knowledge base module removed 2012-04-20 11:17:10 +05:30
Nabin Hait
b9984c8995 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 10:25:33 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Anand Doshi
7c135ed2fc projects date_format to be fetched from wn.boot.sysdefaults 2012-04-19 17:58:56 +05:30
Rushabh Mehta
6ff95727e1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-19 17:49:44 +05:30
Rushabh Mehta
a11bc07a7f new report builder - todo: sort, save 2012-04-19 17:48:57 +05:30
Nabin Hait
94329abd02 modifed format for raw material report in prod plan 2012-04-19 16:08:33 +05:30
Nabin Hait
776e8572a2 issue fixed in prod plan 2012-04-19 15:00:48 +05:30
Nabin Hait
cba6f9148a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-19 13:56:04 +05:30
Nabin Hait
40738aecfa removed msgprint 2012-04-19 13:55:45 +05:30
Anand Doshi
b50a7a5ff9 Fix in rate fetching on get item details, when using inclusive rate 2012-04-19 12:00:49 +05:30
Anand Doshi
f642168a26 hr home: changed Allocate Leaves --> Leave Allocation Tool 2012-04-18 18:35:30 +05:30
Anand Doshi
7c67aad059 removed account_url from global defaults 2012-04-18 17:25:06 +05:30
Anand Doshi
2d56115c08 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 17:18:06 +05:30
Anand Doshi
619e16c956 removed account_url from global defaults 2012-04-18 17:17:02 +05:30
Rushabh Mehta
81c8ec2b89 knowledge base cleanup 2012-04-18 17:14:33 +05:30
Rushabh Mehta
46162c4e35 knowledge base cleanup 2012-04-18 16:59:37 +05:30
Rushabh Mehta
b194eb83a9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:56:09 +05:30
Rushabh Mehta
edab76b274 knowledge base cleanup 2012-04-18 16:55:43 +05:30
Nabin Hait
66c7fbca8a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-18 16:18:58 +05:30
Nabin Hait
6da191de03 negative stock fixes 2012-04-18 16:18:20 +05:30
Anand Doshi
8d1a0b4061 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:08:15 +05:30
Anand Doshi
385380125b fixes in customize form, naming series form loading 2012-04-18 16:04:02 +05:30
Nabin Hait
97051ba79f allow negative stock field in global defaults 2012-04-18 12:51:11 +05:30
Rushabh Mehta
5fc06554ff question css 2012-04-18 12:50:09 +05:30
Nabin Hait
4776d3e097 Update erpnext/production/doctype/bill_of_materials/bill_of_materials.js 2012-04-18 12:37:01 +05:30
Rushabh Mehta
b12349a768 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 12:34:43 +05:30
Rushabh Mehta
3a9ddaf2c1 permission engine bugfix 2012-04-18 12:34:18 +05:30
Nabin Hait
7afc2124a6 allow negative qty feature 2012-04-18 12:04:20 +05:30
Anand Doshi
1fb128158c fix in support ticket options of naming_series 2012-04-18 11:18:54 +05:30
Anand Doshi
40808e18f1 minor fixes 2012-04-17 18:43:29 +05:30
Nabin Hait
69e7eb4f3d Merge branch 'master' of github.com:webnotes/erpnext 2012-04-17 18:06:10 +05:30
Nabin Hait
5da9d56047 removed voucher date filter 2012-04-17 18:05:58 +05:30
Anand Doshi
c9d1ac4112 fix - show about of application 2012-04-17 13:54:53 +05:30
Anand Doshi
44f16eaefa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 13:00:01 +05:30
Anand Doshi
b9e9197e5f fix in doclistview - check if _user_tags exists before rendering 2012-04-17 12:59:18 +05:30
Rushabh Mehta
38bdf6c5e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 12:41:04 +05:30
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +05:30
Anand Doshi
b2974e8e59 fix in delete check 2012-04-17 11:57:50 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Anand Doshi
acb3d56e02 fix in install docs 2012-04-17 11:39:18 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	css/all-app.css
	version.num
 2012-04-17 11:19:15 +05:30
Nabin Hait
8c0dcd383b some more fixes in support 2012-04-16 18:47:20 +05:30
Rushabh Mehta
6910ec1946 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 18:37:33 +05:30
Rushabh Mehta
71085592a4 fixed account_browser 2012-04-16 18:36:46 +05:30
Nabin Hait
fe127c216c fixed issue in stock 2012-04-16 16:01:02 +05:30
Rushabh Mehta
6610d390e1 merge 2012-04-16 14:49:11 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Nabin Hait
eb3bb01431 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-04-16 13:41:06 +05:30
Rushabh Mehta
449f56db75 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 13:35:53 +05:30
Rushabh Mehta
6820dbf72d framework build 2012-04-16 13:33:14 +05:30
Nabin Hait
eaf8b91402 hr reports cleanup 2012-04-16 12:31:36 +05:30
Nabin Hait
dbffc2d8d0 fixed hr issues 2012-04-16 12:22:47 +05:30
Rushabh Mehta
0c18b18b84 new framework build 2012-04-16 11:18:45 +05:30
Rushabh Mehta
c8abe5b2ad style cleanups and new builds 2012-04-15 22:31:32 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Rushabh Mehta
f465b4fa76 merge 2012-04-13 19:06:05 +05:30
Rushabh Mehta
850c928a02 started rewrite of accounts browser 2012-04-13 19:04:55 +05:30
Anand Doshi
a202f00dc0 fixes in accounts 2012-04-13 16:03:27 +05:30
Anand Doshi
a0f6a3eab7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 15:34:27 +05:30
Nabin Hait
f3348c5136 Merge branch 'master' into shf_rename 2012-04-13 14:41:56 +05:30
Nabin Hait
781a3c9b1f Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:41:45 +05:30
Nabin Hait
82c53871c7 fixes in se js 2012-04-13 14:39:04 +05:30
Nabin Hait
1c9061eff6 fixed conflict using theirs 2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Nabin Hait
b09b3bc253 all fields visible if any other custom purpose in stock entry 2012-04-13 14:13:02 +05:30
Anand Doshi
6af47a8c37 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 13:13:54 +05:30
Anand Doshi
b3ab90a01a field changes in sp return tool 2012-04-13 12:38:34 +05:30
Anand Doshi
800b214ff3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 12:37:23 +05:30
Anand Doshi
3abe9bd018 fixes in fieldnames and hide unnecessary fields in jv 2012-04-13 12:36:44 +05:30
Anand Doshi
b641ed2a1e Added doc_type to JV Print Formats 2012-04-13 12:27:56 +05:30
Nabin Hait
7fca9e617d fixes in global defaults 2012-04-13 12:18:06 +05:30
Rushabh Mehta
d76146372e merge 2012-04-13 12:01:23 +05:30
Nabin Hait
b176e94b92 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:53:35 +05:30
Nabin Hait
e77164955b removed repair fn, fixes in reports 2012-04-13 11:53:06 +05:30
Anand Doshi
7aafb7e19e Purchase Requisition to Purchase Request 2012-04-13 11:52:17 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa cleanup and fixes 2012-04-13 11:02:26 +05:30
Anand Doshi
44e954f509 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-12 17:52:09 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Nabin Hait
3cb148e53b fixed conflict 2012-04-12 16:44:23 +05:30
Nabin Hait
de237e2bf7 error fixed 2012-04-12 16:36:01 +05:30
Anand Doshi
25bc68c7b2 fix in field names 2012-04-12 14:08:43 +05:30
Anand Doshi
654f6bfa85 fixes 2012-04-12 12:15:35 +05:30
Anand Doshi
9e6af24269 fixes in button function calling 2012-04-11 19:07:02 +05:30
Anand Doshi
5ed0b6971c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-11 17:51:12 +05:30
Anand Doshi
e68fe505b9 custom fields creation patch - not to be executed automatically 2012-04-11 17:49:21 +05:30
Nabin Hait
c594bbcae0 address html issue fixed 2012-04-11 17:14:45 +05:30
Anand Doshi
ece64fa908 fixes 2012-04-10 19:18:00 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Nabin Hait
7a3faa9575 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-10 18:07:51 +05:30
Nabin Hait
af094b9daf ledger balance export report in new format 2012-04-10 18:07:36 +05:30
Nabin Hait
0a8a487230 Update erpnext/stock/doctype/item/item.js 2012-04-10 16:50:23 +05:30
Anand Doshi
a9ccc7d6bd naming series changes now saved as property setter 2012-04-10 15:31:48 +05:30
Anand Doshi
cfcaf38111 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-10 12:39:15 +05:30
Anand Doshi
966b6f1aa0 fix in patches 2012-04-10 12:38:17 +05:30
Rushabh Mehta
db05aacbc4 merge 2012-04-10 11:51:51 +05:30
Rushabh Mehta
d2cec5bd14 website style fixes 2012-04-10 11:51:08 +05:30
Anand Doshi
859cb72606 new favicon 2012-04-10 11:35:19 +05:30
Anand Doshi
9afb57ffb2 Syntax error fix in c_form.txt 2012-04-09 12:23:36 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
 2012-04-09 12:14:53 +05:30