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 |
|
Anand Doshi
|
85eb840ab4
|
fix in rename dt patch
|
2012-04-09 12:02:15 +05:30 |
|
Rushabh Mehta
|
b43f949e93
|
website smaller
|
2012-04-08 20:33:51 +05:30 |
|
Anand Doshi
|
82042f1cff
|
fixes after sync
|
2012-04-06 17:54:17 +05:30 |
|
Nabin Hait
|
3525d92cfb
|
c-form reload pach
|
2012-04-06 17:49:25 +05:30 |
|
Nabin Hait
|
c63a58d416
|
c-form reload pach
|
2012-04-06 17:42:02 +05:30 |
|
Nabin Hait
|
7da6ebc9af
|
Attachment option and total invoiced amt added in c-form
|
2012-04-06 17:30:53 +05:30 |
|
Nabin Hait
|
1299dab010
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-06 15:19:18 +05:30 |
|
Nabin Hait
|
05e4fc6eb6
|
Chart of account/cc link only for accounts user and account manager role in account home page
|
2012-04-06 15:19:02 +05:30 |
|
Anand Doshi
|
7e0479bc4c
|
cleanup of search criteria
|
2012-04-05 18:27:56 +05:30 |
|
Nabin Hait
|
9ba2e49468
|
Update erpnext/selling/doctype/sales_common/sales_common.js
|
2012-04-05 16:54:19 +05:30 |
|
Nabin Hait
|
758eed555c
|
Update erpnext/selling/doctype/sales_common/sales_common.js
|
2012-04-05 16:45:33 +05:30 |
|
Nabin Hait
|
f77c940fcf
|
fixed price list currency issue
|
2012-04-05 16:29:02 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +05:30 |
|
Anand Doshi
|
00ceafb42d
|
fix in fiscal year of email digest
|
2012-04-03 18:43:17 +05:30 |
|
Anand Doshi
|
fc8bf7b1d8
|
add select type link fields in permission control
|
2012-04-03 13:49:14 +05:30 |
|
Anand Doshi
|
e9c505608a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-03 13:23:14 +05:30 |
|
Anand Doshi
|
a6eb15df4a
|
fix in earning and deduction type field tyep
|
2012-04-03 13:22:20 +05:30 |
|
Anand Doshi
|
130dfaee8c
|
fix in todo
|
2012-04-03 12:18:35 +05:30 |
|
Nabin Hait
|
1b81badd58
|
validation changes for po item
|
2012-04-03 11:27:03 +05:30 |
|
Anand Doshi
|
be9562dcd5
|
rerun of rename_dt
|
2012-04-02 19:13:00 +05:30 |
|
Anand Doshi
|
5112b5b6b8
|
rerun of rename_dt
|
2012-04-02 19:12:29 +05:30 |
|
Anand Doshi
|
5c6cdb06b2
|
fix in decimal places
|
2012-04-02 15:02:34 +05:30 |
|
Rushabh Mehta
|
c7f1e5a54a
|
patch fixes
|
2012-04-02 14:24:35 +05:30 |
|
Rushabh Mehta
|
5475a3ca66
|
patch fixes
|
2012-04-02 14:06:46 +05:30 |
|
Anand Doshi
|
896c6fdc3c
|
fix in patch order
|
2012-04-02 14:06:33 +05:30 |
|
Anand Doshi
|
0442bc5d63
|
fix in patch list
|
2012-04-02 13:09:20 +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 |
|
Anand Doshi
|
8ac5ccae0a
|
fix in Sales Order-Receivable Voucher Mapper
|
2012-03-28 19:29:55 +05:30 |
|
Anand Doshi
|
9767f79845
|
fix in Sales Order-Receivable Voucher Mapper
|
2012-03-28 19:25:29 +05:30 |
|
Anand Doshi
|
419260298b
|
fix in mapper
|
2012-03-28 19:12:36 +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 |
|
Nabin Hait
|
79bc01e33d
|
updated rename_dt
|
2012-03-28 16:19:01 +05:30 |
|
Nabin Hait
|
6370ba8280
|
Merge branch 'master' of github.com:webnotes/erpnext into renamedt
|
2012-03-28 16:17:53 +05:30 |
|
Rushabh Mehta
|
0dfa140b7d
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 10:42:20 +02:00 |
|
Nabin Hait
|
e6340f26c2
|
mapper fix in DN_RV
|
2012-03-28 14:11:31 +05:30 |
|
Rushabh Mehta
|
c0fdaaf2c6
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 08:08:47 +02:00 |
|
Nabin Hait
|
5b00addaf7
|
reload mapper for checking ref value
|
2012-03-28 11:38:25 +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 |
|
Nabin Hait
|
df77a1f619
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-28 11:32:58 +05:30 |
|
Nabin Hait
|
6ed0450dba
|
reload mapper for checking ref value
|
2012-03-28 11:32:44 +05:30 |
|
Anand Doshi
|
b489297108
|
added delete_docformat in patch_list
|
2012-03-27 19:41:45 +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
|
66ea30543c
|
sync patches
|
2012-03-27 15:02:30 +05:30 |
|
Anand Doshi
|
94d26f0338
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-26 22:34:18 +05:30 |
|
Anand Doshi
|
063fe503db
|
fix in queries in stock reconciliation
|
2012-03-26 22:32:34 +05:30 |
|
Rushabh Mehta
|
91c79305e8
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 12:11:22 +02:00 |
|
Nabin Hait
|
854935f12c
|
added docstatus in item get_query in PV
|
2012-03-26 15:40:56 +05:30 |
|
Nabin Hait
|
b66ade11e0
|
modified item code get_query in purchase cycle
|
2012-03-26 15:30:11 +05:30 |
|
Rushabh Mehta
|
20dc45f7bd
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 10:50:40 +02:00 |
|
Anand Doshi
|
c009450ef0
|
fix in item addition - details fetching
|
2012-03-26 14:17:30 +05:30 |
|
Nabin Hait
|
eecea8ef19
|
modified item code get_query in purchase cycle
|
2012-03-26 13:11:15 +05:30 |
|
Rushabh Mehta
|
4227d3fe58
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 08:23:18 +02:00 |
|
Nabin Hait
|
9329b5a461
|
modified item code get_query in purchase cycle
|
2012-03-26 11:52:16 +05:30 |
|
Rushabh Mehta
|
4a19819fe9
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 08:12:32 +02:00 |
|
Anand Doshi
|
4943af6d6c
|
fix in address issue - customer coming in supplied field
|
2012-03-26 11:42:09 +05:30 |
|
Rushabh Mehta
|
6fd7395101
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 08:03:19 +02:00 |
|
Nabin Hait
|
ea36202fbf
|
modified item code get_query in purchase cycle
|
2012-03-26 11:33:03 +05:30 |
|
Rushabh Mehta
|
5b80423dbb
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-26 07:55:45 +02:00 |
|
Nabin Hait
|
2bd086f1c3
|
modified item code get_query in purchase cycle
|
2012-03-26 11:25:31 +05:30 |
|