Commit Graph

7263 Commits

Author SHA1 Message Date
Anand Doshi
8e65dae35c [minor] [cleanup] add roles in setup control 2013-10-07 19:25:50 +05:30
Anand Doshi
988096e82d [feature] Sales Funnel visualization. Go to Selling > Analytics > Sales Funnel 2013-10-07 18:06:52 +05:30
Anand Doshi
9f6e836ba5 Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-10-04 21:20:00 +05:30
Anand Doshi
3df4f8898b [minor] crm funnel first cut 2013-10-04 21:19:30 +05:30
Rushabh Mehta
ae307e8bf8 [setup wizard] Started - WIP 2013-10-04 17:48:05 +05:30
Rushabh Mehta
28eb2bffa4 Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-10-04 13:33:45 +05:30
Rushabh Mehta
acc876e0d7 [minor] [fix] status updater, only change communication status when called explicitly 2013-10-04 13:33:24 +05:30
Anand Doshi
de4f8e6929 [minor] [demo] fixed Lead.csv 2013-10-04 13:20:39 +05:30
Anand Doshi
3ab6a65743 [minor] [fix] communication status patch 2013-10-03 19:32:23 +05:30
Rushabh Mehta
9dda0fb63b Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-10-03 18:13:40 +05:30
Rushabh Mehta
6856d74a1b [minor] fixes to crm patch 2013-10-03 18:12:36 +05:30
Rushabh Mehta
800b3aa437 [crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order 2013-10-03 17:26:33 +05:30
Rushabh Mehta
43247cedea [issues] [minor] fixed multiple minor issues 2013-10-03 14:50:55 +05:30
Anand Doshi
fd3addab7e [minor] [fix] [demo] 2013-10-03 13:19:51 +05:30
Rushabh Mehta
f1b6f67a98 [Delivery Note] Moved prevdoc to Sales Order and Sales Invoice so links will work webnotes/erpnext#868 2013-10-03 12:22:52 +05:30
Anand Doshi
fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
2013-10-02 16:52:52 +05:30
Nabin Hait
efa94ce1bf [fix] [minor] fixe in patch 2013-10-02 16:40:14 +05:30
Nabin Hait
dd110b2998 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-02 16:30:11 +05:30
Nabin Hait
a1d1c980bc [minor] fixes in stock balance report, bin uom and sle is_cancelled 2013-10-02 16:29:45 +05:30
Anand Doshi
c49986f092 [minor] [fix] price list table 2013-10-02 16:14:30 +05:30
Rushabh Mehta
ea9f845814 feature to set / unset birthday reminders webnotes/erpnext#851 2013-10-02 16:02:02 +05:30
Anand Doshi
6f817b58ea [minor] [fix] item price grid 2013-10-02 15:16:22 +05:30
Rushabh Mehta
8c2e4e1e1f [wsgi] [minor] fixed webnotes.local.form_dict 2013-10-02 14:34:25 +05:30
Rushabh Mehta
24ca7e4e2e Added Transactions for Import webnotes/erpnext#911 2013-10-02 14:25:36 +05:30
Anand Doshi
2ebbe95e04 [minor] [fix] item prices html table 2013-10-02 12:44:59 +05:30
Nabin Hait
a37ff498fe Merge branch 'master' of github.com:webnotes/erpnext 2013-10-01 18:14:49 +05:30
Nabin Hait
cf3011839f [fix] [minor] bind onclick function based on docstatus in pos 2013-10-01 18:14:16 +05:30
Anand Doshi
b6177cbb5b [minor] change filename to unicode after os.walk and os.listdir 2013-10-01 17:11:39 +05:30
Nabin Hait
49e71400ac [patch] [minor] fix wrong customers in pos 2013-10-01 15:20:06 +05:30
Nabin Hait
cde7f829d6 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-01 11:23:22 +05:30
Nabin Hait
d780baeacc [fix] [minor] fixes in old patch 2013-10-01 11:22:51 +05:30
Nabin Hait
a3e9d0a83d Merge pull request #921 from akhileshdarjee/master
[fix] [minor] new grid to hide delete button on new row & added description
2013-09-30 22:30:15 -07:00
Akhilesh Darjee
67a9ea6800 [price_list] [minor] move header of new grid to right if currency 2013-09-30 19:05:36 +05:30
Akhilesh Darjee
4233ae2258 [pos] pos related fixes 2013-09-30 18:18:19 +05:30
Nabin Hait
263b25c217 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-30 17:58:38 +05:30
Nabin Hait
cadc6e1b2b [fix] [minor] dont call is_pos trigger in onload of pos invoice 2013-09-30 17:57:37 +05:30
Nabin Hait
300ae0cdf4 [fix] [minor] dont call is_pos trigger in onload of pos invoice 2013-09-30 17:57:22 +05:30
Akhilesh Darjee
eb8753e8b6 [fix] [minor] new grid to hide delete button on new row & added description 2013-09-30 15:56:36 +05:30
Nabin Hait
238f56480c Merge pull request #920 from akhileshdarjee/master
[price_list] [minor] fix of new grid
2013-09-30 03:17:11 -07:00
Akhilesh Darjee
9cb2cdbce6 [price_list] [minor] fix of new grid 2013-09-30 15:43:00 +05:30
Nabin Hait
b8ef5a3fe3 Merge pull request #917 from fogueri/master
[docs] new pages on doctype and markup
2013-09-30 01:38:56 -07:00
Nabin Hait
aaa6c99f56 Merge pull request #918 from akhileshdarjee/master
[price_list] new grid for price list
2013-09-30 01:38:27 -07:00
Akhilesh Darjee
7d36fc821b [fix] [minor] new grid fix to hide other grid 2013-09-30 12:44:00 +05:30
Akhilesh Darjee
d086d724b6 [price_list] new grid finished with fixes 2013-09-30 11:37:44 +05:30
Akhilesh Darjee
ff15367a1d Merge branch 'master' of github.com:webnotes/erpnext 2013-09-30 11:35:36 +05:30
Priya
d1972dd4ca [docs] new pages on doctype and markup 2013-09-30 10:44:13 +05:30
Akhilesh Darjee
2ba61236c1 [price list] make new grid 2013-09-27 21:08:37 +05:30
Nabin Hait
a3d12bde9d [fix] [minor] gross profit report 2013-09-27 16:33:22 +05:30
Anand Doshi
8db093b4c6 [minor] update password 2013-09-27 14:08:55 +05:30
Nabin Hait
164d39d12f Merge pull request #883 from akhileshdarjee/master
[feature] pos view added in all sales & purchase cycle
2013-09-27 00:05:15 -07:00