Faris Ansari
c05bf262f1
Merge pull request #15279 from netchampfaris/marketplace-fixes-3
...
- feat: Add disable marketplace option in Hub Settings
- fix: Rename Hub Settings -> Marketplace Settings
2018-08-31 16:52:26 +05:30
Valmik
2175b90b8d
Added feature to optimize routes, also cleaned up code ( #15193 )
2018-08-31 16:39:29 +05:30
Faris Ansari
f9a66c1c36
fix: Rename Hub Settings -> Marketplace Settings
2018-08-31 16:30:34 +05:30
Rushabh Mehta
a2288ff8e7
fix(assessment_result): student must be in group ( #15255 )
...
* fix(assessment_result): student must be in group
* fix(test_student_group): raise correct exception
* fix(unused-import): assessment-plan.py
* fix(tests)
* fix(tests)
* fix(test)
* fix(tests)
2018-08-31 16:12:49 +05:30
Faris Ansari
25f509ebd3
feat: Add disable marketplace option in Hub Settings
2018-08-31 15:35:32 +05:30
Nabin Hait
1b73505391
Update sales_invoice.py
2018-08-31 14:56:16 +05:30
Nabin Hait
3c56aa9c1d
minor fixes
2018-08-31 14:51:01 +05:30
Nabin Hait
9cc28a77c9
minor fixes
2018-08-31 14:49:20 +05:30
Ameya Shenoy
96c89f478f
Merge pull request #15278 from codingCoffee/indent
...
indentation: fixes
2018-08-31 09:14:09 +00:00
Ameya Shenoy
203152d67e
indentation: fixes
2018-08-31 14:33:48 +05:30
Nabin Hait
9ecd8cc004
Merge branch 'Zlash65-defer-stop-date' into develop
2018-08-31 13:30:21 +05:30
Nabin Hait
e033df2757
minor fixes
2018-08-31 13:30:03 +05:30
Nabin Hait
b259e3eb06
Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date
2018-08-31 12:39:46 +05:30
Saurabh
5c3590fa8d
Merge branch 'master' into develop
2018-08-31 11:29:14 +05:30
Saurabh
1ef72c0b66
Merge branch 'hotfix'
2018-08-31 11:29:13 +05:30
Saurabh
648191b9e8
bumped to version 10.1.50
2018-08-31 11:59:13 +06:00
Shreya Shah
ee8f8281b4
[py3] Convert filter object to list ( #15260 )
2018-08-30 19:22:22 +05:30
Faris Ansari
91ac26c2ff
fix(seller dialog): Email should be session user email ( #15270 )
2018-08-30 19:19:57 +05:30
rohitwaghchaure
624927bf0b
[Fix] Not able to export the Supplier-Wise Sales Analytics report ( #15271 )
2018-08-30 19:19:14 +05:30
Charles-Henri Decultot
7e86d7b014
Add default payable account for expense claims ( #15246 )
2018-08-30 19:18:26 +05:30
Bassam Ramadan
8d7c1868d6
fix for fields names at sales invoice return payments and verifying the payment amount ( #15245 )
...
* fix for payments field names in sales invoice return
* add verification for payment amount at sales invoice return
adding verification to be sure the payment amount is negative at sales
invoice return
* correction for precision field name
2018-08-30 19:15:15 +05:30
KanchanChauhan
0cd5313c69
Validate Completed Qty and Produced qty in Stock Entry for Manufacture ( #15248 )
2018-08-30 19:11:15 +05:30
Nabin Hait
9983d41fb0
Fixed divison error
2018-08-30 19:10:36 +05:30
Faris Ansari
00f6aef947
fix(publish items): Filter out disabled items ( #15268 )
2018-08-30 18:54:28 +05:30
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
