Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,626 Commits 3 Branches 0 Tags 1 GiB
6bf7bd6a9f
Commit Graph

406 Commits

Author SHA1 Message Date
Faris Ansari
6d2f6c2e4d Search improved, code refactor 2017-08-23 16:25:16 +05:30
Faris Ansari
26df5b8c00 Connect Numpad events with POSCart 2017-08-23 13:12:12 +05:30
Rohit Waghchaure
b73321c577 Item search refactor 2017-08-23 12:15:10 +05:30
Faris Ansari
78c81d9c6c Refactor payment code 2017-08-21 15:05:33 +05:30
Faris Ansari
eba50c6860 Merge branch 'pos-refactor' of https://github.com/netchampfaris/erpnext into pos-refactor 2017-08-18 17:00:02 +05:30
Rohit Waghchaure
f03a73466c Added modal for multi mode payment, provision to add write off and change amount 2017-08-18 12:15:19 +05:30
Faris Ansari
0f3d431476 Update cart ui from cur_frm, Add number pad 2017-08-17 12:56:14 +05:30
Rohit Waghchaure
b1daab4284 Added functional part 2017-08-17 12:56:14 +05:30
Faris Ansari
a0f8687945 Styling for search fields 2017-08-17 12:56:14 +05:30
Faris Ansari
03e7ec29e7 Add clusterize, move customer field to POSCart, get POS profile 2017-08-17 12:56:14 +05:30
Faris Ansari
6e7db034f2 [wip] New POS UI 2017-08-17 12:56:14 +05:30
Faris Ansari
21fc26c2a2 Update cart ui from cur_frm, Add number pad 2017-08-14 18:25:59 +05:30
Rohit Waghchaure
854d335ab1 Added functional part 2017-08-14 11:34:42 +05:30
Faris Ansari
f7c7ff4aae Styling for search fields 2017-08-10 18:28:05 +05:30
Faris Ansari
65c4bd6db6 Add clusterize, move customer field to POSCart, get POS profile 2017-08-10 17:17:49 +05:30
Faris Ansari
519cc09979 [wip] New POS UI 2017-08-10 17:17:49 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
Faris Ansari
4fcd8a6db3 Fix sales funnel legend position (Fixes #5073) (#8838) 2017-05-16 07:40:26 +05:30
Nabin Hait
7228e1af6e Customer/Supplier Name in sales/purchase analytics (#8717) 2017-05-06 12:45:37 +05:30
nick9822
acb5e9a11b Sales analytics error after upgrade 
Hi Team,

We were getting errors in sales analytics report after the upgrade. 
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6

With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.

Thanks,
Nick
 2017-02-03 12:31:54 +05:30
mbauskar
83f4780f74 [Fixes] Address and Contact fixes 2017-01-30 10:45:28 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 (#7136) 2016-12-05 14:17:26 +05:30
Rushabh Mehta
9872d8cdb5 Revert "[optimize] remove count(*) from queries" 2016-11-21 21:04:47 +05:30
Rushabh Mehta
5a258cbc2d [optimize] remove count(*) from queries 2016-11-21 14:57:36 +05:30
Saurabh
a9ba7343c4 [fix] deprecate browser pages for accounts, cost_center, sales , bom, item group 2016-06-25 11:06:14 +05:30
Saurabh
eda1afb4eb [fixes] comnify tree view 2016-06-25 11:06:13 +05:30
Anand Doshi
51ad436e16 [fix] sales and accounts browser name 2016-06-09 19:37:35 +05:30
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
sbkolate
f9a9754dab opportunities status fix in Sales Funnel report 
reference https://discuss.erpnext.com/t/sales-funnel-not-showing-updated-opportunities/10702/4
 2016-02-24 19:25:35 +05:30
Rushabh Mehta
5760b79747 [translations] fixes #4533 2016-01-04 15:57:01 +05:30
Rushabh Mehta
1f63747916 [minor] [fix] add child in sales browser 2015-12-23 16:23:37 +05:30
Rushabh Mehta
e8ab320028 [fix] rename tree item fixes #2524 2015-12-15 12:06:37 +05:30
Anand Doshi
da79740cdf [fix] injection 2015-11-17 18:27:50 +05:30
Rushabh Mehta
a7099eaa8d [minor] [fix] Use customer_name in Sales Analytics 2015-10-12 16:22:10 +05:30
Rushabh Mehta
be9edae961 [fixes] to task test case and fix tree ui for mobile 2015-09-04 16:18:17 +05:30
Neil Trini Lasrado
a1f1edc786 Typo fixes in Sales Person 2015-06-29 16:04:12 +05:30
Rushabh Mehta
e2e1471f4d [fix] fix breadcrumbs for sales browser fixes #3240 2015-05-15 14:05:10 +05:30
Rushabh Mehta
f5f0d5a83a [breadcrumbs] refactor 2015-03-09 15:48:16 +05:30
Anand Doshi
e514323be4 load all js and css like before in desk.html 2015-03-06 13:17:26 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Nabin Hait
82e3e25cdb fixes for base_rate, base_amount, tax_amount: mass search and replace 2015-02-24 10:02:28 +05:30
Anand Doshi
8c0f05fbae [minor] grid report loading 2015-02-17 19:53:23 +05:30
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Rushabh Mehta
81e972eac4 [cleanups] 2015-01-19 17:34:54 +05:30
Anand Doshi
3f5e95a99e [design] Fixed Grid Reports 2015-01-01 16:26:18 +05:30
Rushabh Mehta
4c36d7388c [ux] fixed creation via tree views for Item Group etc 2015-01-01 15:59:34 +05:30
Rushabh Mehta
bfaf0a8f43 [tree] [ui] 2015-01-01 12:49:18 +05:30
Rushabh Mehta
4096a3ab2b [design] form toolbar 2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99 [design] pos 2014-12-26 12:52:11 +05:30
81552433qqcom
351be9ca42 translations. 2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54 various translation missed __() 2014-09-12 16:07:11 +05:30
Nabin Hait
b15764ef2c Translation issue fixed in analytics/grid report 2014-06-03 13:02:39 +05:30
Nabin Hait
8de61559b0 Minor fixes in sales / purchase analytics. Fixes #1701 2014-05-30 11:22:11 +05:30
Rushabh Mehta
f944e819e9 fixes #1581 and added icons to grid reports 2014-05-27 15:22:04 +05:30
Nabin Hait
48962e1148 Minor fix in sales funnel report 2014-04-28 15:43:32 +05:30
Anand Doshi
3e41fd1fd3 List route for tree browser based doctypes; Fixes to add child in tree browsers 2014-04-22 18:55:21 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
40534f076b Changed creation, modified format frappe/frappe#478 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 frappe/frappe#478 2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a frappe/frappe#478 2014-03-27 17:51:41 +05:30
Rushabh Mehta
7c932003ed rename Profile to User frappe/frappe#470 2014-03-11 16:15:59 +05:30
Rushabh Mehta
73f0bf36c1 fixed #1454 2014-03-06 14:45:02 +05:30
Anand Doshi
f5794f1c07 Module Home Pages using Module View 2014-03-03 15:06:34 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Rushabh Mehta
e0e3f92019 fixed sales / accounts tree 2014-02-19 12:43:16 +05:30
Rushabh Mehta
793ba6bd37 -webnotes +frappe 💥 2014-02-14 15:47:51 +05:30
Akhilesh Darjee
462740f72b sales funnel fix 2014-02-06 13:14:15 +05:30
Rushabh Mehta
1cd96a136f updates for restriction 2014-01-24 11:10:24 +05:30
Anand Doshi
9a4a13cb73 Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes 2013-12-31 17:38:21 +05:30
Rushabh Mehta
4ac68952e8 Moved patches and fixed method routing in pages 2013-12-27 13:43:40 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Anand Doshi
1fc9ae2230 Fixes and Validations for nested doctypes 2012-09-24 14:00:59 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d added sales analytics 2012-09-21 15:19:40 +05:30
Anand Doshi
998d39f71b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-24 12:17:33 +05:30
Anand Doshi
ba278000d7 edit / add nodes allowed in sales browser, only if user has valid permissions 2012-08-24 12:15:44 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Rushabh Mehta
cf969143f2 cleaned up customer group 2012-07-12 09:54:43 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Nabin Hait
611157447f sms fix 2012-05-22 17:25:39 +05:30
Anand Doshi
3fa25faca2 fixes after merge with cms 2012-05-10 15:15:43 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Rushabh Mehta
252664e288 remove unsupported for google 2012-05-07 10:43:18 +05:30
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Rushabh Mehta
519f70b384 new autosuggest, other fixes 2012-03-09 16:44:21 +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
Rushabh Mehta
09a897afe4 added selling-home 2012-02-20 18:30:52 +05:30
Rushabh Mehta
f17ce7bc67 added whitelist check 2012-02-13 16:50:52 +05:30
Rushabh Mehta
e651648b1b added missing icons 2012-02-06 16:28:06 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Rushabh Mehta
3a751e8f82 added blog subscriber, unsubscribe 2012-01-27 18:00:14 +05:30
Anand Doshi
5245e6547b Change path of images in accounts browser and sales browser 2011-12-12 19:18:23 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30