Anurag Mishra
5afe9f2200
fix: changed dialog field to select
2019-05-28 18:23:34 +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
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
54ea9b0978
Merge pull request #17709 from nabinhait/opening-stock-entry-dev
...
fix: Opening accounting entry for stock entry
2019-05-27 17:16:19 +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
Saurabh
fdf0d91087
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 15:17:58 +05:30
Joe Paul
4a8ed90255
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:14:26 +05:30
Nabin Hait
8b1d347cb5
Merge branch 'develop' into develop
2019-05-27 14:00:53 +05:30
Mitchy25
a8f6938556
Fix: Precision in Appraisals ( #17673 )
...
* Update appraisal.js
This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.
* fix: score based on field's precisin
2019-05-27 13:57:56 +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
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
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
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +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
