Nabin Hait
ddf90b29f2
Update salary_slip.py
2020-05-01 22:34:28 +05:30
Sahil Khan
e946699c3e
Merge branch 'version-13-beta-pre-release' into version-13-beta
2020-05-01 21:05:26 +05:30
Sahil Khan
dba2132c91
bumped to version 13.0.0-beta.1
2020-05-01 21:25:26 +05:50
sahil28297
1101f9779e
fix: update version
2020-05-01 21:04:23 +05:30
rohitwaghchaure
85f30e70c8
Merge pull request #21552 from rohitwaghchaure/change-log-for-version-13-beta-pre-release
...
chore: change log for version 13 beta
2020-05-01 20:05:14 +05:30
Rohit Waghchaure
cfd67a17a3
chore: change log for version 13 beta
2020-05-01 19:58:33 +05:30
rohitwaghchaure
451616a928
Merge pull request #21551 from rohitwaghchaure/fixed-loan-test-case-for-pre-release
...
fix: test case for loan
2020-05-01 19:19:40 +05:30
Nabin Hait
a67fb31f67
Merge branch 'develop' into refactor-addiional-salary
2020-05-01 19:04:20 +05:30
Nabin Hait
fdacc50e78
Update salary_detail.json
2020-05-01 19:04:00 +05:30
Nabin Hait
a1ffc44f0c
fix: removed unwanted comma from json
2020-05-01 18:55:57 +05:30
Deepesh Garg
f7966f444d
Merge pull request #21404 from abhishekbalam/develop
...
feat(Accounts): Journal Entry Templates v1
2020-05-01 18:42:54 +05:30
Deepesh Garg
978de8779c
fix: Add multi currency check and proper account filters
2020-05-01 18:38:13 +05:30
Rohit Waghchaure
795cf87aab
fix: test case for loan
2020-05-01 18:31:14 +05:30
Nabin Hait
da17f9cb05
feat: Run MRP at parent level in the production plan ( #21545 )
...
* enhance: provision to make material request from other location
* fix: source warehouse for material transfer from production plan
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2020-05-01 18:16:25 +05:30
Saqib
39805918d4
fix: accounts payable shows advance amount of other company ( #21548 )
2020-05-01 18:15:13 +05:30
Vishal Dhayagude
2e082affc7
fix(HR): Leave application company field made read-only and filter in Monthly attendance sheet ( #20912 )
...
* fix(HR): Leave application company field made Readonly
* fix: in monthly report attandance employee filter based on company
* fix: minor typo
* fix: Fetch company from employee
* Update monthly_attendance_sheet.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-01 18:11:43 +05:30
Suraj Shetty
119f2f07a5
Merge branch 'develop' into new-translations
2020-05-01 17:59:58 +05:30
Deepesh Garg
0f8150f8de
Merge pull request #21546 from deepeshgarg007/loan_closure_fixes
...
fix: Loan Closure without loan interest accrual
2020-05-01 15:49:56 +05:30
Deepesh Garg
662838adb3
fix: Party Type filter in payment entry list view ( #21541 )
2020-05-01 15:00:55 +05:30
Deepesh Garg
db83c29079
Merge branch 'develop' into develop
2020-05-01 14:20:53 +05:30
Deepesh Garg
1b35873743
Merge branch 'develop' into loan_closure_fixes
2020-05-01 14:18:36 +05:30
Deepesh Garg
1a1b06cf59
Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix
...
fix: Travis (develop)
2020-05-01 14:17:46 +05:30
Deepesh Garg
032814b86a
fix: Patch test
2020-05-01 13:26:26 +05:30
Deepesh Garg
2390f3d0e2
Merge pull request #21543 from frappe/revert-21420-patch-8
...
Revert "fix: Update in field type"
2020-05-01 12:04:24 +05:30
Deepesh Garg
998364d636
fix: Update timestamp
2020-05-01 12:04:13 +05:30
Deepesh Garg
6cce75a230
Revert "fix: Update in field type"
2020-05-01 12:03:18 +05:30
Deepesh Garg
e2de2923e2
Merge pull request #21420 from wojosc/patch-8
...
fix: Update in field type
2020-05-01 11:38:23 +05:30
Deepesh Garg
779815a035
fix: Loan Repayment Test
2020-05-01 11:04:12 +05:30
rohitwaghchaure
be16e5cccc
fix: 'NoneType' object is not iterable ( #21537 )
2020-05-01 10:50:17 +05:30
mergify[bot]
5ac2c49444
fix: Move Video Doctype from Education module to Core ( #21234 ) ( #21533 )
...
* fix: move Video Doctype from Education module to Core
* fix: patch to retain Permissions
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit f65fb1fcf8
2020-05-01 10:49:26 +05:30
rohitwaghchaure
52005d1ea3
Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg
...
chore: validate and warn payment against paid invoices
2020-05-01 10:37:23 +05:30
Deepesh Garg
2dbd228eab
fix: Check is child table for POS profile user
2020-05-01 09:50:56 +05:30
rohitwaghchaure
260bf54c99
Merge pull request #21171 from nextchamp-saqib/rename-bank-reco
...
chore: rename bank reconciliation to bank clearance
2020-05-01 09:33:52 +05:30
Deepesh Garg
1a497b3442
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_closure_fixes
2020-05-01 09:24:10 +05:30
marination
3568dc75be
fix: Make Company the first filter
2020-05-01 00:01:37 +05:30
Mangesh-Khairnar
ec0103453c
Merge pull request #21528 from Mangesh-Khairnar/marketplace-fixes
...
fix: pre-process both the existing and new products
2020-04-30 22:54:57 +05:30
Shivam Mishra
f411e754ae
Merge pull request #21536 from scmmishra/rzpay-fixes
...
fix: elif block error
2020-04-30 22:39:54 +05:30
Shivam Mishra
d76c5e83ca
fix: elif block error
2020-04-30 22:39:03 +05:30
Deepesh Garg
61363d2ced
fix: Initialize interest_paid as zero
2020-04-30 22:22:44 +05:30
Deepesh Garg
4226191ec7
fix: Loan Closure without loan interest accrual
2020-04-30 22:11:57 +05:30
Mangesh-Khairnar
367b644d9e
fix: delete hub tracked item on unpublish
2020-04-30 20:31:12 +05:30
Saqib
dac51ea1cf
Merge branch 'develop' into validate-paid-inv-msg
2020-04-30 20:08:18 +05:30
Shivam Mishra
9067c7bc55
Merge pull request #21470 from scmmishra/razorpay-subscription
...
refactor: minor changes to razorpay subscription
2020-04-30 20:07:44 +05:30
Marica
66e99d5767
Merge branch 'develop' into razorpay-subscription
2020-04-30 20:07:05 +05:30
Saqib Ansari
dfa60e0ed8
chore: calculate total row month-wise in sales analytics
2020-04-30 20:06:30 +05:30
Rucha Mahabal
f65fb1fcf8
fix: Move Video Doctype from Education module to Core ( #21234 )
...
* fix: move Video Doctype from Education module to Core
* fix: patch to retain Permissions
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-30 19:47:18 +05:30
Mangesh-Khairnar
7f374e7ba5
fix: pre-process both the existing and new products
2020-04-30 18:56:27 +05:30
Saqib
4422ffdb22
chore: asset accounts should have company currency ( #21524 )
2020-04-30 18:39:13 +05:30
Saqib Ansari
10d9974e77
chore: add total row in sales analytics report
2020-04-30 16:28:52 +05:30
Raffael Meyer
3484a79ccf
Update datev_settings.json ( #21482 )
2020-04-30 16:27:11 +05:30
