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

34130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
prssanna
9f1a156307 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 13:04:58 +05:30
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +05:30
prssanna
706eae7cac fix: product page fixes 2021-01-20 17:47:25 +05:30
prssanna
ac7bc78afe fix: show product price in item card 2021-01-20 17:46:19 +05:30
prssanna
599322871a fix: product query issues 2021-01-20 17:44:08 +05:30
Suraj Shetty
2e67a41c27 fix: Update birthday avatar code 2021-01-20 10:12:01 +05:30
Suraj Shetty
c858bb8122 fix: Rename patch 2021-01-19 10:47:50 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid (#24392) 2021-01-18 16:44:41 +05:30
Suraj Shetty
e560d7428e fix: Update split issue & help article 2021-01-18 16:43:22 +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
Suraj Shetty
cde1566606 fix: Typo 2021-01-15 15:28:50 +05:30
Suraj Shetty
f75d1bb043 fix: Typo 2021-01-15 14:53:51 +05:30
Suraj Shetty
22cdfbea87 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-15 14:48:35 +05:30
Suraj Shetty
3d00e25232 refactor: Employee birthday reminder 2021-01-15 14:48:28 +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
Deepesh Garg
923af36979
Merge pull request #24378 from Anuja-pawar/fix_payment_period_based_on_invoice_date_report 
fix: Payment Period based on invoice date report fix/refactor
 2021-01-14 22:24:23 +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
Mohammad Hasnain Mohsin Rajan
00981206ad
fix: last purchase rate not updating when voucher cancelled if only one voucher is present (#24322) 
* fix: last purchase rate not updating

* chore: use orm for updating

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-14 19:23:18 +05:30
Deepesh Garg
660d4a1097
Merge pull request #24346 from GangaManoj/timesheet-linking 
fix: Link timesheets with corresponding projects
 2021-01-14 18:49:40 +05:30
Deepesh Garg
3f015f7142 fix: Update fieldnames 2021-01-14 18:44:14 +05:30
Marica
5a1c469bf4
Merge pull request #23210 from michellealva/naming-series-proj 
chore: Add Naming Series for Project DocType
 2021-01-14 17:19:16 +05:30
Marica
3c878505cb
Merge branch 'develop' into naming-series-proj 2021-01-14 16:34:51 +05:30
Marica
2b75342811
Merge pull request #24294 from marination/mr-se-warehouse-validation 
fix: Don't validate warehouse values between Material Request and Stock Entry
 2021-01-14 15:09:00 +05:30
Rucha Mahabal
5495c3789f
Merge pull request #24355 from ruchamahabal/inpatient-visits-billing 
feat(Healthcare Settings): Do Not Bill Patient Encounters for Inpatients
 2021-01-14 14:45:49 +05:30
marination
bc9eaac342 fix: Clear merge conflicts 
- 'get_project_template' was removed a month back
- in 'make_project' insert the project directly as a check for it is there in the beginning.
 2021-01-14 13:47:40 +05:30
Marica
17614c9860
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-14 13:02:45 +05:30
Rucha Mahabal
6b9efa894f
Merge branch 'develop' into inpatient-visits-billing 2021-01-14 12:31:43 +05:30
marination
814858061f fix: test for raising MR-SE mismatch error 
- Make test add mismatched item code instead of warehouse, since warehouse can be different.
 2021-01-14 12:13:08 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard (#24187) 2021-01-13 21:13:12 +05:30
Anupam Kumar
4a649a4fce
fix: removing payment_field from loan repayment closuer (#24291) 2021-01-13 21:10:49 +05:30
Afshan
33fac19bce
fix: calculation of remaining_sub_periods if relieving date before month start date (#24319) 2021-01-13 21:06:04 +05:30