nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 00:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,352 Commits 459 Branches 1,746 Tags
0ce26ce90ded24d6c4a164a9ac858336cd7f1c5d
Commit Graph

32352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
0ce26ce90d fix: cannot find attached key file 2020-10-01 09:22:04 +05:30
Saqib Ansari
a9f65654a1 fix: public key is required on validate 2020-10-01 09:22:04 +05:30
Saqib Ansari
57caf99a7e fix: hide cancel irn dialog on error 2020-09-30 13:18:37 +05:30
Saqib Ansari
d729f7f50e chore: show irn cancelled check after cancellation 2020-09-30 13:18:37 +05:30
Saqib Ansari
6fce734476 fix: item discount 2020-09-30 13:18:37 +05:30
Saqib Ansari
354da7ad4c chore: minor fixes 2020-09-30 13:18:37 +05:30
Saqib Ansari
aaf445af98 feat: Generate & Cancel IRN from Sales Invoice 2020-09-30 13:18:37 +05:30
Saqib Ansari
6eb4fe6659 feat: make IRN field on regional setup 2020-09-30 13:18:37 +05:30
Saqib Ansari
3739dc3f78 chore: rename schema to template & js cleanup 2020-09-30 13:18:37 +05:30
Saqib Ansari
dc3c03e47e chore: split einvoice settings and operations 2020-09-30 13:18:37 +05:30
Saqib Ansari
2fbc8c8f30 chore: move e-invoice settings to regional 2020-09-30 13:18:37 +05:30
Saqib Ansari
06a21da29e feat: complete e-invoice schema 2020-09-30 13:18:37 +05:30
Saqib Ansari
b488872cbd feat: cancel IRN 2020-09-30 13:18:37 +05:30
Saqib Ansari
88fa9866b1 chore: validations 2020-09-30 13:18:37 +05:30
Saqib Ansari
62109c3c1a feat: decode signed json and QR code 2020-09-30 13:18:37 +05:30
Saqib Ansari
1bbdc504bf feat: generate IRN 2020-09-30 13:18:37 +05:30
Saqib Ansari
e43a50357b feat: make e invoice from erpnext sales invoice 2020-09-30 13:18:37 +05:30
Saqib Ansari
17cd44ecd7 feat: decrypt json data with SEK 2020-09-30 13:18:36 +05:30
Saqib Ansari
54ebb06d8a feat: AES decryption of SEK with appkey 2020-09-30 13:18:36 +05:30
Saqib Ansari
ddf9d9ae0e chore: handle error response 2020-09-30 13:18:36 +05:30
Saqib Ansari
5488ccfa8c feat: save token and sek from auth request 2020-09-30 13:18:36 +05:30
Saqib Ansari
0b304b3561 feat: rsa encryption with public key 2020-09-30 13:18:36 +05:30
Saqib Ansari
4971061054 feat: read public key file 2020-09-30 13:18:36 +05:30
Saqib Ansari
a7167f775d feat: init e-invoice settings 2020-09-30 13:18:36 +05:30
Deepesh Garg
1ccba26173 Merge branch 'version-13-beta' of https://github.com/frappe/erpnext into enconnex_erpnext 2020-09-30 12:31:19 +05:30
Saurabh
0a88624df0 Merge pull request #23373 from abhishekbalam/version-13-beta 
fix(activation): Added New DocTypes in get_level()
 2020-09-21 15:38:19 +05:30
Abhishek Balam
064a2c9aed fix: add doctypes to activation 2020-09-21 15:35:24 +05:30
Saurabh
3caec96ce7 Merge pull request #23142 from saurabh6790/fix-setup-install 
fix: check setup complete flag instead setup page
 2020-08-25 14:52:13 +05:30
Saurabh
10bf6dc2a6 fix: check setup complete flag instead setup page 2020-08-25 14:51:00 +05:30
Deepesh Garg
afd2e7bb8e Merge pull request #23141 from deepeshgarg007/sle_cancel_v13_beta 
fix: Reverse SLE not created for fraction qty or qty less than 1
 2020-08-25 14:42:04 +05:30
Deepesh Garg
04e3098481 fix: Test Case for qty less than 1 2020-08-25 14:27:47 +05:30
Deepesh Garg
84e78ec7ad fix: Negative SLE not created for fraction qty or qty less than 1 2020-08-25 14:27:35 +05:30
Marica
e6c2ce02b3 Merge pull request #23140 from AfshanKhan/fix-po 
fix:referencing frm
 2020-08-25 13:56:10 +05:30
Afshan
930adec7ee fix:referencing frm 2020-08-25 13:48:44 +05:30
Marica
57d2fe3452 Merge pull request #23138 from marination/reverse-charge-v13-beta 
fix: Do not update total for RCM invvoices if net taxes are zero
 2020-08-25 13:34:05 +05:30
Deepesh Garg
c3fb68265f fix: Do not update total for RCM invvoices if net taxes are zero 2020-08-25 13:35:33 +05:30
Deepesh Garg
ffbf30809d fix: filter pricing rules based on condition 2020-08-14 22:37:27 +05:30
Deepesh Garg
ad02cfe98e Merge branch version-13-beta into enconnex_erpnext 2020-08-14 19:21:54 +05:30
Abhishek Balam
392a2856d3 fix: condition syntax validation readded, fetch item details if condition not met ignoring rule 2020-08-14 19:15:06 +05:30
Abhishek Balam
56b0136696 fix: eval fail message fix 2020-08-13 12:54:38 +05:30
Deepesh Garg
da82a380e1 fix: Condition fix 2020-08-13 12:54:30 +05:30
Deepesh Garg
c0e3bcf865 fix: Pass doc instead of args 2020-08-13 12:54:23 +05:30
Abhishek Balam
398c0f0b7f feat: add condition field in pricing rule 2020-08-13 12:51:35 +05:30
Abhishek Balam
6b9f7e35f4 fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order 2020-08-11 16:17:34 +05:30
Deepesh Garg
f9a6a90900 fix: Ignore cpmpany and bank account doctype while deleting company transactions 2020-08-10 18:26:47 +05:30
sahil28297
8aeb20cab8 Merge pull request #22977 from sahil28297/fix_pos_isse_v13 
fix: remove mentions of display items in stock (#22963)
 2020-08-10 16:00:56 +05:30
sahil28297
81e35f67be Merge pull request #22979 from saurabh6790/pos 
fix: [pos] minor bugs
 2020-08-10 16:00:20 +05:30
sahil28297
e183161158 Merge pull request #22980 from sahil28297/sub_dashboard_link_v13 
fix: Subscripition link in Customer dashboard (#22960)
 2020-08-10 15:59:58 +05:30
sahil28297
b42e268d1b Merge pull request #22982 from saurabh6790/tax-template-issue 
fix: Susbcription in Sales Taxes and Charges Dashboard
 2020-08-10 15:58:58 +05:30
marination
3beeeb589a fix: Susbcription in Sales Taxes and Charges Dashboard 2020-08-10 15:55:02 +05:30