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
47,417 Commits 458 Branches 1,746 Tags
62f7d984beafca379629cf2ebebcb4d92d1b2d88
Commit Graph

47417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
5d9f71af95 refactor(test): filter on document names 
(cherry picked from commit 080aa30407)
 2023-12-01 07:07:56 +00:00
ruthra kumar
8b6eb3599c fix(test): use correct account type for testing 
(cherry picked from commit eecf9cd1d8)
 2023-12-01 07:07:56 +00:00
ruthra kumar
25b49ef0de test: ledger pre and post reconciliation on advance as liability 
(cherry picked from commit 0255e09285)
 2023-12-01 07:07:56 +00:00
ruthra kumar
c67d0eb718 refactor(test): advance allocation on purchase invoice 
(cherry picked from commit 2add802d0d)
 2023-12-01 07:07:56 +00:00
ruthra kumar
86b2de4013 refactor: redefine dr_or_cr for unallocated amount 
(cherry picked from commit 3e6306348a)
 2023-12-01 07:07:55 +00:00
ruthra kumar
8ed2ea29ac refactor: 'partial' flag to only cancel unlinked ledger entries 
(cherry picked from commit 2633d7dca3)
 2023-12-01 07:07:55 +00:00
ruthra kumar
65b4dbab2a refactor: return the newly added reference upon reconciliation 
(cherry picked from commit ecb533c4d1)
 2023-12-01 07:07:55 +00:00
ruthra kumar
a1bdd69ffd refactor: 'make_advance_gl_entries' method 
make_advance_gl_entries -> add_advance_gl_entries -> add_advance_gl_for_reference

'make_advance_gl_entries' - main method thats builds and post GL
entries for all or one specific reference based on parameters

'add_advance_gl_entries' - build GL map for all or one specific
reference. Return an array of dict.

'add_advance_gl_for_reference' - utility function to build gl
entries. returns dict.

(cherry picked from commit 5fc19dab54)
 2023-12-01 07:07:55 +00:00
ruthra kumar
58d04e1f42 refactor: use different GL build logic for advance as liability 
(cherry picked from commit 58114e7b24)
 2023-12-01 07:07:55 +00:00
ruthra kumar
aaef9d68c0 refactor: post to GL and Payment Ledger on advance as liability 
(cherry picked from commit 78ab11f991)
 2023-12-01 07:07:54 +00:00
ruthra kumar
bb8ac94adc test: assert ledger entries on partial reconciliation 
with `Advance as Liability`, partial reconciliation should not post
duplicate ledger entries for same reference

(cherry picked from commit 3263f2023c)
 2023-12-01 07:07:54 +00:00
mergify[bot]
8819d6c173 add supplier group filter in purchase register (backport #38421) (#38483) 
add supplier group filter in purchase register (#38421)

* add supplier group field in purchase register

* Update purchase_register.js

(cherry picked from commit e2a519464b)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
 2023-12-01 11:51:09 +05:30
mergify[bot]
8e57862a1c fix: show item name as title instead of item group in BOM (backport #38478) (#38481) 
fix: show item name as title instead of item group in BOM (#38478)

Item fields in BOM used to show Item Group when Items were set to show title as link fields. Now they show Item Name instead

(cherry picked from commit 3a66aefd2c)

Co-authored-by: Gughan Ravikumar <gughanrk@gmail.com>
 2023-12-01 11:32:28 +05:30
rohitwaghchaure
b9a42a3b1b Merge pull request #38472 from frappe/mergify/bp/version-15-hotfix/pr-38455 
fix: incorrect requested quantity for the subcontracting order (backport #38455)
 2023-11-30 19:25:14 +05:30
Rohit Waghchaure
abe3e41a17 fix: incorrect requested quantity for the subcontracting order 
(cherry picked from commit 691e3bb24f)
 2023-11-30 13:39:06 +00:00
mergify[bot]
2d9ba88870 fix(ux): make valuation field read only when it can't be modified (backport #38450) (#38464) 
* fix(ux): make `basic_rate` field read-only based on purpose

(cherry picked from commit abc7d30024)

* fix(ux): make PR `rate` field read-only having PO ref

(cherry picked from commit ae294ee470)

* fix(ux): make PI `rate` field read-only having PR ref

(cherry picked from commit 3d4156cc7d)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-30 17:30:35 +05:30
ruthra kumar
03013a8433 Merge pull request #38461 from frappe/mergify/bp/version-15-hotfix/pr-38457 
refactor: use flt on outstanding on AR/AP summary report (backport #38457)
 2023-11-30 16:42:58 +05:30
ruthra kumar
f44bb0df50 refactor: use flt on outstanding on AR/AP summary report 
(cherry picked from commit e4bdd3a28d)
 2023-11-30 10:55:51 +00:00
mergify[bot]
5e6a4d257e feat: enable automatic type annotations (backport #38452) (#38454) 
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 14:43:16 +05:30
mergify[bot]
7f4d2b707a refactor: Simpler log settings setup (backport #38449) (#38451) 
refactor: Simpler log settings setup (#38449)

Depends on https://github.com/frappe/frappe/pull/23507

(cherry picked from commit 1da9087cc4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 13:30:15 +05:30
ruthra kumar
05da5bfc9a Merge pull request #38448 from frappe/mergify/bp/version-15-hotfix/pr-38446 
refactor: pass on filter to up front outstanding query as well (backport #38446)
 2023-11-30 13:18:52 +05:30
ruthra kumar
7a1744691f refactor: pass on filter to upfront outstanding query as well 
(cherry picked from commit cfd3230c75)
 2023-11-30 07:26:32 +00:00
mergify[bot]
e06669847d fix: exploded items in Subcontracting Receipt (backport #38441) (#38445) 
fix: exploded items in Subcontracting Receipt

(cherry picked from commit 62b4a263f8)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-30 12:16:07 +05:30
mergify[bot]
a50e872820 fix: use docstatus instead of status (backport #38439) (#38443) 
fix: use `docstatus` instead of `status`

(cherry picked from commit 1423b38d50)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-30 12:12:02 +05:30
mergify[bot]
7005d51af3 feat: auto create PR on SCR submission (backport #38290) (#38428) 
* feat: add field `Action on Purchase Order Submission`

(cherry picked from commit 628ea42b63)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: auto create SCO on PO submission

(cherry picked from commit 9ec6f1e1d6)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: add field `Action on Subcontracting Receipt Submission`

(cherry picked from commit 762906f240)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* chore: notify user on SCO creation

(cherry picked from commit 745e3bfb73)

* feat: add field `Purchase Order Item` in SCO Service Item

(cherry picked from commit 45d5cff47d)

* fix: hold PO item ref in SCO Service Item

(cherry picked from commit 7e4dd33ab0)

* feat: add field `Purchase Order Item` in SCO Item

(cherry picked from commit a2ede7d6d5)

* fix: maintain PO and PO Item ref in SCR Item

(cherry picked from commit e1cea25781)

* feat: auto create PR on SCR submission

(cherry picked from commit 040cc8d22f)

* feat: add `Purchase Order` link in SCR connections

(cherry picked from commit ca8a5b45ba)

* feat: add `Subcontracting Receipt` link in PO connections

(cherry picked from commit 98cba5ed30)

* fix: dont show `View` button on cancelled SCR

(cherry picked from commit dd80d3b9b9)

* fix: use checkbox instead of select field

(cherry picked from commit d366a91d9e)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: Subcontracting Receipt ref in Purchase Receipt

(cherry picked from commit d891bd7fac)

* feat: SCR Item ref in PR Item

(cherry picked from commit 37b3ac7952)

* feat: provision to create PR from SCR

(cherry picked from commit 8052103197)

* chore: PR ref in SCR connections

(cherry picked from commit 096a2c8cd0)

* fix: map warehouses in return SCR

(cherry picked from commit 874766a82f)

* fix(ux): hide `Create Purchase Receipt` button for Subcontract Return

(cherry picked from commit 7145b040f1)

* chore: `linter`

(cherry picked from commit 857f2b5a01)

* test: auto create SCO on PO submit

(cherry picked from commit 68585f6f2b)

* test: auto create PR on SCR submit

(cherry picked from commit 7b0cd03f88)

* fix(test): `test_auto_create_purchase_receipt`

(cherry picked from commit 3da0aa6a0b)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-30 12:11:05 +05:30
Deepesh Garg
277e81c68e Merge pull request #38431 from frappe/mergify/bp/version-15-hotfix/pr-38429 
fix(minor): set capital WIP account before asset tests (#38429)
 2023-11-30 08:15:11 +05:30
Gursheen Anand
de7e1ab237 fix: set cwip account before asset tests 
(cherry picked from commit ef8e4191cd)
 2023-11-29 13:24:56 +00:00
Deepesh Garg
f1456d072c Merge pull request #38423 from frappe/mergify/bp/version-15-hotfix/pr-38250 
fix: unset discount amount based on coupon code (#38250)
 2023-11-29 18:21:30 +05:30
Gursheen Anand
0e50e77d8e fix: unset discount amount based on coupon code 
(cherry picked from commit 6518582ed3)
 2023-11-29 10:25:19 +00:00
rohitwaghchaure
d0f1dec573 Merge pull request #38411 from frappe/mergify/bp/version-15-hotfix/pr-38165 
fix: make create button translatable (backport #38165)
 2023-11-29 13:05:03 +05:30
rohitwaghchaure
4bb1cb50ba Merge pull request #38419 from frappe/mergify/bp/version-15-hotfix/pr-38415 
fix: incorrect ordered qty for Subcontracting Order (backport #38415)
 2023-11-29 13:02:53 +05:30
rohitwaghchaure
71fe2bcc28 fix: incorrect ordered qty for Subcontracting Order (#38415) 
(cherry picked from commit fddf341f44)
 2023-11-29 06:52:36 +00:00
mergify[bot]
12ad1ec71a feat: shift depreciation for assets (backport #38327) (#38417) 
feat: shift depreciation for assets (#38327)

* feat: shift depreciation for assets

* chore: create new asset depr schedule on shift change

* refactor: move create_depr_schedule to after_insert

* fix: args in get_depreciation_amount test

* refactor: rename shift adjustment to shift allocation

* chore: asset shift factor doctype and auto allocate shift diff

* chore: use check instead of depr type, and add tests

* chore: make linter happy

* chore: give permissions to accounts users

(cherry picked from commit fe5fc5bd3a)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-29 12:15:53 +05:30
mergify[bot]
80afeca229 fix: OperationalError while selecting Serial No in Warranty Claim (backport #38394) (#38414) 
* refactor: use arrow function

(cherry picked from commit 1763824e5f)

* refactor: use DocType `Fetch From` instead of `frm.add_fetch`

(cherry picked from commit 01044ca8e9)

* refactor: use `frm.set_query` to add filters

(cherry picked from commit 640dfab827)

* refactor: don't use `cur_frm`

(cherry picked from commit 9fadf5f426)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-29 10:40:41 +05:30
Patrick Eissler
95f9cc99b9 fix: make create button translatable (#38165) 
* fix: make all create buttons translatable

* style: use double quotes

---------

Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8e4b591ea2)
 2023-11-29 04:54:25 +00:00
mergify[bot]
4a243ce5b7 fix(regional): use net figures for sales calc (#38260) 
fix(regional): use net figures for sales calc (#38260)

(cherry picked from commit 663bb8726c)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-11-29 09:08:50 +05:30
mergify[bot]
b9f26ae849 fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342) 
fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342)

* fix: Debit credit mimatch in multicurrecy asset purchase receipt

* test: multi currency purchase receipt

* chore: update init files

* test: roolback

(cherry picked from commit add238c892)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-29 09:06:34 +05:30
Frappe PR Bot
d4a3d6bbe0 chore(release): Bumped to Version 15.4.0 
# [15.4.0](https://github.com/frappe/erpnext/compare/v15.3.0...v15.4.0) (2023-11-28)

### Bug Fixes

* allow on submit for child table fields ([ac7615a](ac7615ac01))
* annual income and expenses in digest ([ca2ad17](ca2ad175d3))
* check reposting settings before allowing editable si ([25bf475](25bf475d5a))
* condition in other bundle utils ([e4d9ef1](e4d9ef1293))
* create contact if existing customer doesn't have contact ([b1b065d](b1b065daf1))
* display all item rate stop messages (backport [#38289](https://github.com/frappe/erpnext/issues/38289)) ([#38307](https://github.com/frappe/erpnext/issues/38307)) ([99c1fbf](99c1fbf9fc))
* do not set repost flag without validating voucher ([6a3c3b4](6a3c3b4cac))
* don't depreciate assets with no schedule on scrapping (backport [#38276](https://github.com/frappe/erpnext/issues/38276)) ([#38293](https://github.com/frappe/erpnext/issues/38293)) ([18613c5](18613c595f))
* filter bundle items based on disabled check ([fb517e8](fb517e823f))
* fiscal year using future date ([b9a1fac](b9a1fac7d8))
* has_product_bundle util to only check for enabled bundles ([5c12872](5c12872f70))
* job card overlap validation (backport [#38345](https://github.com/frappe/erpnext/issues/38345)) ([#38348](https://github.com/frappe/erpnext/issues/38348)) ([d6fe7eb](d6fe7eb10c))
* make parameters of `create_subscription_process` optional (and other minor fixes) ([#38360](https://github.com/frappe/erpnext/issues/38360)) ([721b429](721b429d93))
* Negative Qty and Rates in SO/PO (backport [#38252](https://github.com/frappe/erpnext/issues/38252)) ([#38357](https://github.com/frappe/erpnext/issues/38357)) ([14174df](14174df862))
* no fstring in translation (backport [#38381](https://github.com/frappe/erpnext/issues/38381)) ([#38387](https://github.com/frappe/erpnext/issues/38387)) ([c101855](c1018555a0))
* patch - Duplicate entry quality inspection parameter (backport [#38262](https://github.com/frappe/erpnext/issues/38262)) ([#38264](https://github.com/frappe/erpnext/issues/38264)) ([4c9890a](4c9890a24e))
* Payment Reco Issue and chart of account importer ([4699887](4699887f1c))
* serial no status (backport [#38391](https://github.com/frappe/erpnext/issues/38391)) ([#38397](https://github.com/frappe/erpnext/issues/38397)) ([b65c225](b65c22579d))
* Server Error while creating Product Bundle (backport [#38377](https://github.com/frappe/erpnext/issues/38377)) ([#38380](https://github.com/frappe/erpnext/issues/38380)) ([922aef6](922aef665b))
* skip disabled bundles for non-report utils ([3d46b32](3d46b323b3))
* skip fixed assets in parent ([314a91a](314a91ac4d))
* Supplier `Primary Contact` (backport [#38268](https://github.com/frappe/erpnext/issues/38268)) ([#38286](https://github.com/frappe/erpnext/issues/38286)) ([37d1f1a](37d1f1ac67))
* **ux:** Sales Order Stock Reservation Dialog (backport [#38261](https://github.com/frappe/erpnext/issues/38261)) ([#38344](https://github.com/frappe/erpnext/issues/38344)) ([3cbe599](3cbe59902a))
* validation for existing bundles ([c0de9c0](c0de9c0cef))

### Features

* add Bank Transaction to connections in Journal and Payment Entry (backport [#38297](https://github.com/frappe/erpnext/issues/38297)) ([#38301](https://github.com/frappe/erpnext/issues/38301)) ([72647b8](72647b8624))
* add disabled field in product bundle ([fcd53be](fcd53be188))
* new Report "Lost Quotations" ([#38309](https://github.com/frappe/erpnext/issues/38309)) ([ea2c348](ea2c3487a3))

### Performance Improvements

* optimize total_purchase_cost update ([deed9f5](deed9f5840))
v15.4.0 		2023-11-28 16:24:28 +00:00
rohitwaghchaure
4bfdab93ad Merge pull request #38383 from frappe/version-15-hotfix 
chore: release v15
 2023-11-28 21:53:16 +05:30
mergify[bot]
c1018555a0 fix: no fstring in translation (backport #38381) (#38387) 
fix: no fstring in translation (#38381)

(cherry picked from commit 8f00481c5f)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-28 21:36:05 +05:30
Shariq Ansari
9f873749e2 Merge pull request #38400 from frappe/mergify/bp/version-15-hotfix/pr-38398 
fix(CRM): create contact if existing customer doesn't have contact (backport #38398)
 2023-11-28 20:45:34 +05:30
Shariq Ansari
b1b065daf1 fix: create contact if existing customer doesn't have contact 
(cherry picked from commit 23b0b8ba36)
 2023-11-28 14:20:10 +00:00
Gursheen Kaur Anand
33b3355cb3 Merge pull request #38396 from frappe/mergify/bp/version-15-hotfix/pr-38392 
fix: imports for renamed report (backport #38392)
 2023-11-28 19:21:37 +05:30
mergify[bot]
b65c22579d fix: serial no status (backport #38391) (#38397) 
fix: serial no status (#38391)

(cherry picked from commit 592fc81260)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-28 18:31:23 +05:30
Gursheen Anand
573c4d2bfc chore: fix imports for renamed report 
(cherry picked from commit aee2e12f39)
 2023-11-28 12:53:53 +00:00
mergify[bot]
922aef665b fix: Server Error while creating Product Bundle (backport #38377) (#38380) 
* fix: product bundle search input

(cherry picked from commit 729fc738af)

* fix: don't select all fields

(cherry picked from commit 8c3713b649)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-28 14:54:05 +05:30
mergify[bot]
a6f3a103db chore: fix flaky test case (backport #38369) (#38373) 
chore: fix flaky test case (#38369)

(cherry picked from commit ad3634be7c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-28 08:36:06 +05:30
Sagar Vora
8c906b422f Merge pull request #38366 from frappe/mergify/bp/version-15-hotfix/pr-38360 
fix: make parameters of `create_subscription_process` optional (and other minor fixes) (backport #38360)
 2023-11-27 21:06:36 +05:30
Sagar Vora
721b429d93 fix: make parameters of create_subscription_process optional (and other minor fixes) (#38360) 
(cherry picked from commit 5a53a4b044)
 2023-11-27 14:53:39 +00:00
ruthra kumar
7385db0cce Merge pull request #38359 from frappe/mergify/bp/version-15-hotfix/pr-38354 
refactor: handle rounding loss on AR/AP reports (backport #38354)
 2023-11-27 12:16:13 +05:30