CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 16:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,803 Commits 416 Branches 1,718 Tags
796b1aa69456e8e42178164b69e2a5e030d3fc54
Commit Graph

46803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
796b1aa694 refactor(test): for ledger comparision report 
(cherry picked from commit 639f427d6d)
 2023-11-03 07:23:25 +00:00
ruthra kumar
8d66848f9d refactor: better output on gl and pl comparison report 
(cherry picked from commit 539f0251d9)
 2023-11-03 07:23:25 +00:00
ruthra kumar
9dae84feba Merge pull request #37874 from frappe/mergify/bp/version-15-hotfix/pr-37869 
refactor: 'group only by voucher' flag in AR/AP report (backport #37869)
 2023-11-03 12:51:07 +05:30
ruthra kumar
1e218c12a0 refactor: group only by voucher flag in AR/AP report 
(cherry picked from commit 23beb46d15)
 2023-11-03 07:00:57 +00:00
mergify[bot]
847dd9e671 fix: TypeError in PR for non-stock item (backport #37819) (#37842) 
* fix: `TypeError` in PR for non-stock item

(cherry picked from commit 028b3e2fbf)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-03 11:56:12 +05:30
mergify[bot]
b1982a6961 perf: Add index to supplier invoice field (backport #37861) (#37863) 
fix: Add index to supplier invoice field (#37861)

* fix: Add index to supplier invoice field

* chore: remove unintetional changes

(cherry picked from commit c37e374fdd)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-03 11:52:32 +05:30
rohitwaghchaure
e52291506e Merge pull request #37851 from frappe/mergify/bp/version-15-hotfix/pr-37849 
fix: remove voucher type and no for Item and Warehouse based reposting (backport #37849)
 2023-11-02 15:14:50 +05:30
Rohit Waghchaure
618a9ee49b chore: fix test cases 2023-11-02 14:45:28 +05:30
mergify[bot]
71361f7673 fix: standard submit perm in repost ledger for editable invoices (backport #37826) (#37855) 
fix: standard submit perm in repost ledger for editable invoices (#37826)

* fix: ignore perm while reposting ledger

* fix: use flag in save

* fix: remove unnecessary save

(cherry picked from commit 1b808e1d7c)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-11-02 14:33:47 +05:30
Rohit Waghchaure
b96be67a1f fix: remove voucher type and no for Item and Warehouse based reposting 
(cherry picked from commit 0104897d69)
 2023-11-02 07:57:52 +00:00
ruthra kumar
7bc02c49ba Merge pull request #37847 from frappe/mergify/copy/version-15-hotfix/pr-37845 
chore: add std permissions for Process Payment Reconciilation log (copy #37845)
 2023-11-02 12:10:36 +05:30
ruthra kumar
7524e425da chore: std permissions for Process Payment Reconciilation log 
(cherry picked from commit a9fceeb00f)
 2023-11-02 06:16:07 +00:00
ruthra kumar
39a178d27a Merge pull request #37844 from frappe/mergify/bp/version-15-hotfix/pr-37838 
refactor: pass limits to JE and PE queries in reconciliation tool (backport #37838)
 2023-11-02 11:08:36 +05:30
mergify[bot]
fad8228a67 feat(Stock Balance): add filters from route (backport #37836) (#37840) 
feat(Stock Balance): add filters from route

(cherry picked from commit 38e5e4a893)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-11-02 10:46:28 +05:30
ruthra kumar
8ef48bc6b7 refactor: pass limits to JE and PE queries in reconciliation tool 
(cherry picked from commit 54e8ce1ac5)
 2023-11-02 05:13:38 +00:00
ruthra kumar
0ab63f91f8 Merge pull request #37834 from frappe/mergify/bp/version-15-hotfix/pr-37832 
refactor: checkbox to toggle remarks in General Ledger (backport #37832)
 2023-11-02 07:27:07 +05:30
ruthra kumar
e9bf48df9c refactor: checkbox to toggle remarks in General Ledger 
(cherry picked from commit 8fa677b8e8)
 2023-11-01 15:50:12 +00:00
mergify[bot]
c8791108de refactor: update fields label and remove unused fields from BIN (backport #37827) (#37830) 
* refactor: rearrange fields and update label

(cherry picked from commit ec1a7869f8)

* refactor: remove unused fields `fcfs_rate` and `ma_rate` from Bin

(cherry picked from commit f0a1f4ac7c)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-01 16:41:16 +05:30
Deepesh Garg
964a7a3dbd Merge pull request #37824 from frappe/mergify/bp/version-15-hotfix/pr-37590 
fix: gov compliance for tax withholding report (#37590)
 2023-11-01 15:22:10 +05:30
Deepesh Garg
c8c8c6533b Merge pull request #37822 from frappe/mergify/bp/version-15-hotfix/pr-37635 
fix: validate sales order item with quotation (#37635)
 2023-11-01 15:14:03 +05:30
Gursheen Anand
e51e5b36e2 feat: add cols for supplier inv details 
(cherry picked from commit 6d5ccde864)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
80dddb40ae chore: linting issues 
(cherry picked from commit 75441017c6)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
6df125a05f feat: proprietorship & partnership options in entity type 
(cherry picked from commit ed2457bddf)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
06bb1a3208 fix: sort by section code 
(cherry picked from commit 4471ad581e)
 2023-11-01 08:40:19 +00:00
Gursheen Anand
aa19055899 chore: change column order 
(cherry picked from commit 7ecc0d5a04)
 2023-11-01 08:40:19 +00:00
Gursheen Anand
7abe5d9905 refactor: avoid relying only on against in tds docs query 
(cherry picked from commit 705dadae8e)
 2023-11-01 08:40:18 +00:00
Deepesh Garg
2ba5bb8abc Merge pull request #37718 from frappe/mergify/bp/version-15-hotfix/pr-37690 
fix(plaid): Do not sync pending transactions (#37690)
 2023-11-01 14:10:17 +05:30
Gursheen Anand
71538cfab1 fix: validate so item with qtn 
(cherry picked from commit 17ebc1ea80)
 2023-11-01 08:34:49 +00:00
Deepesh Garg
9675da6f38 Merge pull request #37816 from frappe/mergify/bp/version-15-hotfix/pr-37680 
fix: status when over delivery or billing in SO (#37680)
 2023-11-01 14:04:19 +05:30
Gursheen Anand
95d6742587 fix: status for over delivery or billing 
(cherry picked from commit d69b0d76dd)
 2023-11-01 07:00:27 +00:00
ruthra kumar
7a5bfe0009 Merge pull request #37805 from frappe/mergify/bp/version-15-hotfix/pr-37793 
refactor: pull remarks only if needed on AR/AP report (backport #37793)
 2023-10-31 20:37:53 +05:30
ruthra kumar
c8243ec8e5 Merge pull request #37807 from frappe/mergify/bp/version-15-hotfix/pr-37795 
chore: update default limit values in reconciliation tool (backport #37795)
 2023-10-31 20:37:26 +05:30
ruthra kumar
a72988a514 chore: update default limit values in reconciliation tool 
(cherry picked from commit 1fd888175f)
 2023-10-31 14:23:08 +00:00
ruthra kumar
0589232d3b refactor: pull remarks only if needed on AR/AP report 
(cherry picked from commit eb73017798)
 2023-10-31 14:22:06 +00:00
mergify[bot]
59e67cd384 fix: make project page translatable (backport #37743) (#37801) 
fix: make project page translatable

(cherry picked from commit e72afd0bd6)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-10-31 19:49:45 +05:30
mergify[bot]
254ec2cfd1 fix: In-Transit Warehouse company filter (backport #37796) (#37798) 
fix: In-Transit Warehouse company filter (#37796)

(cherry picked from commit daf2ec063c)

Co-authored-by: hyaray <hyaray@vip.qq.com>
 2023-10-31 18:53:08 +05:30
mergify[bot]
9aa29f55d9 fix(packed_item): ensure proper names for ref integrity (backport #37597) (#37794) 
fix(packed_item): ensure proper names for ref integrity (#37597)

(cherry picked from commit fb0ec74d08)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2023-10-31 18:06:40 +05:30
mergify[bot]
8b3c4a948c fix: incorrect material request quantity in production plan (backport #37785) (#37790) 
fix: incorrect material request quantity in production plan (#37785)

(cherry picked from commit 25718d9f1b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-31 15:41:53 +05:30
mergify[bot]
98a7c170a0 fix: indexing on Delivery Note Item (backport #37766) (#37778) 
fix: indexing on Delivery Note Item (#37766)

fix: added indexing on Delivery Note Item
(cherry picked from commit 056b74b162)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-31 14:31:29 +05:30
mergify[bot]
e7423109b6 fix: PermissionError while creating DN from SO (backport #37758) (#37768) 
fix: ignore permissions while mapping DN Item

(cherry picked from commit afc64ed9ee)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-30 18:39:57 +05:30
ruthra kumar
4f9210541e Merge pull request #37763 from frappe/mergify/bp/version-15-hotfix/pr-37761 
chore: add index to posting_date in PLE (backport #37761)
 2023-10-30 17:16:54 +05:30
ruthra kumar
11dd1f14ff Merge pull request #37764 from frappe/mergify/bp/version-15-hotfix/pr-37720 
refactor: ignore cancelled GLE's while looking for currency of existing entries (backport #37720)
 2023-10-30 17:16:39 +05:30
ruthra kumar
9ce123d0b9 refactor: ignore cancelled GLE's while looking for currency 
(cherry picked from commit 8d9b90f3f5)
 2023-10-30 11:23:35 +00:00
ruthra kumar
f64fdb6870 chore: add index to posting_date in PLE 
(cherry picked from commit ca69845238)
 2023-10-30 11:20:03 +00:00
mergify[bot]
f132552968 fix: make changes that enable gantt view for job cards (backport #37661) (#37757) 
fix: make changes that enable gantt view for job cards (#37661)

* fix: make changes that enable gantt view for job cards

* fix: add fields on listview and remove from json file

* fix: undo modified date

---------

Co-authored-by: Dietmar Fischer <fischer@kk-software.de>
(cherry picked from commit 500435b856)

Co-authored-by: Didiman1998 <118364772+Didiman1998@users.noreply.github.com>
 2023-10-30 15:20:40 +05:30
mergify[bot]
18e40dd032 refactor: remove extraneous disabled filters (backport #37732) (#37749) 
refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-10-30 09:57:32 +05:30
mergify[bot]
4819fde8c5 fix: typo in function name and msg (backport #37722) (#37741) 
fix: typo in function name and msg

(cherry picked from commit 48c66b68ab)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-29 12:28:42 +05:30
mergify[bot]
5c46d7452e fix(minor): set tax values for item variants (backport #37674) (#37739) 
* fix: copy all child fields to item variant

(cherry picked from commit 5deba1b6f9)

* fix: only update if variant table empty

(cherry picked from commit d436a40739)

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2023-10-29 12:16:05 +05:30
mergify[bot]
4034c16cde chore: fixed test cases related to Internal Transfer (backport #37659) (#37733) 
* chore: fixed test cases related to Internal Transfer (#37659)

(cherry picked from commit 72d32a4901)

* chore: fix test cases

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-28 13:31:29 +05:30
mergify[bot]
b03c65f21d fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (backport #37721) (#37731) 
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721)

(cherry picked from commit fd78f868e1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-28 11:10:46 +05:30