31034 Commits

Author SHA1 Message Date
Anand Doshi
28335b7ee7 print format readonly patch 2012-05-16 13:44:06 +05:30
Anand Doshi
c51c0d38d7 Merge branch 'shf_rename' 2012-05-16 12:28:14 +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
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
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
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
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
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
ef85c4e556 posting time fixes in stock ledger entry 2012-05-10 17:48:34 +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
Nabin Hait
3f7b883010 reload reports 2012-05-10 14:32:02 +05:30
Anand Doshi
e463fc6300 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-10 14:20:09 +05:30
Anand Doshi
951d8ec342 fix in issues arising due to wn.require 2012-05-10 14:19:11 +05:30
Nabin Hait
6fb498ebcd changed field position of net total(import) 2012-05-10 14:03:39 +05:30
Nabin Hait
a15740a974 fixed issue 2012-05-10 12:56:40 +05:30
Anand Doshi
bf68e04d2f Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	erpnext/patches/patch_list.py
2012-05-10 12:40:58 +05:30
Nabin Hait
fdeb55ba69 stock reco patch 2012-05-10 12:18:11 +05:30
Nabin Hait
08f4cb7f6a stock reco fix in valuation and cancellation 2012-05-10 12:13:47 +05:30
Anand Doshi
df8b4ab9b1 Merge branch 'cms' 2012-05-10 10:21:29 +05:30
Rushabh Mehta
078867c411 fixes to listview 2012-05-09 16:15:51 +05:30
Rushabh Mehta
81dba76699 cms updates 2012-05-09 15:37:54 +05:30
Nabin Hait
7f82256394 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-09 15:27:03 +05:30
Nabin Hait
68f9ad31ae serialized inventory fixes : serial no for sales bom child item and rejected qty 2012-05-09 15:26:27 +05:30
Rushabh Mehta
be93aa027f cms fixes 2012-05-09 14:44:40 +05:30