Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,844 Commits 3 Branches 0 Tags
Commit Graph

46844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
b96be67a1f fix: remove voucher type and no for Item and Warehouse based reposting 
(cherry picked from commit 0104897d693ca98796536eac7a9edadc58c64fff)
 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 a9fceeb00ff266b181791dc0ca4ca334810fff0a)
 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 38e5e4a8930714c08471308ba47b9f063802a4b3)

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 54e8ce1ac5a0d14905050fbb630a1602a560088a)
 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 8fa677b8e8c6e4e65193ad0be7c0a6d5b4f1769e)
 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 ec1a7869f82c9bb3d5e12e8a9dc695823e502a4a)

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

(cherry picked from commit f0a1f4ac7cb9362e8dfe05179533fe4ad00d061e)

---------

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 6d5ccde864e373b787d781c583b85a26ed2d40e9)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
80dddb40ae chore: linting issues 
(cherry picked from commit 75441017c6629f81104409b892db56bb9c1bf1dd)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
6df125a05f feat: proprietorship & partnership options in entity type 
(cherry picked from commit ed2457bddfaedc83301a96f9d77b093b36d15a72)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
06bb1a3208 fix: sort by section code 
(cherry picked from commit 4471ad581e1c3d220468f42170a09739a46dcc21)
 2023-11-01 08:40:19 +00:00
Gursheen Anand
aa19055899 chore: change column order 
(cherry picked from commit 7ecc0d5a04b6c8cd8b97256d8c0e4bdb12494d5d)
 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 705dadae8e3b49e751184b14323ba2686e5342cc)
 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 17ebc1ea8096a83e882bedd00f358a4bd799eff4)
 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 d69b0d76dd2d89fe0c1b9a634923cf8716a37c11)
 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 1fd888175f2f224bcebba3e9a958d672ab09bcd5)
 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 eb73017798eed964e8f019db4cef3513162855f6)
 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 e72afd0bd6c0b6100834888329f5bf985a826b65)

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 daf2ec063c4b0313e32e247459d0cb8dc6958833)

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 fb0ec74d086085160fbcca9ccfffb6966673e0cb)

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 25718d9f1b7cda3b87263c2cf885958cbd283947)

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 056b74b162ed58dd979cd9748129752fb8cab242)

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 afc64ed9eedb1aca2802f5d5e53cc5668359f575)

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 8d9b90f3f53083e631444a0d39d86bda0b08f479)
 2023-10-30 11:23:35 +00:00
ruthra kumar
f64fdb6870 chore: add index to posting_date in PLE 
(cherry picked from commit ca698452382eba85bd940dfb6344ff19d1eab4e4)
 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 500435b856a028bdab7fdbe12647ec0f11287eab)

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 f276fbba4f84979e12b8091492be7eddbf0caa56)

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 48c66b68abe5573c477cbbdc49af22dbde1ea2db)

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 5deba1b6f9b03ce5d078d624e339f6b0209a1555)

* fix: only update if variant table empty

(cherry picked from commit d436a407390c0e0d89c66445539bbb95784be7eb)

---------

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 72d32a49012329d33fd4ecea70988fbfbfce566f)

* 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 fd78f868e1aed2bdb3baa47927f37b239e16a174)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-28 11:10:46 +05:30
mergify[bot]
a3d3c0024e
chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723) (#37724) 
* chore: allow wip_composite_asset in the MR PO PR PI flow

(cherry picked from commit 0e5bea33a320497d2de3253ca0e1bb061a07130f)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflict

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-10-27 18:54:43 +05:30
Deepesh Garg
2149de44b1 fix(plaid): Do not sync pending transactions 
(cherry picked from commit 46ea8685590e81266beb1cccbe72925f28bc42ba)
 2023-10-27 06:09:09 +00:00
mergify[bot]
f382b1cf61
fix(defaults): apply discount and provisonal defaults from item group and brand if available (backport #37466) (#37704) 
fix(defaults): apply discount and provisonal defaults from item group and brand if available (#37466)

(cherry picked from commit 1612d7ba3f353e23ad6ae9ba12b995106cddcb9e)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2023-10-26 18:14:57 +05:30
mergify[bot]
bfd240a19d
fix: avoid name clash in delivery stop (backport #37306) (#37702) 
fix: avoid name clash in delivery stop (#37306)

* fix(stock): avoid name clash in delivery stop with Document.lock()

* chore(stock): format delivery stop json according to doctype builder

(cherry picked from commit 681782121cd0d723f725e4c1c4c30167eb1622ec)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2023-10-26 18:13:23 +05:30
mergify[bot]
08ea62f4e4
feat(delivery): link to delivery notes list view from delivery trip (backport #37604) (#37696) 
feat(delivery): link to delivery notes list view from delivery trip

(cherry picked from commit 85488cd0dcac2efe02478ced44349a0cadb3b064)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2023-10-26 13:12:55 +05:30
mergify[bot]
40443258cf
feat: allow return of components for SCO that don't have SCR created (backport #37686) (#37693) 
* feat: allow return of components for SCO that don't have SCR created

(cherry picked from commit 8e3b9ec87977b54cfdee4b65283723d20e91f274)

* fix: consider returned qty while calculating unsupplied qty

(cherry picked from commit 3290df5593009a4e237e7903feb078961f15ae12)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-26 11:56:27 +05:30
mergify[bot]
2f5d991225
refactor: rename field Over Order Allowance to Blanket Order Allowance (backport #37669) (#37682) 
* refactor: rename field `Over Order Allowance` to `Blanket Order Allowance`

(cherry picked from commit 8ffa2bfe25d8fae317d77705aec82a92dc269874)

* chore: patch to rename field `over_order_allowance`

(cherry picked from commit fcfcf6957e07ad5afc281e5f43154ca1170e14c4)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-25 14:58:01 +05:30
mergify[bot]
a871d955d4
fix: force delete removed report (backport #37668) (#37670) 
fix: force delete removed report (#37668)

(cherry picked from commit 7be578485e2cafd124c98cc8394c67430c2b31b8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-10-25 14:08:10 +05:30
mergify[bot]
882bd8e93a
chore: fixed test case non_internal_transfer_delivery_note (backport #37671) (#37676) 
chore: fixed test case non_internal_transfer_delivery_note (#37671)

(cherry picked from commit 2bcff4c7f2264d2408a1f98bddc78041b167a632)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-25 13:49:38 +05:30