Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,020 Commits 3 Branches 0 Tags
Commit Graph

33020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
d53abf194e fix: Party for loan ledger entries 2020-11-09 18:34:38 +05:30
Deepesh Garg
dd94587ef8 fix: Loan write off precision issue 2020-11-07 17:08:30 +05:30
Deepesh Garg
2ad015450e fix: Remarks fix 2020-11-07 00:14:40 +05:30
Deepesh Garg
3899079bb9 fix: Loan seurity unpledge msg improvement 2020-11-06 17:39:54 +05:30
Deepesh Garg
3e69756e15 fix: Add better remarks for Loan GL entries 2020-11-06 14:25:09 +05:30
Deepesh Garg
1145b3796c fix: Remove accrual type from process 2020-11-05 21:21:40 +05:30
Deepesh Garg
a2bff7fbfc fix: Penalty amount calculation fix 2020-11-05 21:14:29 +05:30
Deepesh Garg
49cc57e76e fix: Negative amount check for amounts 2020-11-05 21:14:07 +05:30
Deepesh Garg
c9a6135d6c fix: Interest accrual after loan topup 2020-10-28 13:38:15 +05:30
Deepesh Garg
13f4b3fc17 fix: Translation syntax 2020-10-26 19:01:36 +05:30
Deepesh Garg
a630de56e9 fix: Loan disbursement amount validation check 2020-10-26 18:53:56 +05:30
Deepesh Garg
5b4742fd25 fix: Permission fixes for some doctypes 2020-10-26 16:56:05 +05:30
Deepesh Garg
d63fbd79f4 fix: Unaccrued interest from last accrual date instead of disbursement date 2020-10-26 14:20:55 +05:30
Deepesh Garg
2b3f8e0c3b fix: Cancel repayment accrual interest entry on payment cancellation 2020-10-23 19:02:24 +05:30
Deepesh Garg
ca6cb6433c Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove 2020-10-22 21:52:16 +05:30
Deepesh Garg
cd2c90451e fix: Unaccrued interest after disbursal 2020-10-22 21:50:06 +05:30
Marica
3b1be2b1de
fix: Add Taxes if missing via Update Items (#23702) 
* fix: Add Taxes if missing via Update Items

* chore: PO Test for adding tax row via Update Items

* chore: SO Test for adding tax row via Update Items
 2020-10-22 17:04:31 +05:30
rohitwaghchaure
e3ad5f0bc3
Merge pull request #23407 from deepeshgarg007/stock_entry_conversion_factor 
fix: Conversion factor fixes in Stock Entry
 2020-10-22 16:58:06 +05:30
Saqib
a6ff664386
fix: cannot auto unlink payments for credit/debit notes (#23689) 2020-10-22 16:30:57 +05:30
rohitwaghchaure
cc5171a324
Merge branch 'develop' into stock_entry_conversion_factor 2020-10-22 15:20:32 +05:30
Suraj Shetty
6a0eb61af3
fix: Set customer only if contact is present (#23704) 2020-10-22 14:05:58 +05:30
Michelle Alva
52514a30d7
feat: Add Integrations Settings in desk (#22857) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-10-22 09:52:34 +05:30
Deepesh Garg
2c97244bad fix: Test Cases 2020-10-22 09:34:27 +05:30
Deepesh Garg
3f177bffac fix: Add test for loan top up 2020-10-21 22:15:18 +05:30
Deepesh Garg
8f9bab79a7 fix: Update no copy fields 2020-10-21 19:03:13 +05:30
Deepesh Garg
13cbda110d fix: Test Case 2020-10-21 16:11:52 +05:30
Deepesh Garg
2f65ab5355 fix: Validatiion for loan write off amountt 2020-10-21 10:40:59 +05:30
Deepesh Garg
ce95bc2ce0
Merge pull request #23691 from nextchamp-saqib/fix-#214 
fix: '>' not supported between instances of 'str' and 'int'
 2020-10-20 14:17:55 +05:30
rohitwaghchaure
b74d17b1e3
Merge pull request #23688 from rohitwaghchaure/fixed-overproduction-issue-develop 
fix: overproduction issue develop
 2020-10-20 12:55:43 +05:30
Saqib Ansari
903055b7b6 fix: '>' not supported between instances of 'str' and 'int' 2020-10-20 11:59:06 +05:30
Rohit Waghchaure
09572f10f8 fix: overproduction, not allowed to transfer extra materials 2020-10-20 11:01:36 +05:30
Rohit Waghchaure
6471912216 fix: not able to do overproduction 2020-10-20 10:02:01 +05:30
Joseph Marie Alba
8115be58a3
fix: Posting Date bug in load_defaults (#23415) 
this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date

The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored.
Example: (Assuming posting date has been included in standard filter)
```
frappe.ui.form.on('Journal Entry', {
	before_load(frm) {
	    var posting_date = $("input[data-fieldname='posting_date']")[0].value
	    posting_date = moment(posting_date)._d
	    frm.set_value('posting_date', posting_date )
	}
})
```

Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored.

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-10-19 17:02:04 +05:30
Rucha Mahabal
174019a838
fix: Student Admission and Student Applicant fixes (#23515) 
* fix: student admission list portal styling

* fix: added basic validations to Student Admission DocType

* fix: show program description and apply button for every program

* fix: don't show apply now button if admissions have not started

* fix: fetch admission details in student applicant web form

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 17:00:56 +05:30
Deepesh Garg
8859b71956
fix: Check for backdated validation only for transaction company (#23639) 
* fix: Check SLE only for transaction company

* fix: Add tests

* fix: Move backdated entry validation from transaction base to stock ledger entry

* chore: Add tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 16:56:45 +05:30
Afshan
e0cb6c3b9d
fix: removed extra space from label "Rate" (#23683) 2020-10-19 16:55:20 +05:30
rohitwaghchaure
3a17147a32
refactor: book loss amount in the COGS instead of stock received but not billed (#23671) 2020-10-19 16:54:11 +05:30
Glen Whitney
f5a8dc0f9c
fix(Bank Reconciliation): update/merge CR/DR journal entry search (#23629) 
* fix(Bank Reconciliation): update/merge CR/DR journal entry search

  Prior to this commit, the debit journal entry search (for
  credit-side Bank Transaction entries) and the corresponding
  credit journal entry search had diverged, with the latter
  working but the former not working. Thus, the search for
  journal entries matching a credit Bank Transaction (for the
  purposes of reconciliation) was never returning any matching
  journal entries, making reconciliation difficult.

  To fix this, this commit not only updates the debit journal
  entry search, but takes advantage of the fact that the two SQL
  queries for the two sides (debit/credit) differ only by the
  word "debit" or "credit," to merge the code for the two
  queries, making the code more DRY and hopefully reducing the
  chance of similar bugs occurring in the future.

* fix: message translation

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 16:49:55 +05:30
rohitwaghchaure
2fbeb7c1dd
refactor: added new filters in the Batch-wise balance history report (#23676) 
* refactor: added new filters in the Batch-wise balance history report

* fix: added semicolon

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:37:54 +05:30
Frappe PR Bot
083f3fd981
chore: Update translations (#23677) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:19:27 +05:30
Rucha Mahabal
96bd65e203
fix: duplicate validation for Course Enrollment (#23659) 
* fix: duplicate validation for Course Enrollment

* fix: clean-up failing tests
 2020-10-19 10:41:25 +05:30
rohitwaghchaure
5d6686bd8c
Fixed stock ageing report data develop (#23673) 
* fix: stock ageing report

* Update stock_ageing.py
 2020-10-19 10:39:20 +05:30
rohitwaghchaure
21bf5e9b8e
Fixed incorrect operation time calculation develop (#23674) 
* fix: incorrect operation time calculation for batch size

* Update test_work_order.py
 2020-10-19 10:38:48 +05:30
Deepesh Garg
8cd8dbe15d fix: Add write off test 2020-10-18 22:26:09 +05:30
Deepesh Garg
9945ccc0cc fix: Write Off amount handling in Loan accrual and closure 2020-10-18 22:25:24 +05:30
Rucha Mahabal
c3b1aef9f9
fix(minor): msgprint not defined in POS Invoice (#23680) 
* fix(minor): msgprint not defined in POS Invoice

* fix: translation friendly syntax
 2020-10-18 19:28:26 +05:30
Deepesh Garg
c0e24735e3 feat: Add loan write off doctype 2020-10-17 22:31:36 +05:30
Faris Ansari
c6f4e84a45
Merge pull request #23640 from abhishekbalam/address_customisation 2020-10-16 18:21:09 +05:30
Marica
569e218aa0
Merge pull request #23666 from marination/payment-reco-mandatory-check 
fix: Payment Reconciliation client side validations
 2020-10-16 18:06:16 +05:30
rohitwaghchaure
e30397bf2e
Merge pull request #23668 from rohitwaghchaure/incorrect-work-order-qty-againt-production-plan-develop 
fix: production plan incorrect work order qty (#23264)
 2020-10-16 17:41:25 +05:30