Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from upstream v14 #79

Merged
merged 1,297 commits into from
Apr 2, 2024
Merged

Conversation

Alchez
Copy link

@Alchez Alchez commented Nov 14, 2023

Changelogs:

@Alchez Alchez requested a review from vjFaLk November 14, 2023 09:45
Copy link

commit-lint bot commented Nov 14, 2023

Bug Fixes

Code Refactoring

  • gain_loss posting date fields in the allocation table (fa7fa85)
  • introduce fields in popup (063d658)
  • pass gain loss posting date to controller (515bed8)
  • test: make use of utility methods (c921d7d)
  • button on PE to filter associated Journals (be90be3)
  • exc rate on foreign currency JE from Bank Reconciliation (677d728)
  • handle bank transaction in foreign currency (9113085)

Tests

  • varying posting date for gain loss journal (ae788e8)
  • overalloction on reconciliation when PO is involved (c8922ad)

Chore

Contributors

mergify[bot], saeedkola, deepeshgarg007, ruthra-kumar, anandbaburajan, rohitwaghchaure, barredterra

Commit-Lint commands

You can trigger Commit-Lint actions by commenting on this PR:

  • @Commit-Lint merge patch will merge dependabot PR on "patch" versions (X.X.Y - Y change)
  • @Commit-Lint merge minor will merge dependabot PR on "minor" versions (X.Y.Y - Y change)
  • @Commit-Lint merge major will merge dependabot PR on "major" versions (Y.Y.Y - Y change)
  • @Commit-Lint merge disable will desactivate merge dependabot PR
  • @Commit-Lint review will approve dependabot PR
  • @Commit-Lint stop review will stop approve dependabot PR

@Alchez Alchez changed the title Merge v14 Merge from upstream v14 Nov 16, 2023
GursheenK and others added 24 commits March 3, 2024 18:24
…fix/pr-39584

fix: use receipt amount for reverse provisional entry (backport frappe#39584)
…g-in-JV

perf: remove unnecessary fetching of balances in JV
…) (frappe#40229)

* fix: do not allow to cancel incomplete reposting (frappe#40224)

(cherry picked from commit 72ac56b)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
…fix/pr-40278

fix: incorrect TCS on customer and suppliers with same name (backport frappe#40278)
# [14.65.0](frappe/erpnext@v14.64.0...v14.65.0) (2024-03-06)

### Bug Fixes

* account validation error on bank account after editing existing bank account ([8b3c809](frappe@8b3c809))
* allow gain/loss for Journals against Journals ([52e1c2f](frappe@52e1c2f))
* do not allow to cancel incomplete reposting (backport [frappe#40224](frappe#40224)) ([frappe#40229](frappe#40229)) ([091d6f3](frappe@091d6f3))
* don't override reference exchange rate ([e25ec41](frappe@e25ec41))
* handle partial invoice against provisional entry ([5f23614](frappe@5f23614))
* incorrect exchange rate if JE has multi parties ([1b5a237](frappe@1b5a237))
* incorrect TCS on customer and suppliers with same name ([af56846](frappe@af56846))
* make use of 'flt' to prevent really low precision exc gain/loss ([c1a0ac6](frappe@c1a0ac6))
* make warning for previously existing SO an alert ([c8b817c](frappe@c8b817c))
* over billing qty along with rate ([14d9d29](frappe@14d9d29))
* **Project:** filter department by company ([646b55e](frappe@646b55e))
* provisional reverse entry amount ([e62c49d](frappe@e62c49d))
* rate change on changing of the qty (backport [frappe#40241](frappe#40241)) ([frappe#40242](frappe#40242)) ([b937c4b](frappe@b937c4b))
* **setup:** avoid duplicate entry for Analytics role (backport [frappe#40183](frappe#40183)) ([frappe#40184](frappe#40184)) ([035c90c](frappe@035c90c))

### Features

* add company filter to child table field ([38baf8d](frappe@38baf8d))
It's tedious to enter all these values and some shipping providers only need to know the weigth and quantity. Companies can alwas cutomize the values to be mandatory, but the reverse is not possible. I'll make sure that the erpnext-shipping app does not break because of this (or fix any problems).

(cherry picked from commit 898c6e3)
…fix/pr-40317

fix(Shipment Parcel): make length, width and height non-mandatory (backport frappe#40317)
…fix/pr-40334

fix: load ignored doctype and include Mode of Payment Account (frappe#40334)
frappe-bot and others added 28 commits March 22, 2024 10:32
## [14.65.7](frappe/erpnext@v14.65.6...v14.65.7) (2024-03-22)

### Bug Fixes

* rate reset to zero ([e09b3ad](frappe@e09b3ad))
…fix/pr-39800

perf: new column Posting Datetime in SLE to optimize stock ledger related queries (backport frappe#39800)
…fix/pr-38496

feat: utility to debug financial reports - Bisect Accounting Statements (backport frappe#38496)
(cherry picked from commit fdcdc8a)
fix: pass empty string email content of pos invoice
…fix/pr-40017

fix: remove microsecond from posting datetime (backport frappe#40017)
…fix/pr-40622

refactor: reset update_outstanding_for_self flag for old records (backport frappe#40622)
(cherry picked from commit fdcdc8a)
…40622

fix: reset update_outstanding_for_self flag for old records (backport frappe#40622)
## [14.65.8](frappe/erpnext@v14.65.7...v14.65.8) (2024-03-25)

### Bug Fixes

* reset update outstanding flag for old records ([73c534c](frappe@73c534c))
…fix/pr-40640

fix: Add default finance book check-in P&L statement (frappe#40640)
…fix/pr-40503

fix: achieved targets for territory / partners bpv15 (frappe#40503)
…fix/pr-40684

fix: incorrect total qty in job card (backport frappe#40684)
# [14.66.0](frappe/erpnext@v14.65.8...v14.66.0) (2024-03-27)

### Bug Fixes

* achieved targets for sales partners ([f9ab763](frappe@f9ab763))
* Add default finance book check in P&L statement ([4485121](frappe@4485121))
* incorrect total qty in job card ([fb252ec](frappe@fb252ec))
* pass empty string email content of pos invoice ([ee7bd98](frappe@ee7bd98))
* permissions during bulk transaction logs ([99faafb](frappe@99faafb))
* rate not fetching from the item price ([9b3c4ac](frappe@9b3c4ac))
* rate reset to zero ([2f839fb](frappe@2f839fb))
* remove microsecond from posting datetime ([frappe#40017](frappe#40017)) ([c3f9338](frappe@c3f9338))
* show correct variance for durations with no vouchers ([fe3bee4](frappe@fe3bee4))
* style for tax breakup ([e922ac7](frappe@e922ac7))
* use Text Editor for rendering tax breakup table ([bba1ac5](frappe@bba1ac5))
* validate gl for previous fiscal year ([82b6133](frappe@82b6133))
* wrong buying amount if delivered and billed qty varies ([2b31113](frappe@2b31113))

### Features

* bisect doctype ([5ad3918](frappe@5ad3918))
* nodes doctype ([6afb6ff](frappe@6afb6ff))

### Performance Improvements

* add in some indexes (backport [frappe#40590](frappe#40590)) ([frappe#40604](frappe#40604)) ([390d3a6](frappe@390d3a6))
* new column posting datetime in SLE to optimize stock ledger related queries ([5e68ebd](frappe@5e68ebd))
(cherry picked from commit 33fd7b8)
(cherry picked from commit 4f4470b)
…40710

fix: Priority not copied from project template (backport frappe#40708) (backport frappe#40710)
## [14.66.1](frappe/erpnext@v14.66.0...v14.66.1) (2024-03-27)

### Bug Fixes

* Priority not copied from project template ([af6dd3b](frappe@af6dd3b))
(cherry picked from commit 1f46c15)
…40739

refactor: use sql to clear comments (backport frappe#40739)
## [14.66.2](frappe/erpnext@v14.66.1...v14.66.2) (2024-03-29)

### Bug Fixes

* use sql to clear comments ([0322c1a](frappe@0322c1a))
@Alchez Alchez merged commit 66e7f5b into ParsimonyGit:parsimony-production-v14 Apr 2, 2024
5 of 8 checks passed
@Alchez Alchez deleted the merge-v14 branch May 14, 2024 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.