nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 08:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,847 Commits 458 Branches 1,746 Tags
4bc4e96c2a67e55f9250c5d72cb96beeb6a7b74b
Commit Graph

34847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nabin Hait
f30c389e4d Merge branch 'develop' into naming-series-proj 2020-10-22 21:46:13 +05:30
Nabin Hait
db474aea95 Merge branch 'develop' into link-to-mr 2020-10-22 21:45:07 +05:30
Nabin Hait
ed1553ea81 Merge branch 'develop' into mpesa-integration 2020-10-22 21:45:03 +05:30
Nabin Hait
c77ce99ce8 Merge branch 'develop' into UAE-VAT-Format 2020-10-22 21:44:55 +05:30
Nabin Hait
5778595d50 Merge branch 'develop' into debit-credit-opening-invoice-tool 2020-10-22 21:42:54 +05:30
Nabin Hait
9ff4a2ebd8 Merge branch 'develop' into feat-added-balance-serial-no-column-develop 2020-10-22 21:40:29 +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
Saqib
52435ee291 Merge branch 'develop' into UAE-VAT-Format 2020-10-22 14:16:28 +05:30
Suraj Shetty
6a0eb61af3 fix: Set customer only if contact is present (#23704) 2020-10-22 14:05:58 +05:30
Rohit Waghchaure
fa842e8774 fix: incorrect backflush qty in manufacture entry 2020-10-22 13:35:27 +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
Saqib Ansari
b8b66a1450 chore: move e-invoice settings to regional 2020-10-22 09:42:32 +05:30
Saqib Ansari
e1b7d465c4 feat: complete e-invoice schema 2020-10-22 09:41:23 +05:30
Saqib Ansari
db2d221976 feat: cancel IRN 2020-10-22 09:41:23 +05:30
Saqib Ansari
383a3df807 chore: validations 2020-10-22 09:41:23 +05:30
Saqib Ansari
bc3b5e334b feat: decode signed json and QR code 2020-10-22 09:41:23 +05:30
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