Nabin Hait
|
37fdeee367
|
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev
fix: Rounding adjustment while additional discount amount is applied on grand total
|
2019-06-03 13:09:04 +05:30 |
|
deepeshgarg007
|
545fef9934
|
fix: Pass delivery document no as empty string
|
2019-06-03 13:06:37 +05:30 |
|
Nabin Hait
|
2cc5fcf33b
|
Merge pull request #17833 from netchampfaris/issue-portal-styling
fix: Issue list portal styling
|
2019-06-03 13:05:53 +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 |
|
Himanshu Warekar
|
9f458e3413
|
fix: codacy
|
2019-06-02 20:47:23 +05:30 |
|
Himanshu Warekar
|
4a7a380f0c
|
fix: codacy
|
2019-06-02 19:46:44 +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 |
|
rohitwaghchaure
|
09d8bb8aa9
|
Merge pull request #17822 from rohitwaghchaure/pricing_rule_applying_on_the_non_conditional_item
fix: pricing rule is applying on the incorrect item
|
2019-05-31 12:17:18 +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 |
|
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 |
|
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 |
|