Nabin Hait
|
32826a8cf1
|
fixes in customerwise price list
|
2012-05-03 13:10:34 +05:30 |
|
Rushabh Mehta
|
acd0769098
|
list in listview and sales order fix
|
2012-05-03 10:20:38 +05:30 |
|
Rushabh Mehta
|
d5e1031f42
|
floating logo on left
|
2012-05-02 17:44:59 +05:30 |
|
Nabin Hait
|
ab96d12086
|
fixes in customerwise price list
|
2012-05-02 12:19:33 +05:30 |
|
Nabin Hait
|
07c3b399f6
|
field arrngement fix
|
2012-05-02 10:00:03 +05:30 |
|
Nabin Hait
|
722bbd8ef0
|
JV fix
|
2012-05-01 16:36:51 +05:30 |
|
Nabin Hait
|
796505a83e
|
field arrangement in purchase and stock cycle
|
2012-05-01 16:26:16 +05:30 |
|
Nabin Hait
|
57d7c815d2
|
field arrangement in sales cycle
|
2012-05-01 12:35:12 +05:30 |
|
Nabin Hait
|
926f46f04a
|
Fixed conflict while merging with master
|
2012-05-01 11:51:08 +05:30 |
|
Nabin Hait
|
d58da50f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-01 11:37:45 +05:30 |
|
Nabin Hait
|
1e335f3272
|
fixes in validattion of debit to account with customer in sales invoice
|
2012-05-01 10:53:50 +05:30 |
|
Nabin Hait
|
41c62727c7
|
fixes in validattion of debit to account with customer in sales invoice
|
2012-05-01 10:45:47 +05:30 |
|
Rushabh Mehta
|
79a664b4dc
|
cleaned up lead, opportunity, jv
|
2012-04-30 16:12:03 +05:30 |
|
Nabin Hait
|
0d1daa8875
|
fld order change
|
2012-04-27 13:56:58 +05:30 |
|
Nabin Hait
|
a6b7886175
|
resolved conflict while merging with master
|
2012-04-26 13:02:36 +05:30 |
|
Nabin Hait
|
50c799880a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-26 12:47:30 +05:30 |
|
Nabin Hait
|
04a276c934
|
Error fixed in gl netry when negative entry and cancel event
|
2012-04-25 16:08:45 +05:30 |
|
Nabin Hait
|
8f9a953931
|
Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py
|
2012-04-23 19:00:39 +05:30 |
|
Nabin Hait
|
e848300958
|
patch list modified
|
2012-04-23 18:24:22 +05:30 |
|
Nabin Hait
|
2bbb086b10
|
Update erpnext/accounts/doctype/rv_detail/rv_detail.txt
|
2012-04-23 17:57:18 +05:30 |
|
Nabin Hait
|
b743bb6c10
|
ledger bal export format changed
|
2012-04-23 14:03:07 +05:30 |
|
Nabin Hait
|
51834a45a7
|
purchase invoice with write off feature
|
2012-04-23 12:47:12 +05:30 |
|
Nabin Hait
|
f7c506d69e
|
fixed conflict while merging with master branch
|
2012-04-20 13:58:43 +05:30 |
|
Nabin Hait
|
e72ae2a19b
|
fixed conflict
|
2012-04-20 13:41:09 +05:30 |
|
Nabin Hait
|
0788570ce7
|
automatically write off feature in sales invoice
|
2012-04-20 13:31:05 +05:30 |
|
Nabin Hait
|
239e79038f
|
Customer/customer group wise price list
|
2012-04-20 10:25:03 +05:30 |
|
Anand Doshi
|
f642168a26
|
hr home: changed Allocate Leaves --> Leave Allocation Tool
|
2012-04-18 18:35:30 +05:30 |
|
Anand Doshi
|
385380125b
|
fixes in customize form, naming series form loading
|
2012-04-18 16:04:02 +05:30 |
|
Nabin Hait
|
5da9d56047
|
removed voucher date filter
|
2012-04-17 18:05:58 +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
|
24e18569d9
|
fixes in install docs for roles
|
2012-04-17 11:45:35 +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 |
|
Rushabh Mehta
|
71085592a4
|
fixed account_browser
|
2012-04-16 18:36:46 +05:30 |
|
Rushabh Mehta
|
6820dbf72d
|
framework build
|
2012-04-16 13:33:14 +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 |
|
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 |
|
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 |
|
Rushabh Mehta
|
d76146372e
|
merge
|
2012-04-13 12:01:23 +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
|
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
|
2424387651
|
fixes after sync testing
|
2012-04-10 19:14:37 +05:30 |
|
Nabin Hait
|
af094b9daf
|
ledger balance export report in new format
|
2012-04-10 18:07:36 +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
|
82042f1cff
|
fixes after sync
|
2012-04-06 17:54:17 +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
|
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 |
|
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 |
|
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
|
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 |
|
Nabin Hait
|
dc8ce0190d
|
Merge branch 'master' into renamedt
|
2012-03-29 11:53:02 +05:30 |
|
Anand Doshi
|
9767f79845
|
fix in Sales Order-Receivable Voucher Mapper
|
2012-03-28 19:25:29 +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
|
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
|
bb769c5461
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 08:04:17 +02:00 |
|
Nabin Hait
|
6ed0450dba
|
reload mapper for checking ref value
|
2012-03-28 11:32:44 +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 |
|
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 |
|
Anand Doshi
|
c009450ef0
|
fix in item addition - details fetching
|
2012-03-26 14:17:30 +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 |
|
Nabin Hait
|
f88326ba3f
|
sync ref db
|
2012-03-22 15:07:05 +05:30 |
|
Rushabh Mehta
|
27cf13b541
|
merge
|
2012-03-22 11:37:56 +05:30 |
|
Rushabh Mehta
|
3f46696db2
|
removed slider ui
|
2012-03-22 11:37:08 +05:30 |
|
Nabin Hait
|
f676824791
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-21 17:08:35 +05:30 |
|
Rushabh Mehta
|
2d229b423e
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 12:28:42 +01:00 |
|
Nabin Hait
|
d551281cbe
|
cdt not defined fixed
|
2012-03-21 16:57:08 +05:30 |
|
Nabin Hait
|
0ad2ef2111
|
sync with respect to file
|
2012-03-21 15:02:39 +05:30 |
|
Nabin Hait
|
e8da15cb5b
|
sync ref file
|
2012-03-21 12:45:14 +05:30 |
|
Rushabh Mehta
|
f74ef4c64b
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 07:18:41 +01:00 |
|
Rushabh Mehta
|
a665c1f60d
|
stylefixes and listviews
|
2012-03-21 11:47:58 +05:30 |
|
Rushabh Mehta
|
dad4e3ebac
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 07:17:28 +01:00 |
|
Nabin Hait
|
5f04061291
|
changes in recurring invoice print format
|
2012-03-21 11:47:00 +05:30 |
|
Rushabh Mehta
|
454c6ac716
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 05:42:31 +01:00 |
|
Rushabh Mehta
|
437c1b512c
|
listview update and form fix
|
2012-03-20 18:45:28 +05:30 |
|
Nabin Hait
|
ba62cf3b5a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-20 17:40:16 +05:30 |
|
Nabin Hait
|
39c26f4580
|
billing period in recurring sales invoice mail
|
2012-03-20 17:39:48 +05:30 |
|
Nabin Hait
|
ceb9f41f15
|
lead organization fld added in quotation for printing: patch
|
2012-03-20 17:04:32 +05:30 |
|
Anand Doshi
|
d05aad6474
|
fix in POS invoice
|
2012-03-20 12:33:02 +05:30 |
|
Anand Doshi
|
4f5e92a06c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-03-20 12:17:50 +05:30 |
|
Anand Doshi
|
3401086d66
|
POS Invoice fix
|
2012-03-20 12:07:18 +05:30 |
|
Rushabh Mehta
|
d48417c93b
|
slide navigation fixes
|
2012-03-19 18:42:13 +05:30 |
|
Rushabh Mehta
|
ffe9d358e8
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 12:40:07 +01:00 |
|
Nabin Hait
|
65ad3b1a0f
|
Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py
|
2012-03-19 17:09:14 +05:30 |
|
Rushabh Mehta
|
6498cee998
|
fixed conflict
|
2012-03-19 09:01:16 +01:00 |
|
Nabin Hait
|
b6cd3316c4
|
error fixed in lease receipts client wise
|
2012-03-19 13:27:06 +05:30 |
|
Anand Doshi
|
f02c9e7b6c
|
fix in due_date fetching for receivable voucher
|
2012-03-19 11:43:24 +05:30 |
|
Rushabh Mehta
|
7afaa8665d
|
major reworking of page navigation
|
2012-03-16 18:28:09 +05:30 |
|
Rushabh Mehta
|
2438de4c9b
|
fixed tags in list2
|
2012-03-15 16:43:46 +05:30 |
|
Rushabh Mehta
|
08b670bddd
|
listing with stats
|
2012-03-14 19:06:20 +05:30 |
|
Rushabh Mehta
|
9a1bdf7224
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-07 18:20:33 +05:30 |
|
Nabin Hait
|
00260870d1
|
fixes in rv
|
2012-03-07 12:50:55 +05:30 |
|
Rushabh Mehta
|
0dd5da2299
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-06 18:41:52 +05:30 |
|
Rushabh Mehta
|
15da133de9
|
removed
|
2012-03-06 18:41:11 +05:30 |
|
Nabin Hait
|
b659457b4d
|
Removed def value from invoice naming series
|
2012-03-06 11:07:24 +05:30 |
|
Nabin Hait
|
cf9c4c45a5
|
export /import fld hide issue, discount issue
|
2012-03-05 15:21:35 +05:30 |
|
Nabin Hait
|
9cee59cd05
|
field order changed
|
2012-03-05 10:54:54 +05:30 |
|
Nabin Hait
|
89a30ff7dc
|
Company 'all' removed from financial statements
|
2012-03-02 17:15:01 +05:30 |
|
Nabin Hait
|
0d155a9135
|
print hide issue
|
2012-03-02 14:57:44 +05:30 |
|
Nabin Hait
|
88986ca007
|
column break print hide issue
|
2012-03-02 12:29:08 +05:30 |
|
Nabin Hait
|
db4af96388
|
issue fixed in pos
|
2012-03-01 18:47:51 +05:30 |
|
Nabin Hait
|
e3ce5b4e0c
|
voucher date removal issue fixed
|
2012-03-01 17:37:36 +05:30 |
|
Nabin Hait
|
be0b090d27
|
voucher date removal issue fixed
|
2012-03-01 17:31:51 +05:30 |
|
Anand Doshi
|
496d9a0980
|
Merge branch 'master' into navupdate
|
2012-03-01 14:55:22 +05:30 |
|
Nabin Hait
|
b95ad21208
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-03-01 14:48:13 +05:30 |
|
Nabin Hait
|
cf907f98bd
|
error fixed in posting balance
|
2012-03-01 14:47:56 +05:30 |
|
Anand Doshi
|
552093c3fd
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
version.num
|
2012-03-01 13:51:23 +05:30 |
|
Anand Doshi
|
1f4efc77ac
|
fix in print formats and file rename
|
2012-03-01 13:50:33 +05:30 |
|
Nabin Hait
|
eaf144a545
|
form cleanup in pur cycle
|
2012-03-01 13:05:04 +05:30 |
|
Nabin Hait
|
6d517ff005
|
form cleanup: fixed callback issues
|
2012-03-01 10:57:23 +05:30 |
|
Nabin Hait
|
63b275c97f
|
allowed debit and credit against same acc head
|
2012-03-01 10:35:35 +05:30 |
|
Nabin Hait
|
6c75cce4b9
|
fixed confilct
|
2012-02-28 11:46:43 +05:30 |
|
Anand Doshi
|
f9e4b16731
|
fix in scheduler related import issue
|
2012-02-28 11:31:46 +05:30 |
|
Nabin Hait
|
5bdd20c46b
|
dynamic label change, form cleanup, hide/unhide in purchase cycle
|
2012-02-27 18:46:51 +05:30 |
|
Nabin Hait
|
0959341130
|
Form Cleanup: Dynamic label change, smart hide/unhide and dependencies
|
2012-02-27 12:47:40 +05:30 |
|
Nabin Hait
|
0cde984dc5
|
Update future year balances at the time of tranaction and acc bal reposting patch
|
2012-02-27 12:34:14 +05:30 |
|
Rushabh Mehta
|
3966f1dc5d
|
added license files
|
2012-02-23 12:35:32 +05:30 |
|
Rushabh Mehta
|
c5471ddb8d
|
added setup and removed multi-col layout in body
|
2012-02-22 12:07:42 +05:30 |
|
Rushabh Mehta
|
35fabf76a6
|
updated module pages
|
2012-02-21 19:03:50 +05:30 |
|
Rushabh Mehta
|
d025133b39
|
added module pages and other css updates
|
2012-02-21 17:26:50 +05:30 |
|
Nabin Hait
|
6ac0be5fb2
|
delete all cancelled gl entry on account deletion
|
2012-02-20 13:04:36 +05:30 |
|
Nabin Hait
|
2d8ac7f3f9
|
fixed asynchronus issue
|
2012-02-15 17:31:23 +05:30 |
|
Nabin Hait
|
ab90ee04f5
|
callback issues and item default get most priority
|
2012-02-15 14:28:02 +05:30 |
|
Nabin Hait
|
84d73103f8
|
sales team mapping issue in SO-DN and SO-RV
|
2012-02-14 15:13:21 +05:30 |
|
Anand Doshi
|
ce0c65f173
|
Merge branch 'stable' into latest
|
2012-02-13 18:01:23 +05:30 |
|
Rushabh Mehta
|
f17ce7bc67
|
added whitelist check
|
2012-02-13 16:50:52 +05:30 |
|
Anand Doshi
|
702f174265
|
call update item details in post render
|
2012-02-13 15:29:41 +05:30 |
|
Anand Doshi
|
15d2d45b36
|
Merge branch 'stable' into latest
|
2012-02-10 10:57:26 +05:30 |
|
Anand Doshi
|
110047ea5b
|
Debit/Credit note creation on purchase/sales return
|
2012-02-10 10:48:35 +05:30 |
|
Anand Doshi
|
cf5f0232a9
|
Merge branch 'stable' into latest
|
2012-02-08 16:23:35 +05:30 |
|
Anand Doshi
|
df3f452a14
|
Fix in Purchase Invoice creation due to item tax stringify issue
|
2012-02-08 16:22:59 +05:30 |
|
Anand Doshi
|
9908d6e4be
|
Merge branch 'stable' into latest
|
2012-02-08 11:05:47 +05:30 |
|
Anand Doshi
|
c9fcc05792
|
Allow IS POS to be set as default from customize form view
|
2012-02-08 10:46:27 +05:30 |
|
Anand Doshi
|
4e47c48707
|
Merge branch 'stable' into latest
|
2012-02-07 13:33:10 +05:30 |
|
Anand Doshi
|
7e8082e193
|
Fixed mapping of conversion rate for PO-PR and PO-PV
|
2012-02-07 13:32:20 +05:30 |
|
Anand Doshi
|
67d2c8396c
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-02-07 10:59:29 +05:30 |
|
Anand Doshi
|
e00e70841c
|
Merge branch 'stable' into latest
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
|
2012-02-07 10:58:45 +05:30 |
|
Anand Doshi
|
d008964fd6
|
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
|
2012-02-07 10:48:11 +05:30 |
|
Rushabh Mehta
|
e651648b1b
|
added missing icons
|
2012-02-06 16:28:06 +05:30 |
|
Anand Doshi
|
6d5cd01e03
|
Merge branch 'stable' into latest
|
2012-02-02 15:36:58 +05:30 |
|
Anand Doshi
|
2cb047d5a4
|
Added search field 'account_type' in account doctype
|
2012-02-02 15:36:34 +05:30 |
|
Anand Doshi
|
62427a6024
|
Merge branch 'stable' into latest
|
2012-02-02 15:23:33 +05:30 |
|
Anand Doshi
|
962c2aa80d
|
Auto fetch default bank account for jv of type Bank Voucher
|
2012-02-02 15:22:11 +05:30 |
|
Rushabh Mehta
|
bc5ec4f19e
|
version
|
2012-01-30 14:02:41 +05:30 |
|
Rushabh Mehta
|
d6840b202a
|
added products + cleanups
|
2012-01-30 14:00:46 +05:30 |
|
Anand Doshi
|
e72de12993
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-30 11:59:05 +05:30 |
|
Anand Doshi
|
76a4caeada
|
fix in send notification part of recurring invoices
|
2012-01-27 14:34:26 +05:30 |
|
Anand Doshi
|
f5738817db
|
fix in recurring invoice
|
2012-01-27 14:18:09 +05:30 |
|
Anand Doshi
|
707cd06606
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
|
2012-01-27 12:30:35 +05:30 |
|
Anand Doshi
|
02c662936f
|
Merge branch 'master' into latest
|
2012-01-27 12:28:21 +05:30 |
|
Anand Doshi
|
74d1b65105
|
changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch
|
2012-01-27 12:25:09 +05:30 |
|
Rushabh Mehta
|
51e51da63f
|
added about_us
|
2012-01-27 12:17:09 +05:30 |
|
Rushabh Mehta
|
865c00a79a
|
started website
|
2012-01-24 14:33:21 +05:30 |
|
Anand Doshi
|
26814e7bad
|
Remove Get TDS button, which appears twice in JV
|
2012-01-19 14:26:25 +05:30 |
|
Anand Doshi
|
890aa0f51d
|
fix: interface error due to use of sql instead of webnotes.conn.sql
|
2012-01-18 12:25:20 +05:30 |
|
Anand Doshi
|
a318235a1f
|
Fix: Paid amount + Write Off Amount and grand total difference calculation with 2 decimal precision
|
2012-01-13 15:53:46 +05:30 |
|
Anand Doshi
|
266829f024
|
Merge branch 'master' into stable
|
2012-01-10 13:59:14 +05:30 |
|
Anand Doshi
|
a0aa3d5605
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-01-10 13:59:04 +05:30 |
|
Anand Doshi
|
a9df960494
|
On Print Hide, hide net_total, rounded_total_export and grand_total_export
|
2012-01-09 16:55:30 +05:30 |
|
Anand Doshi
|
58455c9d8e
|
Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed
|
2012-01-06 14:33:57 +05:30 |
|
Anand Doshi
|
5e57a39bb1
|
Merge branch 'master' into stable
|
2012-01-04 19:32:01 +05:30 |
|
Anand Doshi
|
f80f20f480
|
Changes in Notifications
|
2012-01-04 19:31:32 +05:30 |
|
Anand Doshi
|
6ac1d4bb44
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
|
2012-01-03 11:45:11 +05:30 |
|
Anand Doshi
|
d56d57d205
|
Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login
|
2012-01-02 16:25:05 +05:30 |
|
Anand Doshi
|
10748d6bdb
|
Merge pull request #190 from anandpdoshi/master
Changed link for customer master and supplier master in accounts browser
|
2011-12-28 03:49:13 -08:00 |
|
Anand Doshi
|
eaa6d21691
|
Changed link for customer master and supplier master in accounts browser
|
2011-12-28 17:18:09 +05:30 |
|
Nabin Hait
|
9e08c12a10
|
Default price list currency issue in delivery note fixed
|
2011-12-28 16:30:48 +05:30 |
|
Nabin Hait
|
3029474b0e
|
Fixes in recurring invoice
|
2011-12-27 16:42:03 +05:30 |
|
Nabin Hait
|
382dc6e819
|
GL Mapper changes for JV
|
2011-12-23 18:25:11 +05:30 |
|
Nabin Hait
|
d0a892ffe7
|
print hide price list flds
|
2011-12-22 19:04:49 +05:30 |
|
Nijil Y
|
9e6f00abab
|
fixes for notification
|
2011-12-21 14:54:14 +05:30 |
|
Nabin Hait
|
60fc54a9ba
|
Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form
|
2011-12-20 18:59:26 +05:30 |
|
Nabin Hait
|
b2150de64b
|
Freezing Error fixed in purchase invoice
|
2011-12-15 16:29:04 +05:30 |
|
Nabin Hait
|
9e4d5b9649
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-14 11:27:50 +05:30 |
|
Nabin Hait
|
f21ceb283c
|
Arranged field order in item table
|
2011-12-14 11:26:05 +05:30 |
|
Nabin Hait
|
dcac0e7565
|
Merge pull request #156 from anandpdoshi/master
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
|
2011-12-13 05:37:41 -08:00 |
|
Nabin Hait
|
08d803791d
|
Merge branch 'master' of git://github.com/nijil/erpnext
|
2011-12-13 18:49:59 +05:30 |
|
Nabin Hait
|
85e8e01fd6
|
notification email for recurring invoice
|
2011-12-13 18:48:24 +05:30 |
|
Nijil Y
|
8fb260504a
|
purchase discount
|
2011-12-13 18:14:15 +05:30 |
|
Anand Doshi
|
206df20f36
|
Changes in print formats to include selected print heading and discount
appended in description
|
2011-12-13 15:57:09 +05:30 |
|
Anand Doshi
|
5245e6547b
|
Change path of images in accounts browser and sales browser
|
2011-12-12 19:18:23 +05:30 |
|
Nabin Hait
|
8a6b3b8713
|
Validation added in c-form
|
2011-12-12 14:16:16 +05:30 |
|
Nijil Y
|
fdc7fc62a5
|
payable voucher.js
|
2011-12-12 10:50:18 +05:30 |
|
Nijil Y
|
b54d7282a7
|
pvdetail
|
2011-12-12 10:31:23 +05:30 |
|
Nijil Y
|
38821f6104
|
txt order update
|
2011-12-08 18:32:58 +05:30 |
|
Nabin Hait
|
fd20340576
|
Introduced C-form for Indian customer
|
2011-12-08 17:49:40 +05:30 |
|
Nijil Y
|
edf8bc2a3e
|
Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
Conflicts:
erpnext/accounts/doctype/pv_detail/pv_detail.txt
erpnext/buying/doctype/po_detail/po_detail.txt
erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
|
2011-12-08 17:29:24 +05:30 |
|
Nijil Y
|
add0c85648
|
Discount in purchase cycle
|
2011-12-08 16:53:12 +05:30 |
|
Nijil Y
|
d8e5bed9e5
|
Discount in purchase cycle
|
2011-12-08 16:09:18 +05:30 |
|
Nabin Hait
|
38d24534d7
|
Recurring invoice checkbox added in features setup
|
2011-12-06 19:04:21 +05:30 |
|
Nabin Hait
|
a4fdc84fda
|
Introduced recurring invoices
|
2011-12-06 15:04:47 +05:30 |
|
Nijil
|
2f82c29348
|
..
|
2011-11-24 15:18:17 +05:30 |
|
Nijil
|
ba40bc93fe
|
payable voucher txt
|
2011-11-24 15:14:09 +05:30 |
|
Nijil
|
c37dad26d9
|
txt files
|
2011-11-24 15:07:54 +05:30 |
|
Nabin Hait
|
e92066fa80
|
modified fld prop in gl entry and index patch
|
2011-11-24 15:04:47 +05:30 |
|
Anand Doshi
|
956d665738
|
Merge pull request #148 from anandpdoshi/master
Modified GLEntry doctype to be not in create
|
2011-11-24 00:29:53 -08:00 |
|
Anand Doshi
|
96e5343519
|
Marked GLEntry as Not In Create
|
2011-11-24 13:51:09 +05:30 |
|
Nabin Hait
|
04176e62d8
|
fixed error in internal reco
|
2011-11-23 12:15:42 +05:30 |
|
Nijil
|
54eb735a47
|
Added Discount in Purchase Cycle
|
2011-11-22 15:12:00 +05:30 |
|
Nabin Hait
|
f164b269db
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-11-16 16:39:16 +05:30 |
|
Nabin Hait
|
b0fa2af45b
|
Rewritten landed cost wizard
|
2011-11-16 16:20:37 +05:30 |
|
Anand Doshi
|
bf41aef7f0
|
Merge pull request #144 from anandpdoshi/master
Changes in spartan print formats to show border in chrome
|
2011-11-16 01:20:33 -08:00 |
|
Anand Doshi
|
19a2767b77
|
Changes in spartan print formats to show border in chrome
|
2011-11-16 14:49:37 +05:30 |
|
Anand Doshi
|
0900756510
|
Merge pull request #143 from anandpdoshi/master
Changes in Sales Invoice Print Formats
|
2011-11-16 00:34:36 -08:00 |
|
Anand Doshi
|
9fe4331862
|
Changes in Sales Invoice Print Format
|
2011-11-16 14:03:52 +05:30 |
|
Anand Doshi
|
ded71563c8
|
Merge pull request #142 from anandpdoshi/master
New Print Formats as part of erpnext repository
|
2011-11-16 00:02:43 -08:00 |
|
Anand Doshi
|
e3559853bd
|
Added new Print Formats as part of repository
|
2011-11-16 13:18:45 +05:30 |
|
Nabin Hait
|
0c92493c81
|
Fixed check_for_acc_of_supplier validation
|
2011-11-16 10:12:32 +05:30 |
|
Nabin Hait
|
5b7badaf20
|
supplier account head validated with supplier
|
2011-11-11 12:37:53 +05:30 |
|
Nabin Hait
|
cc02fd445c
|
Repair button only visible after submit
|
2011-11-07 12:14:28 +05:30 |
|
Nabin Hait
|
612efe843b
|
POS Setting js code restored from history
|
2011-10-21 16:19:58 +05:30 |
|
Nabin Hait
|
57dd62d790
|
project column moved to item table in pur cycle
|
2011-10-20 19:19:07 +05:30 |
|
Nabin Hait
|
69554511da
|
fixes in patch
|
2011-10-19 16:35:39 +05:30 |
|
Nabin Hait
|
7762bdaf77
|
Letter head issue fixed in print format
|
2011-10-19 15:05:26 +05:30 |
|
Nabin Hait
|
1a1ce709e0
|
Changes regarding POS fields
|
2011-10-13 14:08:33 +05:30 |
|
Nabin Hait
|
ee9efb568b
|
flds added in mapper
|
2011-10-12 12:42:07 +05:30 |
|
Nabin Hait
|
685564f71d
|
Resolved conflict after merging with master
|
2011-10-11 14:42:34 +05:30 |
|
Nabin Hait
|
fb37157163
|
packing slip related changes and test case for item
|
2011-10-11 13:57:48 +05:30 |
|
Nabin Hait
|
2810691979
|
field hide/unhide for pos
|
2011-10-10 12:33:43 +05:30 |
|
Nabin Hait
|
6a0561612f
|
cost center groupto ledger and vice versa
|
2011-10-10 12:23:10 +05:30 |
|
Nabin Hait
|
1971942db8
|
purchase tax mapping while pulling
|
2011-10-05 14:56:16 +05:30 |
|
Nabin Hait
|
c8d5625763
|
removed trashed profile from user search result
|
2011-09-27 15:26:29 +05:30 |
|
Nabin Hait
|
d9a16a282c
|
deleted gl_entry.js file
|
2011-09-27 15:10:07 +05:30 |
|
Nabin Hait
|
ec451da2f4
|
Re-written update_against_document_in_jv function in RV and PV
|
2011-09-27 12:47:59 +05:30 |
|
Nabin Hait
|
e2df68bb5b
|
reload internal reconciliation
|
2011-09-27 12:47:09 +05:30 |
|
Nabin Hait
|
80ed6b25e8
|
deleted gl_control.js file
|
2011-09-27 11:53:23 +05:30 |
|
Nabin Hait
|
3c8a50c257
|
Trial balance opening issue fixed if there is no prev year
|
2011-09-27 11:16:30 +05:30 |
|
Nabin Hait
|
a77cea2b90
|
Dont add opening entries in account balance debit, credit column
|
2011-09-27 11:14:54 +05:30 |
|
Nabin Hait
|
c752d075e6
|
fixed issue in reseting in opening balance, clear bal only that company
|
2011-09-27 11:04:24 +05:30 |
|
Nabin Hait
|
c034e3d531
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-27 10:55:24 +05:30 |
|
Nabin Hait
|
39297e5775
|
update_nsm_model in cost center on_trash()
|
2011-09-27 10:36:17 +05:30 |
|
Nabin Hait
|
d223d12308
|
Rewritten update_against_document function
|
2011-09-26 18:57:43 +05:30 |
|
Nabin Hait
|
5f2046496b
|
Internal Reconciliation: for knock out booking and payment entries
|
2011-09-26 18:56:02 +05:30 |
|
Nabin Hait
|
2736fd59ca
|
fixed cancelled gl entry issue in period closing voucher
|
2011-09-26 12:55:52 +05:30 |
|
Nabin Hait
|
f060d0cd16
|
contact address will be fetched in sales invoice onload when come through mapper
|
2011-09-16 17:28:49 +05:30 |
|
Rushabh Mehta
|
2adbd89ada
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-15 15:09:14 +05:30 |
|
Rushabh Mehta
|
53ba83158c
|
fixes to startup
|
2011-09-15 15:06:23 +05:30 |
|
Nabin Hait
|
3b19f6b7c8
|
opening balance fixes in general ledger
|
2011-09-15 14:38:54 +05:30 |
|
Rushabh Mehta
|
0aed26d83d
|
moved report to folder
|
2011-09-15 13:00:46 +05:30 |
|
Rushabh Mehta
|
2773940db1
|
merged from master
|
2011-09-15 12:55:25 +05:30 |
|
Rushabh Mehta
|
1e11cb486d
|
merging from master and usability fixes to setup
|
2011-09-14 13:25:10 +05:30 |
|
Rushabh Mehta
|
5f50617121
|
removed readme
|
2011-09-13 15:48:51 +05:30 |
|
Rushabh Mehta
|
8cf45175a7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-08 14:17:41 +05:30 |
|
Rushabh Mehta
|
aa7b05aaeb
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-06 12:47:51 +05:30 |
|
Rushabh Mehta
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|