nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 07:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,526 Commits 444 Branches 1,739 Tags
07f40596bce6c6703b6f151be09161b7d61213ce
Commit Graph

34526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mohammad Hasnain Mohsin Rajan
07f40596bc feat(Bank Reconciliation): Redesign (#24273) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-22 22:19:47 +05:30
Nabin Hait
866cf70d3a fix: validate pan 2021-02-22 21:35:00 +05:30
Marica
214951a9c6 Merge pull request #24631 from AfshanKhan/fix-valuation-errror-customer-provided 
fix: check if customer provided item while setting opening stock
 2021-02-22 20:10:27 +05:30
Nabin Hait
69a6bed106 fix: Replaced spaces with tabs 2021-02-22 20:03:23 +05:30
Shridhar Patil
58399f6524 fix: next follow up date should be always greater then current time (#24308) 2021-02-22 19:37:38 +05:30
Nabin Hait
0ca74ce04b fix: Fixes related to client script renaming (#24698) 2021-02-22 19:32:51 +05:30
Ankush Menat
98a0feab89 fix(india): escape for special characters in JSON (#24695) 
JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811
 2021-02-22 19:30:02 +05:30
Deepesh Garg
bb8cd1cdaa feat: Basic validation for indian PAN No. in Supplier (#24687) 2021-02-22 19:28:45 +05:30
Shariq Ansari
8676bedd18 fix: Add phone icon on read only phone fields (#24680) 
* fix: Add phone icon on read only phone fields

* fix: sider fix
 2021-02-22 19:28:01 +05:30
Saqib
14472f6bab fix(regional): vehicle no is mandatory for ewaybill generation (#24679) 
* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition
 2021-02-22 19:27:23 +05:30
Afshan
fdafb55fba fix: error message when making reverse journal entry (#24665) 2021-02-22 19:25:57 +05:30
Marica
28c834ac95 Merge branch 'develop' into fix-valuation-errror-customer-provided 2021-02-22 16:00:28 +05:30
rohitwaghchaure
311bb6452f Merge pull request #24691 from deepeshgarg007/accounting_dimension_timeout 
fix: Accounting Dimension creation background job timeout
 2021-02-22 15:29:41 +05:30
Deepesh Garg
0c15f75524 Merge pull request #24696 from frappe/revert-24505-loan_exposure_report_fix 
Revert "fix: Error handling in loan reports and precision fixes"
 2021-02-22 15:13:11 +05:30
Deepesh Garg
d780f56ba8 Revert "fix: Error handling in loan reports and precision fixes" 2021-02-22 15:12:35 +05:30
Afshan
133ebc1d51 Merge branch 'develop' into fix-valuation-errror-customer-provided 2021-02-22 14:16:33 +05:30
Marica
ed1c7649cd Merge pull request #24553 from nextchamp-saqib/quality-inspection-parameter-group 
feat: introduce parameter group in quality inspection
 2021-02-22 13:53:14 +05:30
Marica
4a1ffcf742 Merge branch 'develop' into quality-inspection-parameter-group 2021-02-22 11:34:34 +05:30
Afshan
01b4ee8a3c Merge branch 'develop' into fix-valuation-errror-customer-provided 2021-02-22 11:17:45 +05:30
Deepesh Garg
aa46def745 fix: Accounting Dimension creation background job timeout 2021-02-21 21:54:23 +05:30
Deepesh Garg
a6d0610730 Merge pull request #24505 from deepeshgarg007/loan_exposure_report_fix 
fix: Error handling in loan reports and precision fixes
 2021-02-20 17:57:09 +05:30
Deepesh Garg
e12398e75e Merge pull request #24682 from frappe/michellealva-leave 
fix: typo in Leave Balance Report
 2021-02-20 17:53:04 +05:30
Deepesh Garg
75b01e3d72 Merge pull request #24683 from frappe/michellealva-patch-1 
fix: Typo in Leave Application
 2021-02-20 17:52:38 +05:30
Deepesh Garg
bbadebcf64 Merge branch 'develop' into loan_exposure_report_fix 2021-02-20 17:32:17 +05:30
Deepesh Garg
6f29f67a83 Merge pull request #24667 from pateljannat/gstr-1-unidentified-accounts-issue 
fix: excluding unidentified accounts from gstr-1
 2021-02-20 17:27:56 +05:30
Michelle Alva
43f126ed13 fix: Typo in Leave Application 
Change "Leaves" to "Leave"
 2021-02-20 10:46:22 +05:30
Michelle Alva
ab149f196e fix: typo in Leave Balance Report 
Change Leaves to Leave
 2021-02-20 10:43:47 +05:30
rohitwaghchaure
1aad27a539 Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card 
fix: [minor] validation of job card in stock entry
 2021-02-19 21:22:57 +05:30
Saqib Ansari
8c7c682f17 chore: make parameter group optional 2021-02-19 20:35:23 +05:30
Deepesh Garg
6a5ef261f2 feat: Normal rounding for GST Taxes (#24488) 
* feat: Normal rounding for GST Taxes

* fix: Add test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-19 14:30:23 +05:30
Deepesh Garg
811ff5c397 Merge pull request #24669 from deepeshgarg007/transaction_delete_fix 
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
 2021-02-19 10:54:56 +05:30
Deepesh Garg
7efbbcf3aa fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master 2021-02-19 10:53:58 +05:30
Marica
a43aea0dc1 Merge pull request #24482 from pateljannat/rfq-contact-email-set 
fix: RFQ contact email set
 2021-02-19 10:23:07 +05:30
pateljannat
4858b40813 fix: excluding unidentified accounts from gstr-1 2021-02-18 18:44:29 +05:30
Marica
77d72d59ef Merge branch 'develop' into quality-inspection-parameter-group 2021-02-18 16:55:44 +05:30
Marica
f3ca4bcb70 Merge branch 'develop' into rfq-contact-email-set 2021-02-18 16:51:50 +05:30
Rucha Mahabal
ccc80927f6 feat: Department Wise Appointment Type charges (#24572) 
* feat: Appointment Type Service Items

Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>

* fix: set practitioner service item charges mandatory on item selection

Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>

* feat: use charges from appointment type during billing

* feat: handle appointment charges priority for invoice automation

* test: patient appointment auto invoicing scenarios

* fix: sider

* fix: minor fixes

Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 16:41:10 +05:30
Raffael Meyer
d44e60f17c feat: add Print Language to Lead and Opportunity (#24317) 
* fix: move "Print Language" to "More Information"

* feat: add "Print Language" in "More Information"

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-02-18 16:24:37 +05:30
Rucha Mahabal
e7bf87cc84 fix: POS return for Serialized Items (#24292) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-02-18 16:04:35 +05:30
Jannat Patel
ef5c714de2 fix: salary slip attribute error (#24455) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-02-18 15:52:29 +05:30
Rohit Waghchaure
c697cb8b2d fix: validation of job card in stock entry 2021-02-18 15:10:12 +05:30
Nabin Hait
d826bee13a fix: update qty in future sle (#24649) 
* fix: update qty in future sle

* fix: validate cancellation due to ongoing reposting

* fix: process sle against current timestamp
 2021-02-18 14:14:21 +05:30
Deepesh Garg
c5b94adc87 Merge pull request #24651 from ankush/ignore_gl_while_cancelling_so 
fix(selling): cancel sales order with cancelled PE
 2021-02-17 18:39:35 +05:30
rohitwaghchaure
03a1484aed Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop 
fix: Consolidated Financial Statement report not works if child compa…
 2021-02-17 16:35:43 +05:30
Marica
208d1942c3 Merge branch 'develop' into quality-inspection-parameter-group 2021-02-17 12:56:35 +05:30
Marica
a9de890993 Merge pull request #24534 from pateljannat/item_group_on_update_items 
fix: item_group on update items
 2021-02-17 11:17:49 +05:30
Marica
7de7bb5202 Merge branch 'develop' into item_group_on_update_items 2021-02-16 23:06:20 +05:30
Marica
b43c2e5d7c Merge pull request #24613 from marination/shopping-cart 
fix: Shopping cart breaks without Payment Gateway Account
 2021-02-16 23:05:19 +05:30
Marica
4441cebbb3 Merge branch 'develop' into shopping-cart 2021-02-16 20:55:00 +05:30
Ankush Menat
3f16902b00 fix(selling): cancel sales order with cancelled PE 
Allow cancelling sales order with cancelled payment entry. Ignoring GL
entries while cancelling the document is required to cancel it, reverse
entries are created by accounts controller.

Related issue: ISS-20-21-09586
 2021-02-16 18:53:40 +05:30