Commit Graph

34114 Commits

Author SHA1 Message Date
Saqib Ansari
b855a32d84 feat: generate IRN 2020-10-22 09:41:23 +05:30
Saqib Ansari
8fe07e4567 feat: make e invoice from erpnext sales invoice 2020-10-22 09:41:23 +05:30
Saqib Ansari
da0c064c70 feat: decrypt json data with SEK 2020-10-22 09:41:23 +05:30
Saqib Ansari
f3d74b7638 feat: AES decryption of SEK with appkey 2020-10-22 09:41:23 +05:30
Saqib Ansari
529727224c chore: handle error response 2020-10-22 09:41:23 +05:30
Saqib Ansari
9546e3ea32 feat: save token and sek from auth request 2020-10-22 09:41:23 +05:30
Saqib Ansari
6f035d2169 feat: rsa encryption with public key 2020-10-22 09:41:23 +05:30
Saqib Ansari
8d612d3f78 feat: read public key file 2020-10-22 09:41:23 +05:30
Saqib Ansari
c1acb7b77a feat: init e-invoice settings 2020-10-22 09:41:23 +05:30
Deepesh Garg
e0ef4abbcf fix: Test Cases 2020-10-22 09:40:15 +05:30
Deepesh Garg
bd16e0885b fix: Add test for loan top up 2020-10-22 09:40:15 +05:30
Deepesh Garg
35f985e514 fix: Update no copy fields 2020-10-22 09:40:14 +05:30
Deepesh Garg
b32de3ab13 fix: Test Case 2020-10-22 09:40:14 +05:30
Deepesh Garg
4c420ca490 fix: Validatiion for loan write off amountt 2020-10-22 09:40:14 +05:30
Deepesh Garg
2c97244bad fix: Test Cases 2020-10-22 09:34:27 +05:30
Mangesh-Khairnar
1a6d82a447 fix(payment-request): only consider paid transactions 2020-10-22 01:07:49 +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
Mangesh-Khairnar
c8a04fec35 fix(mpesa-settings): add test cases to verify transactions 2020-10-21 14:07:00 +05:30
Deepesh Garg
2f65ab5355 fix: Validatiion for loan write off amountt 2020-10-21 10:40:59 +05:30
Saqib
4970386990 Merge branch 'develop' into UAE-VAT-Format 2020-10-20 18:38:44 +05:30
Mohammad Hasnain
8796567b42 chore(UAE VAT 201): add puctuation 2020-10-20 16:35:28 +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
Mohammad Hasnain
33e9a1ab31 refactor(UAE VAT 201): solve linting issues 2020-10-20 13:04:38 +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
Mohammad Hasnain
6a24da4efd refactor(UAE VAT 201): break functions 2020-10-20 11:53:06 +05:30
Rohit Waghchaure
09572f10f8 fix: overproduction, not allowed to transfer extra materials 2020-10-20 11:01:36 +05:30
Mohammad Hasnain
c08591124c chore(UAE VAT 21): solve merge conflicts 2020-10-20 10:17:48 +05:30
Rohit Waghchaure
6471912216 fix: not able to do overproduction 2020-10-20 10:02:01 +05:30
Mohammad Hasnain
75ccb62d46 Merge branch 'develop' into UAE-VAT-Format 2020-10-20 09:40:44 +05:30
Mohammad Hasnain
78ec254da4 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-10-20 09:39:01 +05:30
Mohammad Hasnain
234036df32 chore(uae vat 201): solve travis issues 2020-10-20 07:42:10 +05:30
Mohammad Hasnain
853fd03f49 feat(uae vat 201): fix linter issues 2020-10-19 22:35:16 +05:30
Mohammad Hasnain
33cdfdfb7f feat(UAE VAT 201): Add tests for report 2020-10-19 20:48:43 +05:30
Mohammad Hasnain
c1b8004757 feat(UAE VAT 21): claimable to recoverable 2020-10-19 20:47:56 +05:30
Mangesh-Khairnar
5c29eb08c4 Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-10-19 18:29:46 +05:30
Mangesh-Khairnar
ebb8ee3dc6 fix(payment gateway account): add patch to set the payment channel as email 2020-10-19 18:27:40 +05:30
Mohammad Hasnain
32eb9a7893 feat(UAE VAT 201): claimable to recoverable 2020-10-19 17:58:50 +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
Saqib
896a0cc1f7 Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-19 11:55:12 +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