deepeshgarg007
|
545fef9934
|
fix: Pass delivery document no as empty string
|
2019-06-03 13:06:37 +05:30 |
|
Shivam Mishra
|
d1a252190b
|
refactor: refactored quiz api and added quiz.js
|
2019-06-03 12:57:38 +05:30 |
|
deepeshgarg007
|
853a561f11
|
fix: Serial no filtering issue for delivered items
|
2019-06-03 12:11:54 +05:30 |
|
deepeshgarg007
|
6d313c72e1
|
fix: Remove diemnsion from value list if present
|
2019-06-01 23:26:42 +05:30 |
|
deepeshgarg007
|
e19abb162a
|
fix: Resolve merge conflicts in purchase_receipt_item
|
2019-06-01 23:26:09 +05:30 |
|
deepeshgarg007
|
55b894bfef
|
Merge branch develop into dimensions
|
2019-06-01 23:13:36 +05:30 |
|
deepeshgarg007
|
223225e785
|
fix: Update function name
|
2019-06-01 23:09:04 +05:30 |
|
Faris Ansari
|
b8eaa3d377
|
fix: Issue list portal styling
|
2019-06-01 20:56:37 +05:30 |
|
Saurabh
|
011fe48ec3
|
Merge pull request #17823 from abhijitkumbharInd/develop
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
|
2019-05-31 14:26:08 +05:30 |
|
Saurabh
|
f68bd8f349
|
Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop
fix: allow import for packing slip
|
2019-05-31 14:24:51 +05:30 |
|
Saurabh
|
b6028b0495
|
Merge pull request #17809 from Alchez/develop-sales-analytics-total
fix(selling): Remove Totals row for Sales Analytics
|
2019-05-31 14:21:01 +05:30 |
|
Saurabh
|
731986d8ee
|
Merge pull request #17811 from nabinhait/pr-expense-account-dev
fix: Added Expense Account field to push value from PO-PR-PI
|
2019-05-31 14:19:47 +05:30 |
|
abhijitkumbharIND
|
39d6cf38fc
|
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
|
2019-05-31 14:19:04 +05:30 |
|
abhijitkumbharIND
|
302bce355f
|
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
|
2019-05-31 14:19:04 +05:30 |
|
Rohit Waghchaure
|
e98d1c1147
|
fix: allow import for packing slip
|
2019-05-31 14:16:11 +05:30 |
|
Deepesh Garg
|
bd3c60254a
|
Merge pull request #17819 from deepeshgarg007/module
fix: Add chart of accounts importer in data import module
|
2019-05-31 13:33:20 +05:30 |
|
Deepesh Garg
|
25857d6ee3
|
Merge pull request #17816 from deepeshgarg007/ar_translations_develop
fix: Add translations for missing labels in AR report
|
2019-05-31 12:37:36 +05:30 |
|
Saurabh
|
90b60cfb0d
|
Merge pull request #17818 from rohitwaghchaure/fixed_pos_cash_payment_modal_develop
fix: POS cash mode of payment css
|
2019-05-31 12:29:19 +05:30 |
|
Rohit Waghchaure
|
840244c562
|
fix: pricing rule is applying on the incorrect item
|
2019-05-31 12:16:35 +05:30 |
|
deepeshgarg007
|
9f9516597c
|
fix: Add chart of accounts importer in data import module
|
2019-05-31 10:11:46 +05:30 |
|
Mangesh-Khairnar
|
c5385e141b
|
fix: add mandatory reason fields in leave application
|
2019-05-31 00:53:28 +05:30 |
|
Rohit Waghchaure
|
4fd704dbb6
|
fix: POS cash mode of payment css
|
2019-05-30 23:25:41 +05:30 |
|
deepeshgarg007
|
480586152b
|
fix: Label translations
|
2019-05-30 22:34:00 +05:30 |
|
deepeshgarg007
|
da2e456f70
|
fix: Add translations for missing labels in AR report
|
2019-05-30 22:30:32 +05:30 |
|
Rohit Waghchaure
|
ac8f4b449d
|
fix: pricing rule not exists issue
|
2019-05-30 22:24:24 +05:30 |
|
Mangesh-Khairnar
|
95e5d812fe
|
fix: UX changes
|
2019-05-30 22:22:15 +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 |
|
Mangesh-Khairnar
|
91e62f575e
|
fix: department filters in employee leave balance
|
2019-05-30 13:38:35 +05:30 |
|
Mangesh-Khairnar
|
2124d9884b
|
fix: pass positional arguments on creation of leave application
|
2019-05-30 13:21:34 +05:30 |
|
Mangesh-Khairnar
|
aafb5cb6f6
|
fix: ignore expired non-carry forwarded allocation on calculating leaves taken
|
2019-05-30 13:13:14 +05:30 |
|
Mangesh-Khairnar
|
ded33a7e2e
|
fix: ledger entries creation
|
2019-05-29 19:12:19 +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 |
|
Mangesh-Khairnar
|
7cc6a67c18
|
add department filter to employee leave balance
|
2019-05-29 15:59:20 +05:30 |
|
Mangesh-Khairnar
|
8f47bffa0e
|
fix: create an instance
|
2019-05-29 15:54:14 +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 |
|
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 |
|
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 |
|
deepeshgarg007
|
a8cb00f31f
|
fix: Styling and test case fixes
|
2019-05-28 16:03:08 +05:30 |
|
Mangesh-Khairnar
|
ae4228aed4
|
fix: fetch queries
|
2019-05-28 13:24:15 +05:30 |
|
deepeshgarg007
|
adccb2c3a4
|
fix: Remove print statements
|
2019-05-28 12:24:28 +05:30 |
|
deepeshgarg007
|
acc2422167
|
Merge branch develop into dimensions
|
2019-05-28 12:18:32 +05:30 |
|
deepeshgarg007
|
f5b6ee9ae7
|
fix: Multiple fixes in accounting doctype
|
2019-05-28 12:15:56 +05:30 |
|
deepeshgarg007
|
50ea99e35b
|
fix: Is group filter for dimensions for doctype
|
2019-05-28 12:13:53 +05:30 |
|
deepeshgarg007
|
7dfffb5f73
|
fix: Updated test cases for accounting dimensions
|
2019-05-28 12:09:45 +05:30 |
|
Mangesh-Khairnar
|
9d6151d200
|
patch: add reload doc for leave ledger entry
|
2019-05-28 11:45:51 +05:30 |
|
Nabin Hait
|
5fef786441
|
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
fix: Tax calculation on salary slip
|
2019-05-28 11:16:31 +05:30 |
|
Anurag Mishra
|
a69f72988a
|
fix: requested filters changes
|
2019-05-28 11:08:14 +05:30 |
|
Mangesh-Khairnar
|
c6d6adcbf3
|
fix: ledger entry creation for encashment
|
2019-05-28 09:44:38 +05:30 |
|
Mangesh-Khairnar
|
61bb236cfa
|
test: delete ledger entry after each test to maintain balance
|
2019-05-27 19:36:40 +05:30 |
|
Nabin Hait
|
351e9983cf
|
Merge pull request #17389 from mujeerhashmi/develop
feat: Student Group with Student Category filter
|
2019-05-27 19:14:31 +05:30 |
|
Nabin Hait
|
9813897ec3
|
Merge pull request #17759 from saurabh6790/custom_field_fix
fix: add shopify_supplier_id custom field while setting up shopify
|
2019-05-27 19:12:39 +05:30 |
|
Nabin Hait
|
60f04d181d
|
Merge pull request #17756 from nabinhait/property-decorator
fix(subscription): Remove property decorator (#17395)
|
2019-05-27 19:11:17 +05:30 |
|
Nabin Hait
|
7f375d209c
|
fix: Tax calculation on salary slip
|
2019-05-27 18:42:53 +05:30 |
|
Anurag Mishra
|
32c23ae274
|
fix: added read write permission to stock manager
|
2019-05-27 18:37:04 +05:30 |
|
Anurag Mishra
|
61a7b42aea
|
fix: added permission and fix filters in stock balance report
|
2019-05-27 18:37:04 +05:30 |
|
Anurag Mishra
|
7376b4f4f0
|
feat: added warehouse type master
|
2019-05-27 18:37:04 +05:30 |
|
Nabin Hait
|
1f24a4d44c
|
Merge pull request #17691 from netchampfaris/upload-attendance-progress
fix(UX): Upload Attendance
|
2019-05-27 17:17:03 +05:30 |
|
Nabin Hait
|
e662be7508
|
Merge pull request #17697 from nabinhait/po-status-updater-dev-1
fix: update received qty in PO from PR and PI
|
2019-05-27 17:16:40 +05:30 |
|
Nabin Hait
|
4f549cc196
|
Merge branch 'develop' into opening-stock-entry-dev
|
2019-05-27 17:16:03 +05:30 |
|
Nabin Hait
|
aafd64d9b4
|
fix: On change of currency, set margin amount based on exchange rate (#17712)
|
2019-05-27 17:15:47 +05:30 |
|
Mangesh-Khairnar
|
35786c0067
|
Merge branch 'leave-management' of https://github.com/Mangesh-Khairnar/erpnext into leave-management
|
2019-05-27 15:42:11 +05:30 |
|
Mangesh-Khairnar
|
6f69bbe1d7
|
test: leave ledger balance
|
2019-05-27 15:40:36 +05:30 |
|
Mangesh-Khairnar
|
7fbaef5de3
|
fix: expiry ledger creation
|
2019-05-27 15:39:48 +05:30 |
|