Commit Graph

241 Commits

Author SHA1 Message Date
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +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
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