Afshan
b8b23663e6
fix: query for salary component in salary structure
...
fix: query for salary component in salary structure
2021-01-20 17:42:06 +05:30
Deepesh Garg
d9a6a6fe6a
fix: Tax updation for internal invoices
2021-01-20 17:35:33 +05:30
Afshan
36e3e05a0e
fix: query for salary componet in salary structure
2021-01-20 16:48:42 +05:30
Afshan
53edb872c7
Merge pull request #24424 from AfshanKhan/fix-add-stat-comp-in-sal-struct
...
fix: allow statistical component in salary structure.
2021-01-20 15:21:04 +05:30
Afshan
912647f4f2
fix: allow statistical component in salary structure.
2021-01-20 13:58:32 +05:30
Saqib
e2ed2324c3
fix: (e-invoicing) qrcode image generation ( #24395 )
...
* fix: invalid taxable value of item for e-invoice
* fix: qrcode image duplicate error
* fix: net total discount calculation
* fix: auto fetch auth token
2021-01-20 13:17:42 +05:30
Rucha Mahabal
bd02a42904
Merge branch 'develop' into membership-enhancements-2
2021-01-20 12:49:37 +05:30
Afshan
0ff9acfc9f
Merge pull request #24415 from AfshanKhan/sal-comp-err
...
fix: select sal comp while making sal struct
2021-01-20 12:37:53 +05:30
Deepesh Garg
60a8ba5cbd
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2021-01-20 10:30:52 +05:30
Deepesh Garg
1cfb69aaae
fix: Test Cases
2021-01-20 10:27:01 +05:30
Deepesh Garg
50cd7a1650
fix: Import Error
2021-01-19 19:35:13 +05:30
Afshan
c69ab6d184
fix: select sal comp while making sal struct
2021-01-19 19:29:31 +05:30
Rohan Bansal
97b9995f8f
fix: use supplied year for IRS 1099 forms
2021-01-19 19:10:03 +05:30
Deepesh Garg
f4a4efb510
fix: address mapping between sales and purchase document
2021-01-19 19:05:50 +05:30
rohitwaghchaure
c474caba70
Merge pull request #24354 from rohitwaghchaure/fixed-incorrect-key-in-subcontract-develop
...
fix: incorrect serial no in the subcontracted purchase receipt
2021-01-19 15:08:53 +05:30
Rucha Mahabal
a28579a130
fix: sider issues
2021-01-19 14:16:44 +05:30
Rucha Mahabal
f39cbd3a1d
test: appointment booking for admission service unit
2021-01-19 13:59:03 +05:30
Jannat Patel
953960b193
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-19 10:44:49 +05:30
Deepesh Garg
6fb66f9428
Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components
...
feat(Payroll): compute Year to Date for Salary Slip components
2021-01-19 09:40:47 +05:30
marination
957615bec8
fix: Stricter validations
...
- Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation
- Every incoming stock transaction must be checked to avoid overcapacity
- However application of rule and splitting only on certain doctypes
- Validate capacity < stock balance on save in putaway rule, irrespective
2021-01-18 23:47:24 +05:30
Marica
6ac51edc56
Merge branch 'develop' into putaway
2021-01-18 17:47:25 +05:30
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid ( #24392 )
2021-01-18 16:44:41 +05:30
pateljannat
6bec696396
fix: item_group fallback
2021-01-18 16:21:56 +05:30
pateljannat
fa2b0d43bd
fix: handled invoices with no item_code
2021-01-18 15:27:40 +05:30
Deepesh Garg
7337669e49
feta: Provision to disbale serial no and batch selector
2021-01-18 15:21:05 +05:30
Rucha Mahabal
20e5315480
feat: Allow selecting admission service unit in Patient Appointment for inpatients
2021-01-18 14:56:55 +05:30
Rucha Mahabal
ea19434af4
feat: Issue Analytics Script Report ( #23604 )
...
* feat: Issue Analytics Report
* feat: add more filters, code clean-up
* fix: add report link to desk page
* test: Issue Analytics Report
* fix: sider issues
* fix: test
* debug: travis
* debug: travis
* fix: travis
* fix: travis
Co-authored-by: Marica <maricadsouza221197@gmail.com >
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2021-01-18 13:53:52 +05:30
Deepesh Garg
c3d82a889a
Merge pull request #24370 from deepeshgarg007/loan_report_and_enhancements
...
feat: Loan report and enhancements
2021-01-18 12:26:45 +05:30
Deepesh Garg
52172252b4
fix: Interest calculations in Loan Interest Report
2021-01-18 12:07:54 +05:30
Deepesh Garg
2cb12e6f70
fix: Loan Security name fetch
2021-01-17 18:38:21 +05:30
Deepesh Garg
dd25ecb70d
fix: Add reports in Desk Page
2021-01-17 17:52:02 +05:30
Deepesh Garg
ec60063155
fix: Auto Loan Write Off
2021-01-17 17:39:51 +05:30
Deepesh Garg
914ab7e4b0
fix: Add filters and currency in reports
2021-01-17 14:40:32 +05:30
Deepesh Garg
addea9697d
feat: Loan Exposure report
2021-01-17 11:36:51 +05:30
Deepesh Garg
7976d12ed0
fix: Applicant-Wise Loan Security Exposure report
2021-01-16 18:10:01 +05:30
Deepesh Garg
b015934644
Merge pull request #23912 from deepeshgarg007/accounting_dimension_filters
...
feat: Configurable accounting dimension filters and validations
2021-01-16 13:57:12 +05:30
Deepesh Garg
1564d6ee1f
fix: Test Case
2021-01-15 19:51:15 +05:30
Deepesh Garg
0c4d61269a
fix: test case
2021-01-15 15:57:18 +05:30
Deepesh Garg
e30b33a3b8
fix: Linting issues
2021-01-15 15:47:15 +05:30
Deepesh Garg
cbed6f970a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-15 15:43:59 +05:30
Deepesh Garg
fc34ded7a8
fix: Ref doc map
2021-01-15 14:12:57 +05:30
Kanchan Chauhan
d2c71350cd
refactor(Job Application): New fields in Job Applicant and webform ( #23326 )
...
* refactor(Job Application): New fields in Job Applicant and webform
* fix: translation syntax
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2021-01-15 13:56:03 +05:30
Rohan
b1d08126b0
feat: add "Sync Now" to Plaid Settings ( #23602 )
2021-01-15 12:56:30 +05:30
Rucha Mahabal
004e51ed9f
Merge branch 'develop' into patient-history-enhancements
2021-01-15 12:09:53 +05:30
Deepesh Garg
342299fe3b
fix: Update timestamp
2021-01-15 10:14:18 +05:30
Deepesh Garg
5307f8e794
Revert "fix: Move item price link to batch"
...
This reverts commit 8963edae51
2021-01-15 10:12:22 +05:30
Deepesh Garg
540c119a27
Revert "fix: Sider issues"
...
This reverts commit d3fbefcdf7
2021-01-15 10:11:27 +05:30
Deepesh Garg
21479fc5ea
Revert "fix: Add missing semicolon"
...
This reverts commit a5539dc580
2021-01-15 10:11:15 +05:30
Deepesh Garg
2c12124550
Revert "fix: Item Price using batch selector"
...
This reverts commit 34c58529d9
2021-01-15 10:10:54 +05:30
Deepesh Garg
f68e85519c
Revert "fix: Price not getting set for first row"
...
This reverts commit 92ed11ad16
2021-01-15 10:05:58 +05:30
