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

46871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
fda9c03d4d Merge pull request #40644 from frappe/mergify/bp/version-14/pr-40622 
fix: reset update_outstanding_for_self flag for old records (backport #40622)
 2024-03-25 08:26:21 +05:30
ruthra kumar
adec93de18 refactor: hide on print formats 
(cherry picked from commit fdcdc8a56e)
 2024-03-25 07:47:20 +05:30
ruthra kumar
73c534cf1a fix: reset update outstanding flag for old records 
(cherry picked from commit a88bf8419e)
 2024-03-25 07:47:16 +05:30
Frappe PR Bot
1c6f5b6525 chore(release): Bumped to Version 14.65.7 
## [14.65.7](https://github.com/frappe/erpnext/compare/v14.65.6...v14.65.7) (2024-03-22)

### Bug Fixes

* rate reset to zero ([e09b3ad](e09b3ad720))
v14.65.7 		2024-03-22 10:32:42 +00:00
rohitwaghchaure
a6b887312b Merge pull request #40620 from frappe/mergify/bp/version-14/pr-40618 
fix: rate reset to zero (backport #40616) (backport #40618)
 2024-03-22 16:01:27 +05:30
Rohit Waghchaure
e09b3ad720 fix: rate reset to zero 
(cherry picked from commit 6821baa850)
(cherry picked from commit 2f839fbf6d)
 2024-03-22 10:12:07 +00:00
Frappe PR Bot
14f7aef4d0 chore(release): Bumped to Version 14.65.6 
## [14.65.6](https://github.com/frappe/erpnext/compare/v14.65.5...v14.65.6) (2024-03-21)

### Bug Fixes

* rate not fetching from the item price ([18279a6](18279a6dbd))
v14.65.6 		2024-03-21 17:33:34 +00:00
rohitwaghchaure
5f84e0d7e8 Merge pull request #40601 from frappe/mergify/bp/version-14/pr-40599 
fix: rate not fetching from the item price (backport #40595) (backport #40599)
 2024-03-21 23:02:23 +05:30
Rohit Waghchaure
18279a6dbd fix: rate not fetching from the item price 
(cherry picked from commit d893a465d7)
(cherry picked from commit 9b3c4ac575)
 2024-03-21 17:12:01 +00:00
Frappe PR Bot
74ec853b97 chore(release): Bumped to Version 14.65.5 
## [14.65.5](https://github.com/frappe/erpnext/compare/v14.65.4...v14.65.5) (2024-03-20)

### Bug Fixes

* style for tax breakup ([a0156e1](a0156e1e47))
* use Text Editor for rendering tax breakup table ([7df09d1](7df09d18e1))
v14.65.5 		2024-03-20 15:22:12 +00:00
Deepesh Garg
7ed625d5e1 Merge pull request #40569 from frappe/mergify/bp/version-14/pr-40563 
fix: use `Text Editor` for rendering tax breakup table (backport #40563)
 2024-03-20 20:50:31 +05:30
Gursheen Anand
381899bf5f chore: resolve conflicts 2024-03-20 20:25:31 +05:30
Ankush Menat
a0156e1e47 fix: style for tax breakup 
(cherry picked from commit 967540da18)

# Conflicts:
#	erpnext/public/scss/erpnext.scss
 2024-03-20 13:06:47 +00:00
Gursheen Anand
7df09d18e1 fix: use Text Editor for rendering tax breakup table 
(cherry picked from commit 1c63983873)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order/purchase_order.py
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/quotation/quotation.py
#	erpnext/selling/doctype/sales_order/sales_order.py
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note/delivery_note.py
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
 2024-03-20 13:06:46 +00:00
Frappe PR Bot
b6575176f7 chore(release): Bumped to Version 14.65.4 
## [14.65.4](https://github.com/frappe/erpnext/compare/v14.65.3...v14.65.4) (2024-03-20)

### Bug Fixes

* added index for voucher_detail_no in gl entry ([a1c8b93](a1c8b93e99))
* currency symbol for Landed Cost Voucher Amount (backport [#40550](https://github.com/frappe/erpnext/issues/40550)) ([#40553](https://github.com/frappe/erpnext/issues/40553)) ([7851311](785131121d))
* Data too long for column 'stock_queue' ([#40450](https://github.com/frappe/erpnext/issues/40450)) ([3340463](3340463b8e))
* flaky ecommerce test case ([#40534](https://github.com/frappe/erpnext/issues/40534)) ([b197c19](b197c1926f))
* get unique provisional accounts ([39d958c](39d958c507))
* index error on Exchange Rate Revaluation creation ([8813b6b](8813b6b2fd))
* invalid exchange loss booking on invoice againts base accounts ([a27f386](a27f386665))
* missing range for ageing summary ([9f0ad7a](9f0ad7a4ea))
* provisional entry for non-stock item ([0aef7f9](0aef7f9671))
* **Supplier Quotation Comparison:** group by options ([cfed706](cfed706c15))
* Update Existing Price List Rate not working (backport [#40333](https://github.com/frappe/erpnext/issues/40333)) ([#40526](https://github.com/frappe/erpnext/issues/40526)) ([64f1844](64f1844bc8))
* warehouse issue in pick list ([#40453](https://github.com/frappe/erpnext/issues/40453)) ([5a2eaf9](5a2eaf9092))
v14.65.4 		2024-03-20 05:23:36 +00:00
rohitwaghchaure
edce5770f0 Merge pull request #40537 from frappe/version-14-hotfix 
chore: release v14
 2024-03-20 10:52:20 +05:30
mergify[bot]
785131121d fix: currency symbol for Landed Cost Voucher Amount (backport #40550) (#40553) 
* fix: currency symbol for Landed Cost Voucher Amount (#40550)

(cherry picked from commit 0725707cb1)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 23:37:32 +05:30
Nabin Hait
419f2a5192 Merge pull request #40519 from nabinhait/provisional-entry-fix 
fix: provisional entry for non-stock item
 2024-03-19 21:58:56 +05:30
Nabin Hait
39d958c507 fix: get unique provisional accounts 2024-03-19 21:06:16 +05:30
Nabin Hait
a1c8b93e99 fix: added index for voucher_detail_no in gl entry 2024-03-19 18:35:11 +05:30
Nabin Hait
0aef7f9671 fix: provisional entry for non-stock item 2024-03-19 18:29:37 +05:30
mergify[bot]
64f1844bc8 fix: Update Existing Price List Rate not working (backport #40333) (#40526) 
* fix: Update Existing Price List Rate not working (#40333)

(cherry picked from commit 09ea7edb86)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/setup/demo_data/item.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 18:11:50 +05:30
ruthra kumar
b197c1926f fix: flaky ecommerce test case (#40534) 
* refactor(test): make use of fixtures

* refactor(test): rating are now restricted with [0..1]

* refactor(test): remove superfluous setup override
 2024-03-19 17:54:35 +05:30
Raffael Meyer
76f27d99bb Merge pull request #40547 from frappe/mergify/bp/version-14-hotfix/pr-40546 
fix(Supplier Quotation Comparison): group by options (backport #40546)
 2024-03-19 13:07:40 +01:00
barredterra
cfed706c15 fix(Supplier Quotation Comparison): group by options 
(cherry picked from commit 87e36d290e)
 2024-03-19 11:51:37 +00:00
Gursheen Kaur Anand
93fe136386 Merge pull request #40530 from frappe/mergify/bp/version-14-hotfix/pr-40528 
fix(minor): missing range for ageing summary in PSOA (backport #40528)
 2024-03-19 12:44:16 +05:30
Gursheen Anand
9f0ad7a4ea fix: missing range for ageing summary 
(cherry picked from commit 643cc022fd)
 2024-03-19 07:11:18 +00:00
ruthra kumar
59a9a41e9d Merge pull request #40522 from frappe/mergify/bp/version-14-hotfix/pr-40502 
refactor: toggle between 'http' and 'https' on exchange rate API (backport #40502)
 2024-03-19 10:37:32 +05:30
ruthra kumar
33efa6960d chore: resolve conflicts 2024-03-19 10:14:24 +05:30
ruthra kumar
379616ab4b refactor: toggle between 'http' and 'https' on exchange rate API 
(cherry picked from commit 8b81274769)

# Conflicts:
#	erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
 2024-03-19 04:29:44 +00:00
ruthra kumar
8cb1293ffc Merge pull request #40515 from frappe/mergify/bp/version-14-hotfix/pr-40511 
fix: invalid exchange loss booking on invoice against base accounts (backport #40511)
 2024-03-18 21:05:51 +05:30
ruthra kumar
fe78214ea4 refactor(test): ensure Exchange gain/loss journals aren't created 
(cherry picked from commit e1c2d006ca)
 2024-03-18 15:14:44 +00:00
ruthra kumar
a27f386665 fix: invalid exchange loss booking on invoice againts base accounts 
(cherry picked from commit 3d5dba6976)
 2024-03-18 15:14:44 +00:00
ruthra kumar
c4c0510a1b Merge pull request #40496 from frappe/mergify/bp/version-14-hotfix/pr-40495 
fix: index error on Exchange Rate Revaluation creation (backport #40495)
 2024-03-17 08:10:46 +05:30
ruthra kumar
8813b6b2fd fix: index error on Exchange Rate Revaluation creation 
(cherry picked from commit bb279e368c)
 2024-03-17 02:21:33 +00:00
ruthra kumar
a0e839e31a Merge pull request #40489 from frappe/mergify/bp/version-14-hotfix/pr-40485 
refactor: validate SO and SI references in Delivery Notes (backport #40485)
 2024-03-16 15:28:12 +05:30
ruthra kumar
9d827e84be chore: resolve conflicts 2024-03-16 15:02:23 +05:30
ruthra kumar
f87f284616 test: SO reference validation 
(cherry picked from commit 4f396d3049)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2024-03-16 09:29:07 +00:00
ruthra kumar
5f4a648dd4 refactor: validate SO and SI references 
(cherry picked from commit 4d090bd3b8)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py
 2024-03-16 09:29:07 +00:00
ruthra kumar
5f0920ab27 Merge pull request #40475 from frappe/mergify/bp/version-14-hotfix/pr-40473 
refactor: enable no-copy for update_outstanding_for_self (backport #40473)
 2024-03-16 10:09:37 +05:30
ruthra kumar
03cb07f591 Merge pull request #40465 from frappe/mergify/bp/version-14-hotfix/pr-40461 
refactor: disallow '0' qty return invoices with stock effect (backport #40461)
 2024-03-16 10:07:31 +05:30
ruthra kumar
90a5155fc1 refactor: enable no-copy for update_outstanding_for_self 
(cherry picked from commit a1e8caa5c1)
 2024-03-15 11:33:09 +00:00
ruthra kumar
0437274c58 chore: resolve conflict 2024-03-15 11:39:54 +05:30
ruthra kumar
a914eb5d40 test: validation to prevent '0' qty return with stock effect 
(cherry picked from commit 647bba0f00)
 2024-03-15 05:37:23 +00:00
ruthra kumar
b011a68a2a refactor: disallow '0' qty return invoices with stock effect 
(cherry picked from commit 898affbee9)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-15 05:37:22 +00:00
Frappe PR Bot
009cdb732f chore(release): Bumped to Version 14.65.3 
## [14.65.3](https://github.com/frappe/erpnext/compare/v14.65.2...v14.65.3) (2024-03-14)

### Bug Fixes

* Data too long for column 'stock_queue' (backport [#40450](https://github.com/frappe/erpnext/issues/40450)) ([#40452](https://github.com/frappe/erpnext/issues/40452)) ([0999d09](0999d09700))
* warehouse issue in pick list (backport [#40453](https://github.com/frappe/erpnext/issues/40453)) ([#40455](https://github.com/frappe/erpnext/issues/40455)) ([314e9f5](314e9f5787))
v14.65.3 		2024-03-14 07:36:22 +00:00
mergify[bot]
314e9f5787 fix: warehouse issue in pick list (backport #40453) (#40455) 
fix: warehouse issue in pick list (#40453)

(cherry picked from commit 5a2eaf9092)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-14 13:04:41 +05:30
mergify[bot]
0999d09700 fix: Data too long for column 'stock_queue' (backport #40450) (#40452) 
fix: Data too long for column 'stock_queue' (#40450)

(cherry picked from commit 3340463b8e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-14 13:04:16 +05:30
rohitwaghchaure
5a2eaf9092 fix: warehouse issue in pick list (#40453) 2024-03-14 12:17:23 +05:30
rohitwaghchaure
3340463b8e fix: Data too long for column 'stock_queue' (#40450) 2024-03-14 11:39:29 +05:30