nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,397 Commits 402 Branches 1,700 Tags
7688239fc0b3e2dc4abaffa7d8a4d54ba786eea0
Commit Graph

41397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
7688239fc0 Merge pull request #33084 from frappe/mergify/bp/version-13-hotfix/pr-33062 
fix: create rounding gl entry for PCV during gle post processing (backport #33062)
 2022-11-23 11:50:14 +05:30
Nabin Hait
7af45972ae fix: create rounding gl entry for PCV during gle post processing 
(cherry picked from commit 022d8d5d79)
 2022-11-23 05:07:10 +00:00
ruthra kumar
30b42b22ab Merge pull request #32942 from frappe/mergify/bp/version-13-hotfix/pr-32866 
fix: incorrect buying amount on Gross Profit (backport #32866)
 2022-11-22 15:59:28 +05:30
ruthra kumar
4834b78ed2 refactor: clean up code in test suite 
Remove doctypes that are not in v13
 2022-11-22 15:06:46 +05:30
ruthra kumar
72f9308df6 fix: linter issue 2022-11-22 15:06:27 +05:30
Deepesh Garg
dc9b81d216 Merge pull request #33041 from frappe/mergify/bp/version-13-hotfix/pr-33032 
fix: Accounting Dimension filtering for Sales and Purchase Report (backport #33032)
 2022-11-19 18:53:34 +05:30
Deepesh Garg
61b20c81c2 Merge pull request #33036 from frappe/mergify/bp/version-13-hotfix/pr-33034 
fix(realtime): Restrict updates to only last modified or current user (backport #33034)
 2022-11-19 18:22:17 +05:30
Deepesh Garg
58f3f2b6d9 fix: Accounting Dimension filtering for Sales and Purchase Report 
(cherry picked from commit 8b394afaa9)
 2022-11-19 12:50:19 +00:00
rohitwaghchaure
e3435369a0 Merge pull request #33037 from frappe/mergify/bp/version-13-hotfix/pr-32947 
fix: incorrect fix of conversion factor in PP (backport #32947)
 2022-11-19 11:50:05 +05:30
Rohit Waghchaure
726c3d32be fix: incorrect fix of conversion factor in PP 
(cherry picked from commit 490b0e3cdf)
 2022-11-18 14:39:27 +00:00
gavin
ecdd8493ea fix(realtime): Restrict updates to only last modified or current user (#33034) 
(cherry picked from commit dd2493a541)
 2022-11-18 11:49:11 +00:00
Deepesh Garg
431a94b961 Merge pull request #33016 from frappe/mergify/bp/version-13-hotfix/pr-33009 
fix(pos): item selector image border radius (backport #33009)
 2022-11-18 15:09:17 +05:30
Sagar Sharma
00f990e3f4 Merge pull request #33024 from frappe/mergify/bp/version-13-hotfix/pr-33019 
fix: use `list()` on self mutating iteration (backport #33019)
 2022-11-18 10:59:54 +05:30
Sabu Siyad
0070b5ef9a fix: use list() on self mutating iteration 
https://github.com/frappe/erpnext/issues/30325

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 546c809cbe)
 2022-11-18 04:56:12 +00:00
Sabu Siyad
ab31eb4ee7 fix(pos): item selector image border radius 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 2f4940cc26)
 2022-11-17 12:02:46 +00:00
mergify[bot]
357ae939d1 refactor: search queries (backport #33004) (#33008) 
* refactor: search queries (#33004)

- guard clauses for readability
- use values or format

(cherry picked from commit 34e4903ed7)

# Conflicts:
#	erpnext/stock/doctype/material_request/material_request.py
#	erpnext/stock/doctype/quality_inspection/quality_inspection.py

* chore: conflicts

[skip ci]

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-17 14:24:45 +05:30
Sagar Sharma
b8aa63b5e2 Merge pull request #33011 from frappe/mergify/bp/version-13-hotfix/pr-33006 
fix: make `is_internal_supplier` read-only in PO (backport #33006)
 2022-11-17 14:23:28 +05:30
s-aga-r
9191c54b90 chore: conflicts 2022-11-17 14:19:01 +05:30
s-aga-r
30b5d1c400 fix: make is_internal_supplier read-only 
(cherry picked from commit 5efbc2cbf8)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
 2022-11-17 08:41:11 +00:00
Ankush Menat
9d5c4ffadf chore: hardcode doctype 2022-11-17 12:03:02 +05:30
Deepesh Garg
85d8540379 Merge pull request #32995 from frappe/mergify/bp/version-13-hotfix/pr-32983 
fix: Opening journal entry templates (backport #32983)
 2022-11-17 11:15:52 +05:30
Deepesh Garg
4ad3e28147 fix: Opening journal entry templates 
(cherry picked from commit 33b61aef5a)
 2022-11-16 15:12:34 +00:00
Deepesh Garg
ec6a01de4c Merge pull request #32991 from frappe/mergify/bp/version-13-hotfix/pr-32989 
ci: fix flake8 URL (backport #32989)
 2022-11-16 17:05:25 +05:30
Deepesh Garg
7831744064 ci: fix flake8 URL 
(cherry picked from commit e81bec5fc9)
 2022-11-16 10:56:43 +00:00
mergify[bot]
3aba14f71a fix: cast POS query inputs to integers (backport #32975) (#32978) 
* fix: cast POS query inputs to integers  (#32975)

fix: cast POS query inputs to integers
(cherry picked from commit c013db6ea1)

# Conflicts:
#	erpnext/selling/page/point_of_sale/point_of_sale.py

* chore: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-15 18:50:32 +05:30
Deepesh Garg
de3453e477 Merge pull request #32934 from rtdany10/hsn-summary-report 
fix: wrong hsn summary totals
 2022-11-15 16:33:46 +05:30
Deepesh Garg
ee015273c9 Merge pull request #32953 from gavindsouza/rm-dead-validation-pe 
chore(payment_entry): Remove dead validations
 2022-11-15 13:56:38 +05:30
Deepesh Garg
db3f8d2768 Merge pull request #32961 from frappe/mergify/bp/version-13-hotfix/pr-32956 
fix: Label for applicable dimension table (backport #32956)
 2022-11-15 13:01:34 +05:30
Gavin D'souza
e1ecc9a819 chore(payment_entry): Remove dead validations 2022-11-15 10:43:47 +05:30
Deepesh Garg
9e340a8307 Merge branch 'version-13-hotfix' into hsn-summary-report 2022-11-15 09:26:00 +05:30
Deepesh Garg
cbc8b2da0a fix: Label for applicable dimension table 
(cherry picked from commit 8c13f70fc5)
 2022-11-15 03:56:00 +00:00
ruthra kumar
b7ff5fb426 Merge pull request #32930 from ruthra-kumar/ambiguous_cost_center_field 
fix: ambiguous 'cost_center' while using payment reconciliation
 2022-11-14 16:56:36 +05:30
Sagar Sharma
2b2a4f66ad Merge pull request #32949 from frappe/mergify/bp/version-13-hotfix/pr-32937 
refactor: rewrite `job_card.py` queries in QB (backport #32937)
 2022-11-14 12:22:59 +05:30
s-aga-r
78ca078474 refactor: rewrite job_card.py queries in QB 
(cherry picked from commit 7df2921d38)
 2022-11-14 05:57:03 +00:00
Deepesh Garg
65c9941aa4 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-32866 2022-11-14 10:45:09 +05:30
Deepesh Garg
5e46567a0b Merge pull request #32940 from deepeshgarg007/psa_pdf_issue_v13 
feat: page break in SoA pdf
 2022-11-14 10:44:56 +05:30
Deepesh Garg
079cf6899e Merge pull request #32943 from frappe/mergify/bp/version-13-hotfix/pr-32938 
chore: Remove raw SQL query (backport #32938)
 2022-11-14 10:44:24 +05:30
Sagar Vora
ad648f313c fix: check type for reference name 
(cherry picked from commit b06345af46)
 2022-11-13 15:11:50 +00:00
Deepesh Garg
9c9c6607f8 chore: Remove qb doc reference 
(cherry picked from commit 4b9921782b)
 2022-11-13 15:11:49 +00:00
Deepesh Garg
d6901e51ad chore: Remove raw SQL query 
(cherry picked from commit 42a59d5c17)
 2022-11-13 15:11:48 +00:00
Deepesh Garg
8733ce5ca9 Merge branch 'version-13-hotfix' into psa_pdf_issue_v13 2022-11-13 20:41:38 +05:30
Deepesh Garg
1ee5c2ff87 chore: Resolve conflicts 2022-11-13 19:49:07 +05:30
ruthra kumar
09ef8eeaea test: buying amount of invoices 
1. Invoice with unset `update_stock`, with and without Delivery Notes

(cherry picked from commit 2c8b0b17a7)
 2022-11-13 13:46:48 +00:00
ruthra kumar
40bb2cba93 fix: GP incorrect buying amount if no upd on SI and Delivery Note 
(cherry picked from commit e4d16c31da)

# Conflicts:
#	erpnext/accounts/report/gross_profit/gross_profit.py
 2022-11-13 13:46:47 +00:00
Dany Robert
95f81d3563 chore: remove commented line 2022-11-13 18:53:10 +05:30
Dany Robert
88ce59a1ca fix: query condition change 2022-11-13 18:52:57 +05:30
Dany Robert
e93ac3c9a8 feat: page break in SoA pdf 2022-11-13 18:52:44 +05:30
Sagar Sharma
079fc2dc34 Merge pull request #32936 from frappe/mergify/bp/version-13-hotfix/pr-32913 
fix: set stock UOM in args to ensure item price is fetched (backport #32913)
 2022-11-12 12:46:54 +05:30
Sagar Vora
bd2242b285 fix: set stock UOM in args to ensure item price is fetched 
(cherry picked from commit 57038c3969)
 2022-11-12 04:39:52 +00:00
Dany Robert
79d508f4ff fix: wrong totals in hsn summary report 2022-11-12 05:22:31 +01:00