Mangesh-Khairnar
|
71cdcb3593
|
style: add a more descriptive method name
|
2019-05-27 11:00:04 +05:30 |
|
Mangesh-Khairnar
|
24248f687b
|
patch: create entries for only missing transactions
|
2019-05-27 10:58:42 +05:30 |
|
Mangesh-Khairnar
|
45197965d7
|
fix: give cancellation permission to hr manager
|
2019-05-27 03:26:48 +05:30 |
|
Mangesh-Khairnar
|
d751281fa7
|
fix: application and leave encashment test cases
|
2019-05-27 03:23:58 +05:30 |
|
Mangesh-Khairnar
|
e7d307e6bf
|
fix: only expire carry forwarded allocation via scheduler
|
2019-05-27 03:21:32 +05:30 |
|
Mangesh-Khairnar
|
2417c93d0e
|
feat: create expiry and carry forward calculation on leave allocation creation
|
2019-05-27 03:20:10 +05:30 |
|
Mangesh-Khairnar
|
c99f644ffe
|
test: carry forward and expiry allocation
|
2019-05-27 03:13:47 +05:30 |
|
Mangesh-Khairnar
|
7a7f4bd822
|
fix: leave balance calculation
|
2019-05-27 03:12:57 +05:30 |
|
Mangesh-Khairnar
|
9e3b688333
|
test: create leave policy
|
2019-05-27 03:10:39 +05:30 |
|
Mangesh-Khairnar
|
f3926d0fcb
|
patch: leave ledger entries
|
2019-05-26 20:17:16 +05:30 |
|
deepeshgarg007
|
e9c6e644f7
|
fix: Multiple changes in dimension creation logic
|
2019-05-26 12:34:13 +05:30 |
|
deepeshgarg007
|
6f6636abfe
|
fix: Add dimension section in multiple doctypes
|
2019-05-26 12:31:01 +05:30 |
|
deepeshgarg007
|
d330519f7c
|
fix: Merge branch develop into dimensions
|
2019-05-25 18:18:08 +05:30 |
|
Faris Ansari
|
932a767de4
|
Merge branch 'develop' into upload-attendance-progress
|
2019-05-24 14:46:02 +05:30 |
|
Rushabh Mehta
|
2d7993592f
|
Merge pull request #17703 from rmehta/yeah-form-js
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
|
2019-05-24 11:36:16 +05:30 |
|
Rushabh Mehta
|
7e4fb49c61
|
fix(minor): after manual testing
|
2019-05-24 11:22:31 +05:30 |
|
Mangesh-Khairnar
|
45cf02308e
|
fix: prevent manual creation of ledger entries
|
2019-05-23 20:29:18 +05:30 |
|
Mangesh-Khairnar
|
8ef81870bb
|
test: create leave ledger entry for encashment
|
2019-05-23 20:28:16 +05:30 |
|
Faris Ansari
|
513bfc26d2
|
Merge branch 'develop' into upload-attendance-progress
|
2019-05-23 20:04:16 +05:30 |
|
Nabin Hait
|
d8496a770a
|
fix: validate expense account for opening stock reco
|
2019-05-23 15:32:55 +05:30 |
|
rohitwaghchaure
|
0c2e3c77a3
|
fix: range 4 for ageing filter added in the AP/AR report (#17715)
|
2019-05-23 15:27:47 +05:30 |
|
rohitwaghchaure
|
fd4815da53
|
Merge pull request #17690 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_v12
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
|
2019-05-23 15:04:43 +05:30 |
|
Faris Ansari
|
8f784c8555
|
fix: Remove console statement
|
2019-05-23 14:39:38 +05:30 |
|
Saurabh
|
ba04c3e5bb
|
fix: table name alias (#17706)
|
2019-05-23 14:16:56 +05:30 |
|
Nabin Hait
|
5173170be3
|
fix: validate expense account for opening stock entry
|
2019-05-23 12:10:51 +05:30 |
|
Nabin Hait
|
79f84e58ba
|
test: Add test case for opening stock entry gle
|
2019-05-23 11:16:12 +05:30 |
|
Nabin Hait
|
8770ea2631
|
fix: Opening accounting entry for stock entry
|
2019-05-23 11:15:04 +05:30 |
|
Saurabh
|
45cd60dfb2
|
Merge pull request #17645 from nabinhait/bom-item-rate-dev
fix: BOM Item rate based on uom conversion factor and exchange rate
|
2019-05-22 18:58:34 +05:30 |
|
Mangesh-Khairnar
|
5ba17c87e5
|
feat: remove update allocation after submit
|
2019-05-22 18:29:22 +05:30 |
|
Rushabh Mehta
|
04e89ce808
|
refactor: deprecate old API
|
2019-05-22 16:52:36 +05:30 |
|
Nabin Hait
|
318ba2b538
|
Merge branch 'develop' into lms-refactor
|
2019-05-22 15:15:51 +05:30 |
|
Nabin Hait
|
0ce85735b8
|
Merge branch 'develop' into set_default_warehouse_from_the_stock_settings_v12
|
2019-05-22 15:06:04 +05:30 |
|
Nabin Hait
|
13e0fcde0c
|
Merge branch 'develop' into upload-attendance-progress
|
2019-05-22 15:05:50 +05:30 |
|
Nabin Hait
|
5ee08620cb
|
Merge branch 'develop' into po-status-updater-dev-1
|
2019-05-22 15:05:08 +05:30 |
|
rohitwaghchaure
|
8529cde0f0
|
Merge pull request #17687 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_develop
fix: item group not disaplying in the website if shopping cart is disabled
|
2019-05-22 13:23:44 +05:30 |
|
rohitwaghchaure
|
0432d3844b
|
Merge pull request #17700 from rohitwaghchaure/italian_localization_issue_for_invoices_develop
fix: removed translation for customer type and tax charge type
|
2019-05-22 13:23:25 +05:30 |
|
Rohit Waghchaure
|
68a1456672
|
fix: removed translation for customer type and tax charge type
|
2019-05-22 13:22:39 +05:30 |
|
Nabin Hait
|
ecf25907a5
|
fix: set schedule date from MR to PO
|
2019-05-22 13:07:26 +05:30 |
|
Nabin Hait
|
bfb09d51a3
|
fix: test cases
|
2019-05-22 12:15:56 +05:30 |
|
Nabin Hait
|
b7bdcc3992
|
fix: Don't set reqd date in PO based on MR, if less than today
|
2019-05-22 12:01:17 +05:30 |
|
Nabin Hait
|
915edbf9ce
|
fix: po status
|
2019-05-22 12:00:36 +05:30 |
|
Nabin Hait
|
d752051b8d
|
fix: update received qty in PO from PR
|
2019-05-22 11:59:19 +05:30 |
|
Faris Ansari
|
9e5665dc0a
|
Merge branch 'develop' into upload-attendance-progress
|
2019-05-21 18:01:30 +05:30 |
|
Faris Ansari
|
81e698d225
|
fix(UX): Upload Attendance
Enqueue import if rows more than 200. Show import progress in dashboard.
|
2019-05-21 17:58:55 +05:30 |
|
Rohit Waghchaure
|
c41118bac7
|
Get default warehouse from the stock settings in the get_item_details
|
2019-05-21 15:21:13 +05:30 |
|
Nabin Hait
|
7327f8a901
|
fix: Person / Org name is not mandatory while creation of lead from email (#17676)
|
2019-05-21 15:05:26 +05:30 |
|
Rushabh Mehta
|
98a80407f8
|
Merge pull request #17538 from adityahase/fix-training-feedback
fix(hr): Use event_status instead of status
|
2019-05-21 12:19:03 +05:30 |
|
Rushabh Mehta
|
397a48d11f
|
Merge pull request #17640 from nabinhait/gle-opening-stock-reco-dev
fix: GL Entry for opening stock reconciliation
|
2019-05-21 12:17:22 +05:30 |
|
Rohit Waghchaure
|
5e7b4ca6a4
|
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
|
2019-05-21 12:14:16 +05:30 |
|
Shivam Mishra
|
87a7438d38
|
chore: added macro for page hero
|
2019-05-21 12:05:19 +05:30 |
|