Commit Graph

95 Commits

Author SHA1 Message Date
Anand Doshi
b950a71fb2 [minor] [fix] sales funnel 2013-10-31 19:07:05 +05:30
Nabin Hait
ca8ad210d2 Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Nabin Hait
49f9e284ff [report] lead details 2013-10-22 12:11:20 +05:30
Akhilesh Darjee
fcd70d04f3 [item price] item price made as an individual master and removed from price list 2013-10-18 14:24:21 +05:30
Bárbara Perretti
4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
2013-10-16 15:09:18 -03:00
Anand Doshi
988096e82d [feature] Sales Funnel visualization. Go to Selling > Analytics > Sales Funnel 2013-10-07 18:06:52 +05:30
Bárbara Perretti
a42d32f4c5 Fix translate selling_home.js 2013-10-04 14:07:56 -03:00
Anand Doshi
3df4f8898b [minor] crm funnel first cut 2013-10-04 21:19:30 +05:30
Bárbara Perretti
c5fe86c773 Fix Translate Sales_Analytics.js 2013-09-27 17:21:47 -03:00
Bárbara Perretti
dcec039da5 Fixin translation in selling/page/sales_browser/sales_browser.js 2013-09-26 18:24:15 -03:00
Bárbara Perretti
bc32535668 Fixin translation in selling/page/selling_home/selling_home.js 2013-09-26 18:18:22 -03:00
Anand Doshi
b0d996ffb1 [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Rushabh Mehta
1875fd177a [minor] [fix] missing icons in reports #589 2013-07-25 16:05:02 +05:30
Anand Doshi
2fdd874cae Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 11:02:22 +05:30
Anand Doshi
f577b09b3b [minor] [fix] sales and purchase analytics 2013-07-23 11:01:27 +05:30
Nabin Hait
d351318014 [minor] [fix] employee field while new sales person created from tree 2013-07-22 17:15:01 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Anand Doshi
0f21b324c9 Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/patch_list.py
2013-07-08 11:53:35 +05:30
Nabin Hait
70eda07bcf [report] deleted duplicate report 2013-07-08 11:33:09 +05:30
Rushabh Mehta
2eb7ceabda [forms] cleanup, fixing usability and added form dashboard 2013-07-02 18:13:26 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Anand Doshi
70902da4da Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/december_2012/deprecate_tds.py
	patches/june_2012/reports_list_permission.py
	selling/doctype/sales_bom/locale/_messages_doc.json
	selling/doctype/sales_bom/locale/ar-doc.json
	selling/doctype/sales_bom/locale/de-doc.json
	selling/doctype/sales_bom/locale/es-doc.json
	selling/doctype/sales_bom/locale/fr-doc.json
	selling/doctype/sales_bom/locale/hi-doc.json
	selling/doctype/sales_bom/locale/hr-doc.json
	selling/doctype/sales_bom/locale/nl-doc.json
	selling/doctype/sales_bom/locale/pt-BR-doc.json
	selling/doctype/sales_bom/locale/pt-doc.json
	selling/doctype/sales_bom/locale/sr-doc.json
	selling/doctype/sales_bom/locale/ta-doc.json
	selling/doctype/sales_bom/locale/th-doc.json
	selling/doctype/sales_bom_item/locale/_messages_doc.json
	selling/doctype/sales_bom_item/locale/ar-doc.json
	selling/doctype/sales_bom_item/locale/de-doc.json
	selling/doctype/sales_bom_item/locale/es-doc.json
	selling/doctype/sales_bom_item/locale/fr-doc.json
	selling/doctype/sales_bom_item/locale/hi-doc.json
	selling/doctype/sales_bom_item/locale/hr-doc.json
	selling/doctype/sales_bom_item/locale/nl-doc.json
	selling/doctype/sales_bom_item/locale/pt-BR-doc.json
	selling/doctype/sales_bom_item/locale/pt-doc.json
	selling/doctype/sales_bom_item/locale/sr-doc.json
	selling/doctype/sales_bom_item/locale/ta-doc.json
	selling/doctype/sales_bom_item/locale/th-doc.json
2013-06-26 14:07:29 +05:30
Anand Doshi
8bef70cceb Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-26 13:53:17 +05:30
Anand Doshi
bd7218979e [shipping rule] added doctypes shipping rule and shipping rule conditions 2013-06-26 13:53:01 +05:30
Rushabh Mehta
d242a8babd [patch] breakup global defaults 2013-06-25 11:46:07 +05:30
Akhilesh Darjee
78e622ef5c Deleted search criteria 2013-06-25 11:08:19 +05:30
Akhilesh Darjee
a19014a846 Moved Sales BOM & Sales BOM Item to Selling module, completed 'Available Stock for packing Items' report 2013-06-24 19:05:16 +05:30
Rushabh Mehta
7925bd7079 [merge] 2013-06-24 15:47:02 +05:30
Nabin Hait
82366d3bb8 [report] deleted old reports based on search_criteria 2013-06-24 14:31:56 +05:30
Saurabh
36cb3caaa7 [Pending so Items for purchase receipt] 2013-06-21 16:25:28 +05:30
Akhilesh Darjee
1ded5c618e [Report]Cleanup of territory target variance, sales person target variance & budget variance reports 2013-06-21 12:47:51 +05:30
Anand Doshi
d52b03a8cc Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	accounts/search_criteria/trend_analyzer/trend_analyzer.py
	buying/doctype/purchase_common/purchase_common.js
2013-06-21 12:22:52 +05:30
Akhilesh Darjee
e6974d10c2 Fixed conflict merge 2013-06-20 15:22:04 +05:30
Akhilesh Darjee
4ddc2618e8 [Report] Completed Sales Person Target Variance (Item-Group wise) 2013-06-18 18:46:02 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Saurabh
1848b71a0a [Reports][Sales and Purchase Trends][Completed] 2013-06-14 15:03:45 +05:30
Rushabh Mehta
0b61c2e10f [docs] added readme for selling 2013-06-11 14:24:25 +05:30
Akhilesh Darjee
85e1026325 Fixed selling_home.js conflicted during merge 2013-06-11 11:17:56 +05:30
Akhilesh Darjee
458bed193f ERPNext Update 2013-06-11 10:56:22 +05:30
Akhilesh Darjee
f75ebb5a1b Report partially completed - Territory Target Variance(Item-Group Wise) 2013-06-11 10:23:10 +05:30
Anand Doshi
7e2010a649 Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/patch_list.py
	projects/doctype/project/project.py
	utilities/transaction_base.py
2013-06-10 15:25:07 +05:30
Saurabh
66f10cd14f Quotation Trend 2013-06-07 18:05:16 +05:30
Saurabh
5b1e899250 [Reports] [Customers Not Buying Sinse Long Time] and [Itemwise Recommended Reorder level] 2013-06-07 13:34:16 +05:30
Saurabh
1efc8b3734 [Reprots][No Sales Order From Customer] and [Item Reorder Level] 2013-06-06 19:31:14 +05:30
Saurabh
7b48218b6f [Reports][Reorder Level] and [No Sales Order from Customer] 2013-06-05 18:17:28 +05:30
Rushabh Mehta
b394a25904 [ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9 2013-05-23 16:03:49 +05:30
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30