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

23775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prateeksha Singh
8a160684b7 [fix] filter() result in list 2018-09-04 10:59:20 +05:30
Faris Ansari
f8af7e0b3d
Merge pull request #15309 from frappe/hub-multiuser 
fix: Revert skeleton in Sidebar
 2018-09-04 10:43:52 +05:30
Faris Ansari
7be9c381d8 fix: Revert skeleton in Sidebar 
- sidebar items repeating for some reason
 2018-09-04 00:12:47 +05:30
Faris Ansari
74a32e6ffe
Merge pull request #15305 from frappe/hub-multiuser 
feat: Add skeleton to Home and Sidebar
 2018-09-03 19:40:22 +05:30
Faris Ansari
66321e6af7 feat: Add skeleton to Home and Sidebar 2018-09-03 19:39:19 +05:30
Prateeksha Singh
76f2430152
Merge pull request #15303 from frappe/hub-multiuser 
Hub Multiuser
 2018-09-03 18:57:41 +05:30
Prateeksha Singh
1265a26c0c Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 18:50:25 +05:30
Prateeksha Singh
456c39336d [hub] update settings after publish, fix route_map 2018-09-03 18:49:33 +05:30
Faris Ansari
2b80bbbe16 Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 17:50:06 +05:30
Prateeksha Singh
6ba9b3f4de [hub] hide Contact Seller and Save Item in read-only 2018-09-03 17:49:11 +05:30
Faris Ansari
b592a76016 fix: Selling Messages 2018-09-03 17:49:11 +05:30
Prateeksha Singh
ad6948844e Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 17:32:17 +05:30
Prateeksha Singh
b2eadfe31d [hub] show become a seller button to all, but not dialog 2018-09-03 17:31:43 +05:30
Faris Ansari
49ccdd6f07 fix: Move image saving code to hub server 2018-09-03 17:24:17 +05:30
Faris Ansari
d4bba297c2 fix: Container title 2018-09-03 17:12:22 +05:30
Saurabh
1fe1884b73 Merge branch 'master' into develop 2018-09-03 17:00:17 +05:30
Saurabh
fba985d49d Merge branch 'hotfix' 2018-09-03 17:00:15 +05:30
Saurabh
4bd562d669 bumped to version 10.1.51 2018-09-03 17:30:15 +06:00
Faris Ansari
28652baacc Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:54:04 +05:30
Faris Ansari
b296be041e fix: email in profile dialog 2018-09-03 16:53:56 +05:30
Prateeksha Singh
bffb707c17 [fix] add message for admin users before register dialog 
- use is_registered api for page routes
 2018-09-03 16:39:59 +05:30
Prateeksha Singh
8fe5e8adf8 Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:15:42 +05:30
Prateeksha Singh
adef70f8df [hub] update_hub_url patch to use marketplace_url 2018-09-03 16:12:50 +05:30
Frappe PR Bot
5c0a831ff2 [Translation] Updated Translations (#15299) 2018-09-03 15:58:04 +05:30
Faris Ansari
ad0be6aaa2 fix: Messages 
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
 2018-09-03 15:43:09 +05:30
Prateeksha Singh
18e3c61109 [marketplace] Disallow unregistered routes if not registered 2018-09-03 15:22:13 +05:30
Prateeksha Singh
47cc30da85 [hub] ask company description in dialog 2018-09-03 13:11:23 +05:30
Shreya Shah
bb88e964a4 Remove unnecessary code (#15296) 2018-09-03 13:01:12 +05:30
Nabin Hait
13109aef9d fix: validate only if service stop date 2018-09-03 12:18:17 +05:30
Frappe PR Bot
3921660747 [Translation] Updated Translations (#15285) 2018-09-03 11:14:57 +05:30
Prateeksha Singh
85563ddfd3 [hub] update publish hub api 2018-09-03 02:44:27 +05:30
Prateeksha Singh
5511e06f06 [hub][api] Update save and view api to be user specific 2018-09-03 02:25:41 +05:30
Prateeksha Singh
2cf52e53dd Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-02 19:46:30 +05:30
Prateeksha Singh
a094c0f3f1 [fix] encrypted password in Hub User child record by frappe/frappe#6048 
- use save() instead of insert()
 2018-09-02 19:45:56 +05:30
Faris Ansari
68129df74c feat: Add add_user dialog and methods 
- wip
 2018-09-02 18:29:00 +05:30
Nabin Hait
41b630759c fixed type 2018-09-01 18:37:07 +05:30
Nabin Hait
4e187e88f8 ignore non stock items in stock entry against work order 2018-09-01 18:15:33 +05:30
Prateeksha Singh
b2b745fc7a [hub] simplify marketplace settings, remove company fields 
- Company attributes will be fetched/calculated to send to server
- removed them as fields in settings
- Added description in company, with existing logo field
- TODO: for things like logo and description, ask user to set in master
 2018-09-01 17:20:08 +05:30
Faris Ansari
255dd0e03d feat: Add new registration flow 2018-09-01 14:30:46 +05:30
Prateeksha Singh
ddcf3b4345 [hub] merge with upstream 2018-09-01 10:33:24 +05:30
Prateeksha Singh
4e1fd0b417 [hub] register_seller -> register_marketplace 
- resgister_seller will be for subsequent users
- make username and password readonly
- check if password present before trying to create connection
 2018-09-01 09:55:43 +05:30
Prateeksha Singh
810ae01832 [hub] make client connection for first registered user 
- remove usage of Hub Connector
 2018-09-01 01:14:29 +05:30
Prateeksha Singh
1801cc8962 [fix] hub_url -> marketplace_url 2018-09-01 00:39:08 +05:30
Prateeksha Singh
747c464248 [fix] save() -> insert() for single doc, use doc.append in child table 2018-09-01 00:12:17 +05:30
Prateeksha Singh
a8065ff725 [hub] move register_seller to api, remove old code 2018-08-31 22:41:26 +05:30
Prateeksha Singh
c726fce4b1 [hub] set first user's password in marketplace users 2018-08-31 20:42:48 +05:30
Prateeksha Singh
3588486e5b
[fix] hub_settings -> marketplace_settings in call 2018-08-31 20:12:33 +05:30
Prateeksha Singh
ea2b9cbd1c [hub] add user selection in register 2018-08-31 17:56:50 +05:30
Faris Ansari
5f76c0caf4
Merge pull request #15284 from netchampfaris/marketplace-fixes-4 
fix: Allow read permission to everyone on Marketplace Settings
 2018-08-31 17:37:13 +05:30
Faris Ansari
dc1a2e2a37 fix: Allow read permission to everyone on Marketplace Settings 2018-08-31 17:31:22 +05:30