schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,380 Commits 322 Branches 1,581 Tags
f2e577bec749fcbba74c224e2869433f24d7a4bb
Commit Graph

2301 Commits

Author SHA1 Message Date
ruthra kumar
f2e577bec7 fix: project query controller logic 
(cherry picked from commit 4eefb445a7)

# Conflicts:
#	erpnext/controllers/queries.py
 2024-01-16 10:55:30 +00:00
barredterra
755576bd78 fix: unreconcile Bank Transaction on cancel of payment voucher 
(cherry picked from commit 0a95b38166)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.py
#	erpnext/accounts/doctype/journal_entry/journal_entry.js
 2024-01-11 13:37:32 +00:00
Nabin Hait
41e384326e fix: Set asset purchase amount based on qty and valuation_rate 
(cherry picked from commit 135e19d0aa)
 2024-01-10 06:03:03 +00:00
mergify[bot]
f42e93bf6c fix: skip rate validation for return DN Items with Moving Average valuation (backport #39242) (#39265) 
* fix: skip rate validation for return `DN Items` with `Moving Average` valuation

(cherry picked from commit e0ad52b500)

# Conflicts:
#	erpnext/controllers/sales_and_purchase_return.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-10 10:53:09 +05:30
mergify[bot]
06d193ad87 fix: don't set rate for non-stock item in Internal Transfer (backport #39140) (#39168) 
* fix: don't set rate for non-stock item in Internal Transfer

(cherry picked from commit e1b0fffd0c)

* test: internal transfer for non-stock item

(cherry picked from commit 57b6a98703)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-08 11:44:52 +05:30
mergify[bot]
c0b598074c fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013) 
fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013)

(cherry picked from commit cd37fd790b)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-29 16:15:45 +05:30
s-aga-r
2eac618bba Merge pull request #38892 from s-aga-r/FIX-6565 
fix: remove rows with zero consumed qty
 2023-12-22 15:58:09 +05:30
rohitwaghchaure
3a668bbe96 fix: reposting not fixing valuation rate for sales return using movin… (#38895) 
fix: reposting not fixing valuation rate for sales return using moving average method
 2023-12-21 14:13:34 +05:30
s-aga-r
f2f410093a fix: remove rows with zero consumed qty 2023-12-21 11:03:18 +05:30
rohitwaghchaure
7fdac62393 fix: incoming rate for sales return with Moving Average valuation method (#38849) 2023-12-19 18:01:50 +05:30
rohitwaghchaure
e0c8ff10da fix: item variant with manufacturer (#38845) 2023-12-19 12:45:08 +05:30
rohitwaghchaure
23042dfc3c fix: not able to make inter-company po from so (#38826) 2023-12-18 17:44:17 +05:30
Smit Vora
24ae45ce84 fix: fetch item_tax_template values if fields with fetch_from exisit 2023-12-17 14:03:37 +05:30
Deepesh Garg
d593f81a16 fix: Init internal child table values 
(cherry picked from commit 2588970d55)
 2023-12-15 12:45:51 +00:00
ruthra kumar
f6c611d026 Merge pull request #38744 from ruthra-kumar/filter_error_on_reconciliation_tool 
fix: error while filtering on name on reconciliation tool
 2023-12-14 15:10:12 +05:30
ruthra kumar
30b6321fd5 fix: error while filtering on name on reconciliation tool 2023-12-14 14:28:20 +05:30
mergify[bot]
9f23b7e46f fix: use predefined onload property load_after_mapping (backport #38209) (#38518) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
fix: use predefined onload property `load_after_mapping` (#38209)
 2023-12-04 09:52:16 +05:30
mergify[bot]
b7fe163de5 fix: SO ordered qty on PO item removal (#38378) 
* fix: SO ordered qty on PO item removal (#38378)

* fix: update ordered_qty for SO when PO items removed

* refactor: use cached value

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 9087e1443e)

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

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-12-04 09:35:51 +05:30
mergify[bot]
b88c7d63de fix: don't update previous doc on rate change (backport #38493) (#38523) 
fix: don't update previous doc on rate change

(cherry picked from commit 68f5dd3e7b)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-03 14:02:59 +05:30
mergify[bot]
497049b3fd fix: incorrect requested quantity for the subcontracting order (backport #38455) (#38471) 
* fix: incorrect requested quantity for the subcontracting order

(cherry picked from commit 691e3bb24f)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py
#	erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
#	erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-11-30 20:53:52 +05:30
s-aga-r
55e4951445 chore: conflicts 2023-11-29 12:25:16 +05:30
rohitwaghchaure
8e370876cc fix: incorrect ordered qty for Subcontracting Order (#38415) 
(cherry picked from commit fddf341f44)

# Conflicts:
#	erpnext/controllers/tests/test_subcontracting_controller.py
 2023-11-29 06:52:34 +00:00
Marica
50f3b01eb7 fix: Negative Qty and Rates in SO/PO (#38253) 
* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation
 2023-11-27 09:06:27 +05:30
Gursheen Anand
d7d5317b0e chore: linting issues 
(cherry picked from commit 1657337887)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
fd19ac55e3 fix: has_product_bundle util to only check for enabled bundles 
(cherry picked from commit 3543f86c63)
 2023-11-24 04:30:38 +00:00
ruthra kumar
82fa58d4e3 chore: update new unreconcile doctype name in JS and PY files 
(cherry picked from commit 74f9e34182)
 2023-11-23 05:09:23 +00:00
Anand Baburajan
3daf6f822a fix: set default asset quantity as 1 [v14] (#38224) 
fix: set default asset quantity as 1
 2023-11-20 22:27:25 +05:30
ruthra kumar
40f904391e refactor: set default for 'update_billed_amount_in_delivery_note' 
(cherry picked from commit ee0c64215d)
 2023-11-20 08:36:51 +00:00
Dany Robert
296433a1dd fix: wrong round off and rounded total 
(cherry picked from commit 3a487bd33a)
 2023-11-19 13:49:05 +00:00
s-aga-r
9a34518e54 fix: incorrect incoming rate for serial and batch items in standalone debit note (#38121) 2023-11-18 18:48:25 +05:30
mergify[bot]
8446e87cc2 chore: delete comments and unlink attachments on company transactions deletion (backport #38077) (#38078) 
* chore: delete comments and unlink attachments on company transactions deletion

(cherry picked from commit 2f9e96e324)

* fix: unrelated transation date typo

(cherry picked from commit b097bb20d9)

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-11-13 19:20:52 +05:30
ruthra kumar
3f7f5bd8f0 refactor: ignore disabled account while selecting Income Accounts 
(cherry picked from commit 6e3e094c95)
 2023-11-09 04:45:53 +00:00
mergify[bot]
64658fc790 fix: don't reset rate if greater than zero in standalone debit note (backport #37935) (#37940) 
* fix: don't reset rate if greater than zero in standalone debit note

(cherry picked from commit 5cce522ecd)

* fix(test): `test_gl_entries_for_standalone_debit_note`

(cherry picked from commit f9fc6c9c9d)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 19:27:28 +05:30
mergify[bot]
1a3dae0f9a fix: permission error while creating Supplier Quotation from Portal (backport #37864) (#37870) 
* fix: permission error while creating Supplier Quotation from Portal

(cherry picked from commit e019d43d0b)

# Conflicts:
#	erpnext/controllers/buying_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-03 16:24:36 +05:30
mergify[bot]
e19cade12d fix: remove voucher type and no for Item and Warehouse based reposting (backport #37849) (#37850) 
* fix: remove voucher type and no for Item and Warehouse based reposting

(cherry picked from commit 0104897d69)

* chore: fix test cases

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-11-02 15:15:53 +05:30
mergify[bot]
69b569df46 fix: standard submit perm in repost ledger for editable invoices (backport #37826) (#37854) 
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:33 +05:30
Gursheen Anand
d8e743013f fix: status for over delivery or billing 
(cherry picked from commit d69b0d76dd)
 2023-11-01 07:00:14 +00:00
Deepesh Garg
80774e2da1 fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#37660) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* fix: rearrange functions

* chore: rearrange functions

* chore: rearrange functions

* fix: Purchase Invoice GL entires for assets

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests

* chore: make `Reserve Stock` checkbox visible in SO

* refactor: rename field `Auto Reserve Stock for Sales Order`

* feat: add fields to hold SO and SO Item ref in PR Item

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests

* refactor: Remove expense included in valuation accounts

* chore: Add back default in transit warehousefield

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-25 09:12:27 +05:30
ruthra kumar
ae788e8358 test: varying posting date for gain loss journal 
(cherry picked from commit 514d5434a3)
 2023-10-23 15:57:16 +00:00
ruthra kumar
515bed8c80 refactor: pass gain loss posting date to controller 
(cherry picked from commit 7e600a6494)
 2023-10-23 15:57:16 +00:00
mergify[bot]
78b7c26420 fix: remove from or target warehouse for non internal transfer entries (backport #37612) (#37628) 
fix: remove from or target warehouse for non internal transfer entries (#37612)

(cherry picked from commit 5136fe196b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-23 12:27:01 +05:30
mergify[bot]
022f85dd08 fix: e-commerce permissions for address (#37554) 
* fix: E-commerce permissions

(cherry picked from commit f4d74990fe)

# Conflicts:
#	erpnext/controllers/selling_controller.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-10-18 17:21:46 +05:30
s-aga-r
5025850258 fix: same Serial No get mapped while creating SO -> DN (#37527) 
* fix: same Serial No get mapped while creating SO -> DN

* test: add test case for DN with repetitive serial item
 2023-10-17 12:20:23 +05:30
ruthra kumar
71cb7d37ee refactor: checkbox to toggle exchange rate inheritence in PO->PI 
(cherry picked from commit 08315522bb)
 2023-10-17 04:16:50 +00:00
ruthra kumar
d37a1811db refactor: add validation for Advances in SI/PI 
(cherry picked from commit 0cdd6435a5)
 2023-10-11 14:34:38 +00:00
s-aga-r
26ad688584 fix: negative valuation rate in PR return (#37424) 
* fix: negative valuation rate in PR return

* test: add test case for PR return
 2023-10-11 18:44:32 +05:30
ruthra kumar
debfbc4761 refactor: remove references in repost doctypes upon parent doc delet 
(cherry picked from commit ed7f67b1a8)
 2023-10-10 11:01:05 +05:30
Gursheen Anand
677525b2cf refactor: use repost accounting legder 
(cherry picked from commit 7ebf083683)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
79e414cb97 refactor: move reposting logic to common controller 
(cherry picked from commit 68effd93bd)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2023-10-10 10:58:19 +05:30
ruthra kumar
dc804f216d Merge pull request #37402 from frappe/mergify/bp/version-14-hotfix/pr-36879 
feat: Unreconcile Payments (backport #36879)
 2023-10-10 10:39:54 +05:30