CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-10 05:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,940 Commits 410 Branches 1,714 Tags
bdfd30760a0ad15f12c33bb3f2547669d7750cd0
Commit Graph

30940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
bdfd30760a chore: move e-invoice settings to regional 2020-11-05 13:17:06 +05:30
Saqib Ansari
418818f0ec feat: complete e-invoice schema 2020-11-05 13:17:05 +05:30
Saqib Ansari
d971917ecf feat: cancel IRN 2020-11-05 13:17:05 +05:30
Saqib Ansari
dda44bb1f5 chore: validations 2020-11-05 13:17:05 +05:30
Saqib Ansari
448ab6e3df feat: decode signed json and QR code 2020-11-05 13:17:04 +05:30
Saqib Ansari
cc3e0bf806 feat: generate IRN 2020-11-05 13:17:04 +05:30
Saqib Ansari
93b3c2ce06 feat: make e invoice from erpnext sales invoice 2020-11-05 13:17:04 +05:30
Saqib Ansari
7c427aa890 feat: decrypt json data with SEK 2020-11-05 13:17:03 +05:30
Saqib Ansari
b6509ead64 feat: AES decryption of SEK with appkey 2020-11-05 13:17:03 +05:30
Saqib Ansari
f8346ce62f chore: handle error response 2020-11-05 13:17:03 +05:30
Saqib Ansari
e73a9deb42 feat: save token and sek from auth request 2020-11-05 13:17:02 +05:30
Saqib Ansari
5669a5f618 feat: rsa encryption with public key 2020-11-05 13:17:02 +05:30
Saqib Ansari
18afbc0617 feat: read public key file 2020-11-05 13:17:02 +05:30
Saqib Ansari
f396b35622 feat: init e-invoice settings 2020-11-05 13:17:02 +05:30
rohitwaghchaure
533954cd12 Merge pull request #23815 from Anurag810/stock_ledger_report_v12 
fix:  list index out of range on incilding uom
 2020-11-05 11:49:37 +05:30
Anurag Mishra
8e37316832 fix: list index out of range on incilding uom 2020-11-04 15:27:17 +05:30
Afshan
2860f62772 Fix leave ledger patch (#23806) 
* fix: leave ledger patch

* fix: modified patch date
 2020-11-04 14:15:26 +05:30
Deepesh Garg
1f10da4d66 Merge pull request #23786 from deepeshgarg007/pos_v12_hotfix 
fix: Place of Supply fix in Sales Invoices
 2020-11-02 11:23:47 +05:30
Deepesh Garg
7036635007 fix: fieldname 2020-10-30 22:15:23 +05:30
Deepesh Garg
c1719ef54b fix: Place of Supply fix in Sales Invoices 2020-10-30 22:15:23 +05:30
Afshan
c8201eba33 fix: leave ledger entries (#23782) 2020-10-30 18:47:52 +05:30
rohitwaghchaure
b2bd8ef144 Merge pull request #23773 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry 
fix: po_detail field has no value for subcontracted stock entry
 2020-10-30 14:19:55 +05:30
Rohit Waghchaure
e523cfbb02 fix: po_detail field has no value for subcontracted stock entry 2020-10-30 03:04:39 +05:30
Marica
d8705240a0 chore: (Production Plan) Simplify and fix translation in message popup (#23754) 2020-10-29 18:54:06 +05:30
Deepesh Garg
ab1415c0cc Merge pull request #23762 from rohitwaghchaure/fixed-subscription-test-case 
fix: subscription test case
 2020-10-29 17:04:12 +05:30
Rohit Waghchaure
2f12eed44d fix: subscription test case 2020-10-29 15:52:33 +05:30
rohitwaghchaure
c9e93fd9b1 Merge pull request #23740 from prssanna/job-card-gantt 
fix: override field_map for job card gantt
 2020-10-29 14:50:19 +05:30
Rucha Mahabal
82db751a52 fix: LMS sign-up link (#23752) 2020-10-29 11:19:34 +05:30
Marica
2d936fe5ca Merge pull request #23748 from marination/leave-type-filter 
fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050)
 2020-10-28 17:23:45 +05:30
Abhishek Balam
d0541d77b3 Merge branch 'version-12-hotfix' into leave-type-filter 2020-10-28 16:29:06 +05:30
Anurag Mishra
5f148d3d3a fix: set_query in leave application (#22197) 2020-10-28 16:25:57 +05:30
Abhishek Balam
6c894f8f41 fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050) 
* table was showing empty with just headers when no leaves allocated, fixed template code

* added filters on Leave Type based on leave allocation for a particular employee and to/from dates
 2020-10-28 16:12:57 +05:30
Marica
5effbeef49 Merge pull request #23733 from AfshanKhan/prod-order-reference-in-item-v12 
fix: Remove Production Order reference from Item Validation
 2020-10-28 16:09:52 +05:30
prssanna
1fa8dcb15b fix: override field_map for job card gantt 2020-10-28 11:02:02 +05:30
Afshan
0c511b31fd fix: Remove Production Order reference from Item Validation 2020-10-26 20:34:48 +05:30
Nabin Hait
439c4e11bf fix: Show accounts in financial statements upto level 20 (#23719) 2020-10-24 22:00:17 +05:30
Aditya Duggal
a76b1c530d fix: None type error if the Pricing Rule applicable_for is None (#23664) 
* fix: None type error if the Pricing Rule applicable_for is None
* fix: sider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-10-24 11:20:24 +05:30
rohitwaghchaure
aef8010bc1 Merge pull request #23712 from marination/cashier-closing-type-issue-fix 
fix: Cashier Closing, Type Issue
 2020-10-23 16:12:41 +05:30
marination
e9b7b69435 fix: Cashier Closing Type Issue 2020-10-23 14:46:44 +05:30
Saqib
eb6fb6fffa fix: cannot auto unlink payments for credit/debit notes (#23690) 2020-10-22 16:31:55 +05:30
Marica
ab5d596959 fix: Add Taxes if missing via Update Items (#23705) 
* 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 16:28:41 +05:30
Afshan
203fc2b940 fix: removed extra space from label "Rate" (#23685) 2020-10-20 10:56:38 +05:30
Saqib
8e7a755aeb feat: show only available items in point of sale (#23667) 
* feat: show available items in pos

* feat: show selected pos profile on pos screen

* fix: codacy

* fix: codacy
 2020-10-19 11:37:22 +05:30
Sun Howwrongbum
334c282f7b fix: consider rounded_total in returns (#23631) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:30:48 +05:30
Saqib
3ae9bbc0a7 fix: fuel expense amount of vehicle log (#23634) 
* fix: fuel expense amount of vehicle log

* fix: undefined var employee_id in test

* fix: test
 2020-10-16 11:54:36 +05:30
rohitwaghchaure
8b8457c5d3 Merge pull request #23647 from rohitwaghchaure/fixed-overproduction-against-work-order 
fix: overproduction, not allowed to transfer extra materials
 2020-10-16 10:31:58 +05:30
rohitwaghchaure
eabe1af280 Merge pull request #23651 from rohitwaghchaure/donot-set-serial-nos-if-manually-set 
fix: manually set serial nos override with current available serial nos
 2020-10-15 22:01:32 +05:30
rohitwaghchaure
7bbdbaa2fa Merge pull request #23655 from rohitwaghchaure/removed-repetative-code 
fix: remove repetative code
 2020-10-15 21:57:33 +05:30
Rohit Waghchaure
28a5169646 fix: remove repetative code 2020-10-15 21:54:53 +05:30
Rohit Waghchaure
c7ec475429 fix: manually set serial nos override with current available serial nos 2020-10-15 19:00:02 +05:30