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
33,173 Commits 458 Branches 1,746 Tags
6f035d216984a9e2297689d956f50d15afdb169d
Commit Graph

33173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
469c23b562 fix: Add write off test 2020-10-19 09:34:53 +05:30
Deepesh Garg
3fe127d483 fix: Write Off amount handling in Loan accrual and closure 2020-10-19 09:34:44 +05:30
Deepesh Garg
78b30ccc4f feat: Add loan write off doctype 2020-10-19 09:34:36 +05:30
Deepesh Garg
10fdd38e32 fix: Loan Security unpledge on loan cancel 2020-10-13 18:17:04 +05:30
Deepesh Garg
dc9438c3a4 fix: Add unaccrued interest in interest amount for loan closure 2020-10-13 10:00:35 +05:30
Deepesh Garg
6771d97c42 fix: Acrual type 2020-10-13 10:00:35 +05:30
Deepesh Garg
ec17111e27 fix: Remove repayment type 2020-10-13 10:00:35 +05:30
Deepesh Garg
8679ce475a fix: Add accrual type and penalty field in interest accrual 2020-10-13 10:00:35 +05:30
Deepesh Garg
fd3952ba9a fix: Button to close loan 2020-10-13 10:00:35 +05:30
Deepesh Garg
5138f00176 fix: Add method for loan closure 2020-10-13 10:00:35 +05:30
Deepesh Garg
6a24d2df8c Merge branch 'develop' of https://github.com/frappe/erpnext into enconnex_erpnext 2020-10-13 09:54:04 +05:30
Marica
da83e09cb3 Merge pull request #23607 from marination/holiday_list 
fix: Convert dates to datetime.date before comparing in Holiday List
 2020-10-13 02:46:53 +05:30
marination
5b790a0095 fix: Convert dates to datetime.date before comparing in Holiday List 2020-10-13 02:37:55 +05:30
Deepesh Garg
1137d8bd33 Merge pull request #23476 from anupamvs/subscription-invoice-issue 
fix: Payment Schedule not fetching
 2020-10-12 20:34:43 +05:30
Anupam Kumar
71c02a6e89 Merge branch 'develop' into subscription-invoice-issue 2020-10-12 19:41:31 +05:30
rohitwaghchaure
b3aeba1a1b Merge pull request #23453 from frappe/validate_regional_germany 
feat: validate Sales Invoice for Germany
 2020-10-12 18:45:16 +05:30
Raffael Meyer
0975b961f9 Merge branch 'develop' into validate_regional_germany 2020-10-12 15:08:58 +02:00
Saqib
3daad224ad fix: cannot merge pos invoice if validate selling price is checked (#23593) 
* fix: cannot merge pos invoice if validate selling price is checked

* fix: validate selling price

* fix: test

* chore: add test

* fix: error message
 2020-10-12 18:31:23 +05:30
rohitwaghchaure
4164d08d17 Merge pull request #23323 from marination/supplier-quotn-comparison 
feat: Supplier Quotation Comparison - v3
 2020-10-12 17:55:15 +05:30
Marica
73e16ca16a Merge pull request #23554 from rohitwaghchaure/print-uom-after-quantity-patch 
fix: added patch to make custom field 'Print UOM after Quantity'
 2020-10-12 17:43:39 +05:30
Marica
41067e204c Merge branch 'develop' into print-uom-after-quantity-patch 2020-10-12 17:32:29 +05:30
Marica
ea1da6e4b8 Merge pull request #23534 from anupamvs/company-issue 
fix: error log while creating company
 2020-10-12 17:25:57 +05:30
Marica
6d935d4e48 Merge branch 'develop' into company-issue 2020-10-12 17:25:12 +05:30
Marica
dc75fe2cb6 Merge pull request #23478 from marination/supplier-quotation-ux 
feat: Supplier Quotation UX fixes
 2020-10-12 17:17:27 +05:30
Marica
14b9c79ddc Merge branch 'develop' into supplier-quotation-ux 2020-10-12 17:16:28 +05:30
Saqib
b332c5f06f fix: sales invoice series gets overwritten with pos invoice series (#23479) 
* fix: sales invoice series gets overwritten with pos invoice series

* chore: show is consolidated only if sales invoice is pos
 2020-10-12 17:10:37 +05:30
Saqib
ebb0a6266a fix: last purchase rate in item prices report (#23506) 
* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* chore: fetch last purchase rate from update stock purchase invoices
 2020-10-12 17:09:09 +05:30
Saqib
ebbe285872 feat: (report) POS Register (#23313) 
* feat: pos register report

* feat: group by fields in pos register

* chore: add paid amount column

* fix: (minor) remove redundant group by label
 2020-10-12 17:02:31 +05:30
rohitwaghchaure
a060f8c00b Merge pull request #23524 from michellealva/employee_exit 
fix(Employee): Field level change in Exit section
 2020-10-12 16:23:54 +05:30
rohitwaghchaure
14e7656a57 Merge pull request #23588 from kevingdc/fix/asset-update-maintenance-status 
fix: Asset status after maintenance or repair
 2020-10-12 16:13:29 +05:30
rohitwaghchaure
80519b1098 Merge pull request #23596 from marination/item-attribute-validation-on-non-template-item 
fix: Perform Item Attribute Value Validation on Variants Only
 2020-10-12 16:12:02 +05:30
Marica
e9f0268d32 Merge branch 'develop' into item-attribute-validation-on-non-template-item 2020-10-12 15:26:34 +05:30
rohitwaghchaure
a57ad47cb8 Merge pull request #23538 from kennethsequeira/spellcheck 
chore: spell fixes for Condition
 2020-10-12 15:25:23 +05:30
Marica
bf0b948d0b Merge pull request #23362 from marination/mr-ux 
fix: More MR UX fixes
 2020-10-12 15:22:29 +05:30
Marica
aeba75cd08 Merge branch 'develop' into mr-ux 2020-10-12 15:17:32 +05:30
rohitwaghchaure
4e59abf0bf Merge pull request #23583 from anupamvs/item-price 
fix: can't save item price after adding child table
 2020-10-12 15:15:50 +05:30
Rushabh Mehta
2bef986f14 Merge pull request #23450 from michellealva/jc 
fix: Change Error Message in Work Order
 2020-10-12 15:07:21 +05:30
Glen Whitney
6ec3dc5453 fix(asset): cannot create asset if cwip disabled and account not set (#23580) 
* Never add an asset GL entry if CWIP is not enabled

* fix: asset purchase with purchase invoice

* chore: allow enable cwip accounting only if cwip account is set

* fix: cannot create asset if cwip disabled and account not set

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2020-10-12 14:56:55 +05:30
Deepesh Garg
15d46040ff fix: Do not consider opening entries for TDS calculation (#23597) 2020-10-12 12:39:08 +05:30
Anupam
efc3e1fa62 fix: Payment Schedule not fetching 2020-10-12 12:15:49 +05:30
marination
03975a692e fix: Perform Item Attribute Value Validation on Variants Only 2020-10-12 12:03:07 +05:30
Kevin Chan
7a86a77322 fix: Asset status after maintenance or repair 
Fix a bug where an **Asset**'s status is not being set to what it was
previously after an **Asset Repair** or **Asset Maintenance**.
 2020-10-12 11:30:36 +08:00