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

5367 Commits

Author SHA1 Message Date
Deepesh Garg
3a2f08fbda fix: Billing Address for inter-company purchase docs 
(cherry picked from commit 796f2d3c09)
 2022-10-20 06:29:56 +00:00
mergify[bot]
b8d97b82b8 fix: pricing rule item code UOM apply & conversions (backport #32566) (#32636) 
* fix: pricing rule for non stock UOM and conversions

* fix: pricing rule for non stock UOM and conversions

(cherry picked from commit 96b4211ea1)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.py

* chore: resolve conflicts

Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-10-18 23:31:31 +05:30
Deepesh Garg
015a221d8d chore: Resolve conflicts 2022-10-18 09:11:58 +05:30
Deepesh Garg
eec770a4a8 fix: Ignore linked purchase invoice on cancel 
(cherry picked from commit faadf78332)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2022-10-17 14:09:12 +00:00
Deepesh Garg
ff3bfb060a Merge pull request #32584 from frappe/mergify/bp/version-13-hotfix/pr-32557 
fix: Value error on validation of POS invoices with Serial Nos (backport #32557)
 2022-10-12 17:17:01 +05:30
rohitwaghchaure
63e087d31e Merge pull request #32580 from frappe/mergify/bp/version-13-hotfix/pr-32563 
fix: consider sales rate as incoming rate for transit warehouse in purchase flow (backport #32563)
 2022-10-12 17:08:33 +05:30
ruthra kumar
48efcc82b6 test: value error on serial no validation on pos 
(cherry picked from commit 9e2bd10d03)
 2022-10-12 11:12:09 +00:00
Deepesh Garg
3b5889ef85 chore: resolve conflicts 2022-10-12 16:30:23 +05:30
Deepesh Garg
151b9d4d7b chore: Increase precision for other doc fields 
(cherry picked from commit c8d2181498)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
 2022-10-12 10:54:13 +00:00
Deepesh Garg
0b48f13873 test: Internal tranfer precision loss test 
(cherry picked from commit dc20b21fb5)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2022-10-12 10:54:10 +00:00
Deepesh Garg
b531a38efe chore: Increase incoming_rate field precision to 6 
(cherry picked from commit b31c3bd35d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 2022-10-12 10:54:08 +00:00
Rohit Waghchaure
acd64ba7c1 fix: test case 
(cherry picked from commit 98bf8e1304)
 2022-10-12 10:51:22 +00:00
Rohit Waghchaure
f72602ebf3 fix: consider sales rate as incoming rate for transit warehouse in purchase flow 
(cherry picked from commit 683a47f7a1)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
#	erpnext/stock/stock_ledger.py
 2022-10-12 10:51:21 +00:00
Deepesh Garg
2bf76f64bd chore: resolve conflicts 2022-10-07 17:33:03 +05:30
Deepesh Garg
e1c41b9195 fix: Do not add tax withheld vouchers post tax withheding in one document 
(cherry picked from commit 781d160c68)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2022-10-07 11:03:16 +00:00
Deepesh Garg
32a9575f07 fix: Tax withholding related fixes 
(cherry picked from commit abf5b6be3e)
 2022-10-07 11:03:15 +00:00
Dany Robert
baa4fec611 feat(JE): trigger account field when fetched from template 
Closes #32409

(cherry picked from commit c35adcf5a1)
 2022-10-05 10:38:21 +00:00
rohitwaghchaure
3648745e5e Merge pull request #32470 from frappe/mergify/bp/version-13-hotfix/pr-32466 
fix: not able to return sold expired batches (backport #32466)
 2022-10-04 07:35:10 +05:30
rohitwaghchaure
4757a65863 fix: linter issue 2022-10-03 13:27:38 +05:30
rohitwaghchaure
0f8e34e972 fix: conflict 2022-10-03 13:18:58 +05:30
Rohit Waghchaure
2fd4485f2f fix: not able to return sold expired batches 
(cherry picked from commit 0b1727cf79)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2022-10-03 07:46:13 +00:00
Maharshi Patel
299175e6fe fix: payment request make bank field Link instead of Read Only 
(cherry picked from commit dc8d49260c)
 2022-10-03 07:26:06 +00:00
Maharshi Patel
8251b843ec Revert "fix: fetch swift_number in payment_request" 
This reverts commit f42a8e4e03.

(cherry picked from commit 9245d3b5cd)
 2022-10-03 07:26:05 +00:00
Maharshi Patel
60745705a8 fix: fetch swift_number in payment_request 
There isn't direct link between payment_request and bank so swift_number wasn't fetched using Fetch form. I fixed it by fetching swift_number on_change of bank_account.

(cherry picked from commit f42a8e4e03)
 2022-10-03 07:26:04 +00:00
Deepesh Garg
562025eb45 Merge branch 'version-13-hotfix' into fix-payment-reconciliation-jv-cost-center 2022-10-01 11:10:21 +05:30
Deepesh Garg
61d3370527 chore: Remove print statements 
(cherry picked from commit bff3cd9068)
 2022-09-30 10:36:20 +00:00
Deepesh Garg
32456bff30 fix: Incorrect TCS amount deducted in Sales Invoice 
(cherry picked from commit 08443c6421)
 2022-09-30 10:36:20 +00:00
Maharshi Patel
96fa14be88 fix: POS properly validate stock for bundle products 
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.

(cherry picked from commit e392ea1104)

# Conflicts:
#	erpnext/selling/page/point_of_sale/pos_item_details.js
 2022-09-28 08:16:02 +00:00
Maharshi Patel
ac8100f1e5 fix: POS only validate QTY if is_stock_item 
POS invoice raised " Item not available " validation error even though item is non_stock.

(cherry picked from commit e39e088f18)
 2022-09-28 08:16:00 +00:00
Deepesh Garg
9e8e7aab70 fix: Add return against indexes for POS Invoice 
(cherry picked from commit cbfe28286a)
 2022-09-27 16:52:59 +00:00
Deepesh Garg
6c528d469d fix: Add return against indexes for POS Invoice 
(cherry picked from commit 1f6205e1ea)
 2022-09-27 16:52:59 +00:00
Rohit Waghchaure
02468a902f fix: allow to return expired batches using purchase return 
(cherry picked from commit a4a86ee23f)
 2022-09-27 08:51:26 +00:00
Maharshi Patel
4152a9f026 Merge branch 'version-13-hotfix' into fix-payment-reconciliation-jv-cost-center 2022-09-26 23:03:39 +05:30
ruthra kumar
d68cdb4f5e fix: difference amount calculation on payment reconciliation 
(cherry picked from commit 122d5f2729)
 2022-09-26 10:36:08 +05:30
Maharshi Patel
9f988910b5 fix: payment reconciliation tool consider cost_center for JV 
We need to consider cost center in all four cases of get_conditions. I have removed check in if statement for get_invoices, get_payments, get_return_invoices as it is not required.
 2022-09-25 23:24:59 +05:30
Deepesh Garg
1cfeb9371c fix: Reduce font size for Process Statement of accounts print/pdf 
(cherry picked from commit 6bfd193b0d)
 2022-09-22 19:38:55 +00:00
Deepesh Garg
82e5a784cb Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-32284 2022-09-21 13:08:41 +05:30
Deepesh Garg
d0bd78ddcd Merge pull request #32289 from frappe/mergify/bp/version-13-hotfix/pr-32204 
fix(UX): More predictable tax withholding application in invoices (backport #32204)
 2022-09-21 00:11:37 +05:30
Deepesh Garg
e2912caeae chore: Handle edge cases 2022-09-20 23:50:16 +05:30
Deepesh Garg
21154c8bee chore: fix tests 2022-09-20 17:52:37 +05:30
Deepesh Garg
de8f44bbff chore: Resolve conflicts 2022-09-20 16:42:30 +05:30
Maharshi Patel
8abfdb6598 fix: remove no_copy for ignore_pricing_rule 
(cherry picked from commit 8c5b420aea)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 2022-09-20 10:49:59 +00:00
Deepesh Garg
794eeebabc chore: resolve conflicts 2022-09-20 14:48:06 +05:30
Deepesh Garg
75768d780f Merge pull request #32282 from frappe/mergify/bp/version-13-hotfix/pr-32217 
fix: incorrect gl if tax on multi currency payment entry (backport #32217)
 2022-09-20 14:39:37 +05:30
Deepesh Garg
fe252b48f7 chore: fix tests 
(cherry picked from commit 9aa1f84d45)
 2022-09-20 09:07:06 +00:00
Deepesh Garg
ca0cce7599 fix: TDS deduction via journal entry 
(cherry picked from commit 36d0906ea2)
 2022-09-20 09:07:05 +00:00
Deepesh Garg
e07fd46a46 test: Add tests 
(cherry picked from commit b6184ce471)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2022-09-20 09:07:04 +00:00
Deepesh Garg
51d7c0bfe4 fix: Fetch vouchers to show in Invoice 
(cherry picked from commit 3fb1595a4e)
 2022-09-20 09:07:03 +00:00
Deepesh Garg
4165fee6a7 fix: Add child table for tax withheld vouchers 
(cherry picked from commit 246c1a9380)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2022-09-20 09:07:02 +00:00
ruthra kumar
5c0a46110e test: gl entries of payments with advance tax 
(cherry picked from commit 5bd5dd7262)
 2022-09-20 11:09:37 +05:30