Nabin Hait
|
a73b2965aa
|
cleanup and fixes
|
2012-04-13 11:02:26 +05:30 |
|
Anand Doshi
|
82042f1cff
|
fixes after sync
|
2012-04-06 17:54:17 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +05:30 |
|
Anand Doshi
|
5112b5b6b8
|
rerun of rename_dt
|
2012-04-02 19:12:29 +05:30 |
|
Anand Doshi
|
c88ae2be4d
|
rename dt second cut
|
2012-03-30 18:18:36 +05:30 |
|
Anand Doshi
|
fedfd89e4a
|
rename dt first cut
|
2012-03-30 12:29:06 +05:30 |
|
Anand Doshi
|
37fb9c8f27
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
Conflicts:
version.num
|
2012-03-29 15:35:08 +05:30 |
|
Anand Doshi
|
7ff696fb12
|
Merge branch 'renamedt' into shf_rename
Conflicts:
erpnext/patches/patch_list.py
|
2012-03-29 15:31:17 +05:30 |
|
Anand Doshi
|
fddb782a82
|
Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt
|
2012-03-29 15:28:16 +05:30 |
|
Anand Doshi
|
0442b4e207
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-29 15:22:15 +05:30 |
|
Anand Doshi
|
66722dfe69
|
some buying listviews
|
2012-03-29 15:20:35 +05:30 |
|
Nabin Hait
|
dc8ce0190d
|
Merge branch 'master' into renamedt
|
2012-03-29 11:53:02 +05:30 |
|
Rushabh Mehta
|
635f359a71
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 15:18:28 +02:00 |
|
Rushabh Mehta
|
43d64c6116
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 15:17:59 +02:00 |
|
Anand Doshi
|
2f74d2e7bd
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-28 18:34:50 +05:30 |
|
Anand Doshi
|
779a365420
|
fix in print hide of amount in words
|
2012-03-28 18:31:26 +05:30 |
|
Anand Doshi
|
18ffd2a1b8
|
Merge branch 'master' into handlerupdate
|
2012-03-28 17:56:33 +05:30 |
|
Anand Doshi
|
c9456c18dc
|
listviews
|
2012-03-28 17:48:30 +05:30 |
|
Rushabh Mehta
|
bb769c5461
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 08:04:17 +02:00 |
|
Nabin Hait
|
13f789701e
|
erro fixed in reorder_item
|
2012-03-28 11:33:25 +05:30 |
|
Anand Doshi
|
2513e50dc4
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
erpnext/website/doctype/style_settings/style_settings.txt
version.num
|
2012-03-27 19:37:10 +05:30 |
|
Anand Doshi
|
a30fbd004e
|
merge of sync handler and sync_file_db - first cut
|
2012-03-27 19:31:38 +05:30 |
|
Nabin Hait
|
a0a3ca3178
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-27 17:09:03 +05:30 |
|
Anand Doshi
|
3107096890
|
Merge branch 'master' of github.com:webnotes/erpnext into shf_merge
|
2012-03-27 15:02:38 +05:30 |
|
Anand Doshi
|
063fe503db
|
fix in queries in stock reconciliation
|
2012-03-26 22:32:34 +05:30 |
|
Anand Doshi
|
c009450ef0
|
fix in item addition - details fetching
|
2012-03-26 14:17:30 +05:30 |
|
Nabin Hait
|
e2fe5629f0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-26 11:07:01 +05:30 |
|
Rushabh Mehta
|
9d0ea6a5f1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 07:25:22 +02:00 |
|
Anand Doshi
|
964dee9f18
|
fix in stock reconciliation
|
2012-03-26 10:54:05 +05:30 |
|
Anand Doshi
|
5f9501d4d8
|
Merge branch 'sync_file_db' into shf_merge
Conflicts:
erpnext/projects/doctype/project/project.txt
|
2012-03-23 14:51:35 +05:30 |
|
Rushabh Mehta
|
aaac794a8e
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-22 06:08:04 +01:00 |
|
Nabin Hait
|
40d4b4d939
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 10:34:13 +05:30 |
|
Nabin Hait
|
2f82219fd0
|
item query changes in stock entry
|
2012-03-22 10:32:06 +05:30 |
|
Nabin Hait
|
9066dcaba5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-22 10:26:07 +05:30 |
|
Nabin Hait
|
bad13149b2
|
item query changes in stock entry
|
2012-03-22 10:24:26 +05:30 |
|
Nabin Hait
|
f676824791
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 17:08:35 +05:30 |
|
Rushabh Mehta
|
c1f8af58d1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 11:29:06 +01:00 |
|
Nabin Hait
|
2a68bdf231
|
Update erpnext/stock/doctype/stock_entry/stock_entry.txt
|
2012-03-21 15:50:14 +05:30 |
|
Rushabh Mehta
|
e07c38f5f5
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 11:06:38 +01:00 |
|
Nabin Hait
|
c37cb4d7c3
|
Update erpnext/stock/doctype/stock_entry/stock_entry.js
|
2012-03-21 15:35:41 +05:30 |
|
Nabin Hait
|
ac9adff1bb
|
Update erpnext/stock/doctype/stock_entry/stock_entry.py
|
2012-03-21 15:35:04 +05:30 |
|
Nabin Hait
|
7ff14ede3c
|
Update erpnext/stock/doctype/stock_entry/stock_entry.txt
|
2012-03-21 15:33:50 +05:30 |
|
Nabin Hait
|
0ad2ef2111
|
sync with respect to file
|
2012-03-21 15:02:39 +05:30 |
|
Rushabh Mehta
|
0d1e918177
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 06:33:35 +01:00 |
|
Nabin Hait
|
39a24794eb
|
Purpose others to other
|
2012-03-21 11:02:50 +05:30 |
|
Rushabh Mehta
|
454c6ac716
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 05:42:31 +01:00 |
|
Nabin Hait
|
93654a3e04
|
stock entry: new purpose others added
|
2012-03-20 14:31:14 +05:30 |
|
Rushabh Mehta
|
8d8fa66e8f
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 14:06:12 +01:00 |
|
Nabin Hait
|
b7dce7da31
|
Update erpnext/stock/doctype/delivery_note/delivery_note.js
|
2012-03-19 18:35:57 +05:30 |
|
Rushabh Mehta
|
a0a53c90f1
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 06:12:43 +01:00 |
|