Anand Doshi
|
00175612ac
|
Merge branch 'shf_rename'
Conflicts:
erpnext/stock/doctype/item/listview.js
|
2012-05-18 16:50:35 +05:30 |
|
Anand Doshi
|
d49da9bff1
|
new listviews
|
2012-05-18 16:49:36 +05:30 |
|
Anand Doshi
|
d643d367ca
|
Merge branch 'shf_rename'
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-05-18 11:52:31 +05:30 |
|
Anand Doshi
|
acd291a228
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-18 11:50:08 +05:30 |
|
Anand Doshi
|
aeedc7f66d
|
added search button in filters
|
2012-05-18 11:48:10 +05:30 |
|
Nabin Hait
|
c1f1702e22
|
so pending item patch
|
2012-05-18 11:43:10 +05:30 |
|
Nabin Hait
|
c58fbffc00
|
so pending item patch
|
2012-05-18 11:07:04 +05:30 |
|
Nabin Hait
|
a926468574
|
reload so pending items
|
2012-05-17 18:12:32 +05:30 |
|
Anand Doshi
|
fc9145425d
|
Fixes in Print Formats - discount in description
|
2012-05-17 18:11:54 +05:30 |
|
Nabin Hait
|
7a13b238cb
|
fixes in sales order pending items report
|
2012-05-17 18:06:14 +05:30 |
|
Nabin Hait
|
7638833b75
|
salary register issue fixed
|
2012-05-17 17:47:26 +05:30 |
|
Nabin Hait
|
f5e9dd7b96
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-17 17:10:59 +05:30 |
|
Nabin Hait
|
76d69b1000
|
salary register issue fixed
|
2012-05-17 17:10:15 +05:30 |
|
Anand Doshi
|
c7e26873c0
|
Merge branch 'shf_rename'
|
2012-05-17 15:28:54 +05:30 |
|
Anand Doshi
|
dad93ce8a3
|
fix in payment reconciliation
|
2012-05-17 15:28:38 +05:30 |
|
Nabin Hait
|
57f9bd1d73
|
bom issue fixed
|
2012-05-17 15:02:02 +05:30 |
|
Nabin Hait
|
86289d1291
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-17 12:48:19 +05:30 |
|
Nabin Hait
|
8b2473cc40
|
report fixed: sales persons target variance (item group wise)
|
2012-05-17 12:47:48 +05:30 |
|
Anand Doshi
|
ae4fc41e61
|
Merge branch 'shf_rename'
|
2012-05-16 14:35:15 +05:30 |
|
Anand Doshi
|
57599ebbae
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-16 14:11:24 +05:30 |
|
Anand Doshi
|
9175100e3d
|
fixes in print format
|
2012-05-16 14:10:27 +05:30 |
|
Nabin Hait
|
76862b1ebc
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-16 14:07:11 +05:30 |
|
Nabin Hait
|
7b87a7ec74
|
fixed pos settings
|
2012-05-16 14:07:02 +05:30 |
|
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 |
|
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 |
|