rohitwaghchaure
|
3fa54905a2
|
Merge pull request #17814 from rohitwaghchaure/new_pricing_rule_not_exists_issue
fix: pricing rule not exists issue
|
2019-05-30 22:25:45 +05:30 |
|
Rohit Waghchaure
|
ac8f4b449d
|
fix: pricing rule not exists issue
|
2019-05-30 22:24:24 +05:30 |
|
deepeshgarg007
|
2580075583
|
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
|
2019-05-30 22:11:27 +05:30 |
|
deepeshgarg007
|
52ea2874ec
|
fix: Multiple fixes in accounting dimensions
|
2019-05-30 22:09:36 +05:30 |
|
Shivam Mishra
|
46b3446da0
|
refactor: add check for max passing score
|
2019-05-30 18:55:16 +05:30 |
|
Shivam Mishra
|
7c7053fcf5
|
refactor: added question type field
|
2019-05-30 18:54:58 +05:30 |
|
Shivam Mishra
|
253a2bd260
|
refactor: goodbye Vue 👋
|
2019-05-30 18:54:11 +05:30 |
|
Shivam Mishra
|
e94e9d2b06
|
feat: content navigation and activity tracking working
|
2019-05-30 18:23:03 +05:30 |
|
Nabin Hait
|
0e1e37c921
|
fix: Added Expense Account field to push value from PO-PR-PI
|
2019-05-30 18:13:41 +05:30 |
|
Shivam Mishra
|
3336fb595c
|
style: removed console.logs
|
2019-05-30 18:04:36 +05:30 |
|
Rohan Bansal
|
250734dd24
|
fix(selling): Remove Totals row for tree-based Sales Analytics
|
2019-05-30 17:30:50 +05:30 |
|
Nabin Hait
|
b6ffaf11fe
|
Merge pull request #17787 from nabinhait/naming-series-chars
fix: Allowed '{' and '}' in naming series
|
2019-05-30 17:25:08 +05:30 |
|
Nabin Hait
|
1bb3fc3c19
|
Merge pull request #17789 from sunnyakaxd/patch-2
fix: Dont fetch all orders to update a few
|
2019-05-30 17:24:49 +05:30 |
|
Shivam Mishra
|
12579617f3
|
refactor: added enrolled status to program card
|
2019-05-30 17:20:31 +05:30 |
|
Shivam Mishra
|
4991fca5cc
|
feat: enabled per student access
|
2019-05-30 16:37:15 +05:30 |
|
Shivam Mishra
|
24bd07d000
|
refactor: style changes and template refactor
|
2019-05-30 16:36:58 +05:30 |
|
Shivam Mishra
|
dfdb92f4b1
|
refactor: added enrollment api
|
2019-05-30 16:36:01 +05:30 |
|
Shivam Mishra
|
f22793f91b
|
refactor: added program card macro
|
2019-05-30 16:34:53 +05:30 |
|
Nabin Hait
|
d060890817
|
fix: Rounding adjustment while additional discount amount is aplied on grand total
|
2019-05-30 16:05:30 +05:30 |
|
Deepesh Garg
|
af32ed6d8f
|
Merge pull request #17360 from SaiFi0102/Product-Bundle-Balance
feat: Product Bundle Balance Report
|
2019-05-30 15:58:25 +05:30 |
|
Saurabh
|
2b40a44429
|
Merge pull request #17802 from frappe-pr-bot/translations-2019-05-30
feat: Updated translation
|
2019-05-30 15:56:45 +05:30 |
|
Nabin Hait
|
4d58734492
|
fix: Rounding adjustment while additional discount amount is aplied on grand total
|
2019-05-30 15:51:29 +05:30 |
|
Saif Ur Rehman
|
7129231dbb
|
fix(Product Bundle Balance): Update frappe.db.escape for v12
|
2019-05-30 13:55:32 +05:00 |
|
Anurag Mishra
|
62d58acea9
|
fix: Added description if item variants does not have description in map(v12) (#17796)
* fix: variant item description based on attribute
* style: removed unwanted changes
|
2019-05-30 14:04:08 +05:30 |
|
frappe
|
5aeb62f288
|
feat: Updated translation
|
2019-05-30 08:17:59 +00:00 |
|
Himanshu Warekar
|
70a2734aab
|
fix: config file for qms
|
2019-05-30 01:40:31 +05:30 |
|
Shivam Mishra
|
f927502cc5
|
refactor: added lms utilities for enrollment and program list
|
2019-05-29 18:39:52 +05:30 |
|
Shivam Mishra
|
5aa8df840e
|
refactor: cards and hero markup
|
2019-05-29 18:38:58 +05:30 |
|
Shivam Mishra
|
08425d46fa
|
refactor: set Student as default portal role for Education
|
2019-05-29 18:37:52 +05:30 |
|
Deepesh Garg
|
12a9a3ffa3
|
Merge branch 'develop' into Product-Bundle-Balance
|
2019-05-29 18:23:21 +05:30 |
|
Shivam Mishra
|
9944ef2baf
|
Merge pull request #17791 from adityahase/remove-manifest
perf: Remove MANIFEST.in
|
2019-05-29 15:31:35 +05:30 |
|
Shivam Mishra
|
63d8cabb3d
|
fix: program card height bug
|
2019-05-29 15:16:59 +05:30 |
|
Shivam Mishra
|
b7874157f7
|
refactor: /lms redirects to home if lms is disbaled
|
2019-05-29 15:15:59 +05:30 |
|
Shivam Mishra
|
65681bf317
|
refactor: allow disbaling self enroll on lms
|
2019-05-29 15:15:30 +05:30 |
|
Aditya Hase
|
960c6138db
|
perf: Remove MANIFEST.in
Faster pip install -e erpnext
https://stackoverflow.com/questions/24727709/do-python-projects-need-a-manifest-in-and-what-should-be-in-it
https://github.com/frappe/frappe/pull/7360
|
2019-05-29 15:14:07 +05:30 |
|
Himanshu Mishra
|
70029b818b
|
Update status_updater.py
|
2019-05-29 14:19:35 +05:30 |
|
Nabin Hait
|
f1cde0ccf6
|
fix: Allowed '{' and '}' in naming series
|
2019-05-29 13:44:03 +05:30 |
|
Shivam Mishra
|
16f3b713bc
|
Merge branch 'lms-refactor' of github.com:scmmishra/erpnext into lms-refactor
|
2019-05-29 13:14:50 +05:30 |
|
Shivam Mishra
|
ae2871f962
|
feat: content not visible to guest users
|
2019-05-29 13:11:34 +05:30 |
|
Nabin Hait
|
99f27b94c1
|
Merge pull request #17773 from Anurag810/request_to_quatation_fix
fix: Changed dialog field to Select when we get supplier in request to quotation
|
2019-05-29 09:58:00 +05:30 |
|
Himanshu Warekar
|
38ed090bf8
|
test: fix test case
|
2019-05-29 00:16:04 +05:30 |
|
Himanshu Warekar
|
775e9e423a
|
refactor: QMS refactor initial bringup
|
2019-05-29 00:05:58 +05:30 |
|
deepeshgarg007
|
c97c7c51a9
|
fix: Test cases for accounting dimension
|
2019-05-28 18:51:10 +05:30 |
|
Faris Ansari
|
da2c742cea
|
Merge branch 'develop' into request_to_quatation_fix
|
2019-05-28 18:28:13 +05:30 |
|
Faris Ansari
|
dd016479af
|
fix: Remove print statement
|
2019-05-28 18:27:22 +05:30 |
|
Anurag Mishra
|
5afe9f2200
|
fix: changed dialog field to select
|
2019-05-28 18:23:34 +05:30 |
|
deepeshgarg007
|
233b88dc52
|
fix: Test case fixes
|
2019-05-28 17:58:22 +05:30 |
|
deepeshgarg007
|
ffec8be85f
|
fix: Styling and test case fixes
|
2019-05-28 17:56:07 +05:30 |
|
Nabin Hait
|
e7b8400fc7
|
Merge pull request #17696 from Anurag810/warehouse_type
feat: Added Warehouse Type master
|
2019-05-28 17:25:13 +05:30 |
|
deepeshgarg007
|
e025aabef0
|
fix: Indentation fixes
|
2019-05-28 16:25:55 +05:30 |
|