Commit Graph

164 Commits

Author SHA1 Message Date
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +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
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
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
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
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
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
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
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
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
Rushabh Mehta
6498cee998 fixed conflict 2012-03-19 09:01:16 +01:00
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