Commit Graph

2471 Commits

Author SHA1 Message Date
Anand Doshi
c51c0d38d7 Merge branch 'shf_rename' 2012-05-16 12:28:14 +05:30
Anand Doshi
328cd2e868 do not refresh toolbar on set value 2012-05-16 12:21:45 +05:30
Anand Doshi
d5f8b91a49 Merge branch 'shf_rename' 2012-05-16 12:21:28 +05:30
Nabin Hait
f0c3fc47f9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-16 12:20:53 +05:30
Nabin Hait
86dec8da7a naming series issue fixed in pos settings 2012-05-16 12:20:21 +05:30
Anand Doshi
7ec905b1e5 on changing value of a form's field, do not call refresh toolbar, as it clears all custom buttons 2012-05-16 12:19:17 +05:30
Anand Doshi
1bba28a723 Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-15 18:22:55 +05:30
Anand Doshi
a5a747fd8d reload sales invoice print formats 2012-05-15 18:17:52 +05:30
Nabin Hait
f044526b92 json error fixed in stock entry 2012-05-15 15:29:47 +05:30
Nabin Hait
901e92d8fa rejected qty issue fixed 2012-05-15 13:40:26 +05:30
Nabin Hait
0a1c5d9db6 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-15 12:15:44 +05:30
Nabin Hait
ed02a85184 fixed issue 2012-05-15 12:15:19 +05:30
Anand Doshi
84cd7e5c32 do not track wn-web.js and wn-web.css in repositor as they are built for each implementation, changed install file to create wn-web.js and wn-web.css 2012-05-15 11:40:12 +05:30
Anand Doshi
0b721b8b96 do not track wn-web.js and wn-web.css in repositor as they are built for each implementation 2012-05-15 11:39:17 +05:30
Anand Doshi
ddc4cdd8f9 include button.js in all-web.js 2012-05-15 11:35:21 +05:30
Anand Doshi
f295591168 Merge branch 'shf_rename' 2012-05-14 18:03:45 +05:30
Anand Doshi
4ce0cd7274 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-14 18:03:12 +05:30
Anand Doshi
4924c96380 sync support emails only when sync_support_mails is set to 1 2012-05-14 18:02:21 +05:30
Anand Doshi
79af963aef revert changes in gitignore 2012-05-14 16:36:10 +05:30
Anand Doshi
422b0f4a3d Merge branch 'master' of github.com:webnotes/erpnext 2012-05-14 16:16:16 +05:30
Anand Doshi
678173729f ignore wn-web.css and wn-web.js as they are generated using cms's make function 2012-05-14 16:10:07 +05:30
Rushabh Mehta
deeae62b18 merge js/css 2012-05-14 15:03:17 +05:30
Rushabh Mehta
6598b6276b fixes to website settings and linking import data in setup 2012-05-14 15:02:35 +05:30
Nabin Hait
a13b435163 invoice period in print format if recurring invoice 2012-05-14 14:11:56 +05:30
Anand Doshi
07af8f6247 fix in last purchase rate 2012-05-14 13:02:31 +05:30
Anand Doshi
4a3d3d75de Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-14 12:53:29 +05:30
Anand Doshi
314c202340 more changes to last purchase rate 2012-05-11 18:38:11 +05:30
Anand Doshi
cec150b487 fixes in last purchase rate 2012-05-11 18:13:53 +05:30
Anand Doshi
3d3e4d753c fix in posting time issue 2012-05-11 17:52:22 +05:30
Rushabh Mehta
5997e507d9 time fix 2012-05-11 17:50:34 +05:30
Rushabh Mehta
7483ae9573 fix in button disablity leading to double click 2012-05-11 16:23:41 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Nabin Hait
956eeb1361 fetch defaults after mapping from prev document 2012-05-11 14:45:02 +05:30
Nabin Hait
4602ef39e3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-11 13:36:37 +05:30
Nabin Hait
bd3d3ca1eb error fixed in sending mail on submitting of sal slip 2012-05-11 13:36:17 +05:30
Nabin Hait
43dd041ced page role series pacth 2012-05-11 11:47:18 +05:30
Nabin Hait
a5b8ac4867 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-11 11:12:23 +05:30
Nabin Hait
41526227e3 page role series pacth 2012-05-11 11:11:46 +05:30
Anand Doshi
df74d30cf1 fix in listview of journal voucher 2012-05-10 19:19:31 +05:30
Rushabh Mehta
7f523ac33c merge 2012-05-10 19:11:00 +05:30
Rushabh Mehta
ea7ba72397 data import and upload issues 2012-05-10 19:07:53 +05:30
Anand Doshi
2f53eba3dc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-10 18:48:47 +05:30
Anand Doshi
02c0eaf99a don't show currency in journal voucher's listview 2012-05-10 18:48:15 +05:30
Nabin Hait
00f44b3c1c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-10 17:49:05 +05:30
Nabin Hait
ef85c4e556 posting time fixes in stock ledger entry 2012-05-10 17:48:34 +05:30
Anand Doshi
3156ad8143 fix in Suggest type field's autosuggest 2012-05-10 17:29:13 +05:30
Anand Doshi
a3851758bf installer 2012-05-10 15:57:05 +05:30
Anand Doshi
4b1a44f4a7 fix blog page 2012-05-10 15:44:36 +05:30
Anand Doshi
3fa25faca2 fixes after merge with cms 2012-05-10 15:15:43 +05:30
Nabin Hait
91d6d1423d reload reports 2012-05-10 14:32:56 +05:30