Nabin Hait
235332d4ab
Merge branch 'develop' into lms-refactor
2019-05-27 13:47:45 +05:30
Nabin Hait
a659e615f3
Merge branch 'develop' into upload-attendance-progress
2019-05-27 13:47:36 +05:30
Nabin Hait
769024e2b6
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 13:47:15 +05:30
Nabin Hait
f3ccf0e949
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 13:47:07 +05:30
Deepesh Garg
5f2afb8803
fix: Do not fetch batch items and serialized items in stock reconciliation ( #17725 )
2019-05-27 13:42:29 +05:30
asbasawaraj
a281ce3dde
fix: Updated Field Labels in Work Order ( #17750 )
2019-05-27 13:33:37 +05:30
Deepesh Garg
7fc8b2fa50
fix: GSTR-1 Report B2B fixes ( #17751 )
...
* fix: GSTR-1 Report fixes
* fix: Simply add tax if item tax is not specified
2019-05-27 13:30:52 +05:30
Anurag Mishra
9d9440277c
fix: holidays was showing on same date in calendar view ( #17754 )
2019-05-27 13:20:42 +05:30
Nabin Hait
331dcc06c9
Merge branch 'develop' into upload-attendance-progress
2019-05-27 11:59:16 +05:30
Nabin Hait
6211e7343c
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 11:50:29 +05:30
Nabin Hait
ca8dae183a
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 11:50:16 +05:30
Kenneth Sequeira
a29ed40ad3
fix: Improve error message ( #17747 )
...
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```
```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim ( #17729 )
...
* fix: payment reconciliation against expense claim
* feat: Added dashboard for expense claim
2019-05-27 11:44:06 +05:30
Mangesh-Khairnar
705b7dc9c2
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-05-27 11:21:06 +05:30
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
Suraj Shetty
39a4d59cf6
fix: Call popup modal
2019-05-27 10:38:43 +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
Suraj Shetty
824d0ecc48
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-05-26 07:30:51 +05:30
Himanshu Warekar
6feb12d333
fix: miscellaneous fixes
2019-05-26 00:03:40 +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
Suraj Shetty
591ad37894
fix: call popup [wip]
2019-05-24 10:11:48 +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
deepeshgarg007
7de05ae8f3
fix: Dashboards for doctypes in accounting module
2019-05-23 11:29:39 +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
Suraj Shetty
07fe299628
fix: Make changes to fix call flow and popup trigger
2019-05-22 15:48:57 +05:30
