Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,299 Commits 3 Branches 0 Tags
Commit Graph

1042 Commits

Author SHA1 Message Date
Faris Ansari
fbe9a46d51 Add Marketplace link to user dropdown in toolbar 2018-08-01 15:56:39 +05:30
Faris Ansari
709a4a3f4e Break marketplace.js into multiple files 2018-08-01 14:09:07 +05:30
Faris Ansari
c0a22a689e Item Menu dropdown 2018-08-01 13:35:32 +05:30
Faris Ansari
057839298c fix get_category call 2018-07-31 19:06:11 +05:30
Faris Ansari
300c07c3d9 Use hub.call for categories and favourites 2018-07-31 18:02:13 +05:30
Faris Ansari
1ff25279bf Remove old hub styles 2018-07-31 17:59:03 +05:30
Faris Ansari
b1d6f94cdf Merge branch 'hub-redesign' into hub-redesign-contact-seller 2018-07-31 14:54:58 +05:30
Faris Ansari
2ae80fd000 wip 2018-07-31 12:02:20 +05:30
Prateeksha Singh
425356c21c [hub] remove test code 2018-07-31 10:45:53 +05:30
Prateeksha Singh
46df72d55d [hub] test progress trigger 2018-07-30 13:24:01 +05:30
Prateeksha Singh
efbd2ee3f5 [hub] Realtime Sync Progress 
- Show progress from the migration plan
- Show products being synced
- Disallow publishing in sync state
 2018-07-30 09:17:14 +05:30
Prateeksha Singh
811cc3f78f [hub] resolve merge conflicts 2018-07-29 18:05:07 +05:30
Prateeksha Singh
d27b27f88a Hub Seller Profile and Timeline 
- profile details fetched from server
- timeline updates on publishing items
 2018-07-29 16:52:16 +05:30
Prateeksha Singh
6f05ea124e [hub] Track Hub Sync on the Server 
- Create a Hub Seller activity on start of Hub Sync
- Store its name as remote_id in the Run
- Update that activity remotely once the Run here is complete, status
 2018-07-29 14:40:52 +05:30
Faris Ansari
296848cb69 Publish Page 
- Code cleanup
- Separate local item card and hub item card
- Use make_search_bar
 2018-07-28 16:14:22 +05:30
Faris Ansari
abcc8ab8e5 Push review area to bottom 2018-07-28 13:57:16 +05:30
Prateeksha Singh
d0a1a4fe90 [hub] differentiate self-published items 2018-07-28 13:16:09 +05:30
Prateeksha Singh
f6f429fb10 [hub] Item page skeleton 2018-07-28 12:25:14 +05:30
Prateeksha Singh
dd8045759f [hub] Published Products Page 2018-07-28 01:54:51 +05:30
Faris Ansari
19d40cafba Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-07-27 21:51:31 +05:30
Faris Ansari
b7a63ab81e Homepage 
- show random items from each hub seller
- show items from country
- move add_review method on hub
 2018-07-27 21:51:26 +05:30
Prateeksha Singh
f4fbf5215b [hub][search] empty search and route fallback 2018-07-27 21:07:56 +05:30
Faris Ansari
44f7d2e62b SearchPage 2018-07-27 15:33:00 +05:30
Faris Ansari
24d5f17255 NotFound page for marketplace 2018-07-26 19:22:58 +05:30
Faris Ansari
b5ce1976b8 Move marketplace code back to marketplace.js 2018-07-26 18:46:38 +05:30
Faris Ansari
521fe4d01d Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-07-26 18:39:34 +05:30
Faris Ansari
cae856cbda Add marketplace back to hub_listing 2018-07-26 18:39:28 +05:30
Faris Ansari
f4884f8108 Marketplace 
- Cache hub calls
- call_hub_method using FrappeClient connection
- Become a seller UX fixes
 2018-07-26 18:37:01 +05:30
Faris Ansari
2ca5afa214 Move marketplace ui to marketplace.js 2018-07-26 18:35:04 +05:30
Prateeksha Singh
d450c0ac08 [hub][publish] in_progress/empty state 2018-07-26 17:24:33 +05:30
Prateeksha Singh
b750425288 [hub] sync in progress 2018-07-26 16:25:22 +05:30
Prateeksha Singh
d1224ca662 [hub][init] add profile page 2018-07-26 13:39:06 +05:30
Prateeksha Singh
f26177bdbc [hub] setup publish items flow 2018-07-26 10:38:11 +05:30
Prateeksha Singh
1d1696080e [hub][publish] add search, fix multiple append 2018-07-26 08:36:33 +05:30
Prateeksha Singh
505f6f14e9 [hub][publish] select/deselect all items 2018-07-26 08:06:21 +05:30
Prateeksha Singh
9685d7c37a [hub] registered vs read-only views 2018-07-26 01:12:00 +05:30
Prateeksha Singh
cf2d2a5c75 [hub][init] add publish items page 2018-07-25 20:02:12 +05:30
Prateeksha Singh
bc8caefc19 [hub] add register as a seller page 2018-07-25 11:08:23 +05:30
Faris Ansari
0fbaa72504 Add review area 2018-07-25 00:49:11 +05:30
Faris Ansari
ea2d1b0a19 New page: marketplace 
- subpages: home, favourites, item, category
 2018-07-23 18:44:46 +05:30
Faris Ansari
f585197045 Cleanup homepage 2018-07-23 11:55:07 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Shreya Shah
8395a7ad6f Modifications in last purchase rate button (#14948) 
* Make last purchase rate button visible until submitted

* Move buttons

- Get last purchase rate and link to material request buttons moved to toolbar under Tools button

* Remove disable fetch last rate functionality

* Make last purchase rate field read_only
 2018-07-18 12:27:27 +05:30
Faris Ansari
9e874af9ba Query report print (#14935) 
* QueryReport

- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns

* Query Report

- Replace frappe.query_report_filters_by_name with new API
 2018-07-18 09:28:44 +05:30
Nabin Hait
26786bd35d minor route fix for general ledger 2018-07-17 15:59:15 +05:30
Doridel Cahanap
6f06cc27e6 Update Qty and Rate in PO and SO 2018-07-13 17:02:08 +05:30
Zarrar
9a3b785a03 [Minor] Employee Separation Fix (#14867) 
* delete associated task & project forcefully
in Employee Seapration cancel trigger

* remove leftover print statement

* remove console statements
 2018-07-11 14:34:55 +05:30
Manas Solanki
da486eeebd Loyalty Program (#12631) 
* First Cut for the Loyalty Program

* finished the collection part

* redmeption for the loyalty point

	update the loyalty point entry in the FIFO style
	make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
	update the outstanding balance in the client side

* completed for the desk viewe

* wrap up for the desk and shopping cart

* pos

* fix and test the travis
 2018-07-06 12:36:57 +05:30
Zarrar
c1225a84cc fix css for coa dialog in setup wizard (#14793) 2018-07-03 10:35:31 +05:30
Ranjith Kurungadam
a10f118ddd Payroll Entry - Validate Attendance (#14738) 2018-06-28 23:28:07 +05:30