Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,005 Commits 3 Branches 0 Tags 1 GiB
6058ea88e8
Commit Graph

24923 Commits

Author SHA1 Message Date
Rucha Mahabal
6058ea88e8
fix: SLA not applied automatically when priority is missing (#24447) 2021-01-22 13:35:08 +05:30
Deepesh Garg
0d26d24164
Merge pull request #24414 from Alchez/dev-irs-1099-year 
fix: use supplied year for IRS 1099 forms
 2021-01-22 12:17:43 +05:30
Jannat Patel
02a7af1e6c
fix: full form for opportunity in crm dashboard (#24436) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-22 10:03:29 +05:30
rohitwaghchaure
3afc6b1333
Merge pull request #24437 from AfshanKhan/fix-stock-ageing 
fix: stock ageing should not take cancelled stock entries.
 2021-01-21 23:09:41 +05:30
Rucha Mahabal
7a21e40527
Merge branch 'develop' into membership-enhancements-2 2021-01-21 20:21:17 +05:30
Rucha Mahabal
02e424fae2 chore: Add description for settings 2021-01-21 20:16:17 +05:30
Rucha Mahabal
bcc0674d37 fix: test 2021-01-21 19:52:13 +05:30
Saqib
577d2bed6e
fix: failing einvoice test (#24434) 2021-01-21 18:43:55 +05:30
Afshan
96edfd93c9 fix: stock ageing should not take cancelled stock entries. 2021-01-21 18:22:35 +05:30
Rucha Mahabal
eee71f37d8 fix: test 2021-01-21 17:47:20 +05:30
Rucha Mahabal
f1cca59d80 feat: update expiry for memberships 2021-01-21 16:36:15 +05:30
Rucha Mahabal
b9781a4675 fix: membership test cases 2021-01-21 15:13:29 +05:30
Rucha Mahabal
f3e3f80102
Merge branch 'develop' into membership-enhancements-2 2021-01-21 13:24:39 +05:30
Rucha Mahabal
d98b506478 fix: patch 2021-01-21 13:23:59 +05:30
Rucha Mahabal
b48eab972e fix: sider issues 2021-01-21 13:00:10 +05:30
Rucha Mahabal
3af46cc6cc fix: show custom buttons after save 2021-01-21 11:59:34 +05:30
Rucha Mahabal
4284ad880b fix: create member from membership for website users only 2021-01-21 11:54:14 +05:30
Rucha Mahabal
53d0eebbe8 fix: patch for renaming field in Membership Settings 2021-01-20 23:22:08 +05:30
Rucha Mahabal
bc49815d54 refactor: missing validations, code clean-up 2021-01-20 23:14:27 +05:30
Rucha Mahabal
fa4b3ba505 fix: basic validations for Membership Type Linked Item 2021-01-20 21:59:27 +05:30
Rucha Mahabal
3575939386 fix: sider issues 2021-01-20 20:48:51 +05:30
Afshan
36e3e05a0e fix: query for salary componet in salary structure 2021-01-20 16:48:42 +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
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
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
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
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid (#24392) 2021-01-18 16:44:41 +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
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
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
Anuja P
47b42e6441 fix: Translation fixes 2021-01-14 21:20:00 +05:30
Anuja P
5ead7ee6cf fix:Payment Period based on invoice date report fix/refactor 2021-01-14 20:58:34 +05:30
Deepesh Garg
c96ea002a0
Merge pull request #24375 from deepeshgarg007/plv_cost_center_ignore_v13 
fix: Ignore group cost center validation for period closing voucher
 2021-01-14 19:47:56 +05:30
Deepesh Garg
847c706d2f fix: Ignore group cost center validation for period closing voucher 2021-01-14 19:44:41 +05:30
Anuja Pawar
4569e52b45
fix: fix for not having fiscal year while creating new company (#24130) 
* fix: Fiscal year fix while creating new company

* fix: for failing Travis

* fix: suggested changes

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-14 19:24:30 +05:30