Rushabh Mehta
|
49f9747385
|
major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267)
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc
* fix: remove debug
|
2018-08-30 18:50:48 +05:30 |
|
Nabin Hait
|
f6b784e39e
|
Test fixes
|
2018-08-30 18:42:35 +05:30 |
|
Shreya Shah
|
68348d4130
|
[Attendance-Tool] Filter employees based on date of joining (#15262)
|
2018-08-30 17:25:58 +05:30 |
|
Shreya Shah
|
3df2639a32
|
Optimize patch (#15263)
|
2018-08-30 17:24:03 +05:30 |
|
Prateeksha Singh
|
75ae844d70
|
Merge pull request #15247 from frappe/hub-redesign
[encore] MarketPlace
|
2018-08-30 17:12:41 +05:30 |
|
Prateeksha Singh
|
ecad873d19
|
[hub] remove item.js, fix seller decription condition
|
2018-08-30 16:21:26 +05:30 |
|
Nabin Hait
|
2390da647f
|
GSTR-1 minor fixes
|
2018-08-30 16:16:48 +05:30 |
|
Prateeksha Singh
|
5797565dd0
|
Merge with upstream
|
2018-08-30 16:15:27 +05:30 |
|
Prateeksha Singh
|
ff52e93e69
|
[hub] Merge conflicts
|
2018-08-30 16:11:41 +05:30 |
|
Prateeksha Singh
|
997bfa4916
|
[hub] add review timeline element
|
2018-08-30 16:08:52 +05:30 |
|
Faris Ansari
|
f3034ae262
|
feat: Add Report Item dialog
|
2018-08-30 16:05:15 +05:30 |
|
Faris Ansari
|
8e04487253
|
fix: Rename 'Product' to 'Item'
|
2018-08-30 15:35:17 +05:30 |
|
Prateeksha Singh
|
dc36d52ef9
|
[hub] fix review send
|
2018-08-30 15:12:18 +05:30 |
|
Faris Ansari
|
6b695d32b2
|
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
|
2018-08-30 14:36:14 +05:30 |
|
Faris Ansari
|
90265aec24
|
fix: Page container routing
|
2018-08-30 14:36:05 +05:30 |
|
Faris Ansari
|
062cd62484
|
fix: Add restrictions for session user who is not hub seller
|
2018-08-30 14:35:56 +05:30 |
|
Prateeksha Singh
|
bff2bdc858
|
[hub] UI and empty state in 'your products' to guide on publishing
|
2018-08-30 12:58:46 +05:30 |
|
Prateeksha Singh
|
47f5f0e608
|
[hub] remove See All from non expandable sections
|
2018-08-30 12:16:08 +05:30 |
|
Prateeksha Singh
|
a4c24bda65
|
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
|
2018-08-30 12:01:39 +05:30 |
|
Prateeksha Singh
|
b20c4e3184
|
[hub] remove client hub_settings scripts
- multiline to single line messages to translate
|
2018-08-30 12:01:04 +05:30 |
|
Faris Ansari
|
d32e7f8d02
|
fix: Administrator cannot register on marketplace
|
2018-08-30 11:53:46 +05:30 |
|
Faris Ansari
|
95e4141bf2
|
fix: Remove unused imports
|
2018-08-30 11:46:14 +05:30 |
|
Shreya Shah
|
e3f855498f
|
Update README.md
|
2018-08-30 10:41:53 +05:30 |
|
Shreya Shah
|
9c03ed0a42
|
Update README.md
move codetriage badge with other badges
|
2018-08-30 10:41:37 +05:30 |
|
Zlash65
|
80f5cb05cc
|
fixes in setting end_date and manual provision of start&end date
|
2018-08-30 10:39:48 +05:30 |
|
Zlash65
|
91eae54383
|
manually provide start and end date
|
2018-08-30 10:39:48 +05:30 |
|
Zlash65
|
d0e37327e6
|
start date logic fix
|
2018-08-30 10:39:48 +05:30 |
|
Zlash65
|
7b3fd85943
|
end date / stop date calc fix
|
2018-08-30 10:39:48 +05:30 |
|
Zlash65
|
4ce8c7f383
|
end date should reset if start date is changed
|
2018-08-30 10:39:48 +05:30 |
|
Zlash65
|
d676a67769
|
validate changing service stop date once its set
|
2018-08-30 10:39:48 +05:30 |
|
Zlash65
|
339c2e9f15
|
book last gl_entry based on service stop date
|
2018-08-30 10:39:48 +05:30 |
|
Zlash65
|
243863a290
|
validation for stop date added
|
2018-08-30 10:39:48 +05:30 |
|
Zlash65
|
33cff7735e
|
service stop date field added
|
2018-08-30 10:39:48 +05:30 |
|
Rushabh Mehta
|
f31e6153cc
|
readme: codetriage badge
|
2018-08-30 10:36:01 +05:30 |
|
Rushabh Mehta
|
20fd2ddd1c
|
ux(hr): module listing and quick entry for employee
|
2018-08-30 09:21:54 +05:30 |
|
Prateeksha Singh
|
04d051bb73
|
[hub] add review area
|
2018-08-30 02:42:13 +05:30 |
|
Prateeksha Singh
|
89ed2d9b34
|
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
|
2018-08-30 02:33:28 +05:30 |
|
Prateeksha Singh
|
a6f184bcb7
|
[hub] remove old post and preprocess, log with minimal info
|
2018-08-30 02:30:40 +05:30 |
|
Faris Ansari
|
114d595de9
|
fix: Set hub_url in Hub Settings
- add patch to set the value
|
2018-08-29 18:24:49 +05:30 |
|
Faris Ansari
|
e4c7729089
|
fix(Hub Settings): Set site_name before seller registration
|
2018-08-29 17:13:43 +05:30 |
|
Faris Ansari
|
b7126c23f7
|
fix(Hub Settings): Remove unused fields
|
2018-08-29 17:13:16 +05:30 |
|
Rushabh Mehta
|
13bcc4e27e
|
perms: fix default import, export perms
|
2018-08-29 17:10:27 +05:30 |
|
Nabin Hait
|
28f9b0a9ab
|
(fix)test case: loyalty program, course schedule and more
|
2018-08-29 17:05:11 +05:30 |
|
Faris Ansari
|
458cf6fcc5
|
style: remove trailing spaces
|
2018-08-29 16:19:39 +05:30 |
|
Faris Ansari
|
8683bd82ed
|
fix: Base64 extraction
- use requests to fetch the image without storing it anywhere
- only read local files
|
2018-08-29 16:18:36 +05:30 |
|
Faris Ansari
|
ff8f1c6120
|
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
|
2018-08-29 15:02:47 +05:30 |
|
Faris Ansari
|
64202ad416
|
fix: Only a System Manager can register as a seller
- every other user has read only access
|
2018-08-29 15:02:39 +05:30 |
|
Prateeksha Singh
|
02c176c0e6
|
[hub] fix code lint issues, styles
|
2018-08-29 14:27:47 +05:30 |
|
Nabin Hait
|
a804d6d487
|
Fixed merge conflict
|
2018-08-29 13:34:58 +05:30 |
|
Nabin Hait
|
d982e8fcda
|
Merge branch 'hotfix'
|
2018-08-29 13:13:54 +05:30 |
|