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,819 Commits 458 Branches 1,746 Tags
afbe93de3c2c21ea3dcb3827b09ff33ca215f2d8
Commit Graph

34819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Vora
95e9b2fd6e refactor(payroll): simplified logic for additional salary (#24907) 2021-03-17 19:58:56 +05:30
Rucha Mahabal
bacfaa4396 fix: calculate 80g certificate amount on validate for memberships (#24925) (#24926) 2021-03-17 19:51:59 +05:30
Deepesh Garg
438d9cad90 fix: Remove print statement 2021-03-17 18:04:05 +05:30
Deepesh Garg
f9519c7e13 fix: Group nil exempted and non gst items separately 2021-03-17 18:03:58 +05:30
Deepesh Garg
a5987782bd fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report 2021-03-17 15:49:44 +05:30
Rucha Mahabal
00cce433a5 fix(Non Profit): Membership and Donation API fixes (#24900) (#24905) 
* fix: Donation fixes

- differentiate between subscription payment and payment

- issue with donation amount

* fix: existing membership validation

* fix: ignore subscription payments while capturing donations
 2021-03-16 20:52:53 +05:30
Deepesh Garg
65165fcc80 Merge pull request #24894 from deepeshgarg007/add_account_method_v13 
fix: Add method for regional round off account back
 2021-03-16 13:25:24 +05:30
Deepesh Garg
d4a3cf1395 Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into add_account_method_v13 2021-03-16 13:24:33 +05:30
Deepesh Garg
635c480771 fix: Add method for regional round off account back 2021-03-16 13:22:20 +05:30
Marica
3f14aafa67 Merge pull request #24891 from marination/pos-opening-entry-pre-release 
fix: POS Opening Entry with empty balance detail rows
 2021-03-16 12:44:22 +05:30
marination
dd7d71ca2e fix: POS Opening Entry with empty balance detail rows 2021-03-16 12:05:37 +05:30
Deepesh Garg
7f2e45e0f4 fix: Unequal debit and credit issue on RCM Invoice (#24838) 
* fix: Unequal debit and credit issue on RCM Invoice

* fix: Travis
 2021-03-15 18:04:47 +05:30
rohitwaghchaure
e838d1c7f0 Merge pull request #24882 from rohitwaghchaure/fixed-validation-for-job-card-v13-beta 
fix: validation of job card in stock entry
 2021-03-15 17:35:35 +05:30
Rucha Mahabal
52ac8484ff feat: configurable action if the same purchase/selling rate is not maintained 2021-03-15 16:20:19 +05:30
Rohit Waghchaure
00a0e8da10 fix: validation of job card in stock entry 2021-03-15 14:15:10 +05:30
Deepesh Garg
bcb7848c84 fix: Add test for integration item sync 2021-03-15 10:45:38 +05:30
Deepesh Garg
19ca4d000b fix: Consider item integration mapping in Shopify 2021-03-15 10:45:27 +05:30
Deepesh Garg
288082abfd feat: Sync common items in ERPNext Integrations 2021-03-15 10:45:15 +05:30
Deepesh Garg
2b1809bd0e Merge branch 'version-13-beta' of https://github.com/frappe/erpnext into enconnex_erpnext 2021-03-13 23:18:13 +05:30
Marica
51c500d446 fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640) (#24864) 
Co-authored-by: casesolved-co-uk <richard@casesolved.co.uk>
 2021-03-12 15:51:45 +05:30
Afshan
9ab3bedd0a fix: added correct path in hooks (#24865) 2021-03-12 15:51:23 +05:30
Deepesh Garg
5fab55a564 fix: Always use https scheme 2021-03-12 12:51:33 +05:30
rohitwaghchaure
90ea17fbd6 Merge pull request #24825 from rohitwaghchaure/allow-to-set-item-in-batch-naming-pre 
fix: allow to select item code in batch naming
 2021-03-12 11:52:43 +05:30
Deepesh Garg
799f0daa1e fix: Use https protocol for site URL 2021-03-11 21:41:46 +05:30
Deepesh Garg
2f4b91172d feat: Role to allow over billing, delivery, receipt 2021-03-11 20:47:13 +05:30
Ankush Menat
2b61491adb fix: use account_name only in consolidated report (#24840) 
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.

Related issue: ISS-20-21-10217
 2021-03-11 16:05:58 +05:30
Rucha Mahabal
0b29f87fa2 feat(Non Profit): 80G Certificates and Donations (#24848) 
* feat(Non Profit): 80G Certificates and Donations

* fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)
 2021-03-11 16:02:23 +05:30
Nabin Hait
adb4225fa7 fix: reposting patch fixes (#24775) 2021-03-11 12:28:02 +05:30
Nabin Hait
fdcc926597 fix: rounding of earned leave is optional 2021-03-11 12:25:06 +05:30
Afshan
0623a34210 fix: added supplier warehouse field back again (#24827) 2021-03-10 09:46:38 +05:30
Rohit Waghchaure
535406cb0c fix: allow to select item code in batch naming 2021-03-09 21:01:12 +05:30
Anupam
04fa2e8d29 feat: provistion to pull timesheet in sales invoice 2021-03-08 17:03:32 +05:30
Saurabh
202ef92fa1 Merge branch 'version-13-beta-pre-release' into version-13-beta v13.0.0-beta.13 2021-03-05 09:34:01 +05:30
Saurabh
4e1206bf21 bumped to version 13.0.0-beta.13 2021-03-05 09:54:01 +05:50
Saqib Ansari
49e4693abf fix(patch): updating pos closing reference in merge log 2021-03-04 11:58:45 +05:30
Deepesh Garg
11092d0824 feat: Additon of leave details in Salary Slip (#24674) 
* feat: Additon of leave details in Salary Slip

* fix: Change leaves to leave
 2021-03-02 18:38:31 +05:30
Nabin Hait
d96be3f9f1 Reposting patch and earned leave rounding (#24783) 
* fix: rounding of earned leave is optional (#24782)

* fix: reposting patch fixes (#24775)
 2021-03-02 17:02:47 +05:30
rohitwaghchaure
0e89d71d34 Merge pull request #24755 from rohitwaghchaure/fixed-repost-item-valuation-patch-v13-pre 
fix: reposting patch
 2021-02-26 23:58:10 +05:30
Rohit Waghchaure
9f13a060f0 fix: reposting patch 2021-02-26 17:44:54 +05:30
Deepesh Garg
0c6d69e27c fix: Add search field in project query 2021-02-25 14:11:49 +05:30
Saurabh
d713ac4505 Merge branch 'version-13-beta-pre-release' into version-13-beta v13.0.0-beta.12 2021-02-24 15:01:19 +05:30
Saurabh
fefacced13 bumped to version 13.0.0-beta.12 2021-02-24 15:21:19 +05:50
rohitwaghchaure
8212b62598 Merge pull request #24724 from rohitwaghchaure/change-log-for-v13-beta-12 
chore: change log
 2021-02-24 12:31:05 +05:30
Rohit Waghchaure
f613d41408 chore: change log 2021-02-24 11:20:29 +05:30
rohitwaghchaure
8faf8e4b25 Merge pull request #24718 from rohitwaghchaure/fixed-patch-item-reposting-pre-release 
fix: patch failing because of incorrect gl entries
 2021-02-24 00:43:16 +05:30
Rohit Waghchaure
39b5ad8e69 fix: patch failing because of incorrect gl entries 2021-02-23 18:35:36 +05:30
Nabin Hait
d46b23699c fix: optimize reposting of gle and sle (#24702) 
* 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

* fix: Accounting Dimension creation background job timeout

* fix(regional): vehicle no is mandatory for ewaybill generation (#24679)

* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition

* fix: excluding unidentified accounts from gstr-1

* fix: optimize reposting of sle and gle (#24694)

* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replaced spaces with tabs

* fix: merge conflict

* fix: test cases

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-23 16:38:52 +05:30
Rucha Mahabal
12c957b2b2 feat: add descriptions for YTD and MTD fields 2021-02-19 21:01:56 +05:30
Rucha Mahabal
11cef55649 test: year to date computation for salary slip components 2021-02-19 21:00:54 +05:30
Rucha Mahabal
1585986fa4 feat: Salary Slip with Year to Date Print Format 2021-02-19 21:00:18 +05:30