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

fix: set expense account as Assets RBNB only if it is booked in linked PR #41368

Merged
merged 2 commits into from
May 29, 2024

Conversation

nabinhait
Copy link
Member

Set expense account as Assets RBNB only if it is booked in linked PR because earlier GLEs are not posted via Purchase Receipt for non-cwip assets.

@nabinhait
Copy link
Member Author

@Mergifyio rebase

Copy link
Contributor

mergify bot commented May 28, 2024

rebase

☑️ Nothing to do

  • any of:
    • #commits-behind>0 [📌 rebase requirement]
    • #commits>1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]

@nabinhait nabinhait merged commit 014486d into frappe:version-14-hotfix May 29, 2024
10 checks passed
mergify bot pushed a commit that referenced this pull request May 29, 2024
…d PR (#41368)

* fix: set expense account as Assets RBNB only if it is booked in linked PR

* fix: broken translations

(cherry picked from commit 014486d)
nabinhait added a commit that referenced this pull request May 29, 2024
…d PR (backport #41368) (#41673)

fix: set expense account as Assets RBNB only if it is booked in linked PR (#41368)

* fix: set expense account as Assets RBNB only if it is booked in linked PR

* fix: broken translations

(cherry picked from commit 014486d)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request May 29, 2024
## [14.70.3](v14.70.2...v14.70.3) (2024-05-29)

### Bug Fixes

* add in some indices to speed up Purchase Order deletion ([c16c41e](c16c41e))
* Add to Cart button width for Mobile/Tablet ([819ced4](819ced4))
* cost center filter according to the company in project ([7035969](7035969))
* cost center filter according to the company in project ([0cf97f2](0cf97f2))
* cost center filter according to the company in project ([459d136](459d136))
* dict can not be used as parameter ([#41598](#41598)) ([649c192](649c192))
* Fetch outstanding and total amount for reference journal entry ([50f6afd](50f6afd))
* set expense account as Assets RBNB only if it is booked in linked PR ([#41368](#41368)) ([014486d](014486d))
* Update depreciation schedule via asset repair ([#41344](#41344)) ([eb418e8](eb418e8))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.70.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

frappe-pr-bot pushed a commit that referenced this pull request May 29, 2024
# [15.26.0](v15.25.0...v15.26.0) (2024-05-29)

### Bug Fixes

* add in some indices to speed up Purchase Order deletion ([3ed3b21](3ed3b21))
* cost center filter according to the company in project ([193b844](193b844))
* cost center filter according to the company in project ([e6aaab3](e6aaab3))
* cost center filter according to the company in project ([563e15e](563e15e))
* multiple issues related to serial and batch bundle (backport [#41662](#41662)) ([#41668](#41668)) ([dc0bb22](dc0bb22))
* not allow template item in product bundle item ([8fb3294](8fb3294))
* not allow template item in product bundle item ([b64f5a4](b64f5a4))
* not allow template item in product bundle item - v15/v14 ([9864377](9864377))
* opening stock not showing in the stock ledger report for the bat… (backport [#41584](#41584)) ([#41590](#41590)) ([162ec7d](162ec7d))
* SCR batch qty issue (backport [#41595](#41595)) ([#41599](#41599)) ([17ea958](17ea958))
* set expense account as Assets RBNB only if it is booked in linked PR (backport [#41368](#41368)) ([#41673](#41673)) ([0a0970e](0a0970e))
* Unable to 'Get Suppliers' using tags in Request for Quotation (backport [#41626](#41626)) ([#41627](#41627)) ([ca855e8](ca855e8))

### Features

* Add Party details to Serial No Ledger Report ([#41656](#41656)) ([7462de6](7462de6))

### Performance Improvements

* sales order UI render (backport [#41591](#41591)) ([#41592](#41592)) ([09d112a](09d112a))
@nabinhait nabinhait added the backport develop instructs mergify to frontport PR to develop branch label Jun 3, 2024
@nabinhait
Copy link
Member Author

@Mergifyio backport develop

Copy link
Contributor

mergify bot commented Jun 3, 2024

backport develop

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jun 3, 2024
…d PR (#41368)

* fix: set expense account as Assets RBNB only if it is booked in linked PR

* fix: broken translations

(cherry picked from commit 014486d)
nabinhait added a commit that referenced this pull request Jun 3, 2024
…d PR (backport #41368) (#41733)

fix: set expense account as Assets RBNB only if it is booked in linked PR (#41368)

* fix: set expense account as Assets RBNB only if it is booked in linked PR

* fix: broken translations

(cherry picked from commit 014486d)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
earona pushed a commit to NovigoTechnology/erpnext that referenced this pull request Jun 6, 2024
## [15.0.1](v15.0.0-Novigo...v15.0.1-Novigo) (2024-06-06)

### Bug Fixes

* Add posting date to key for consolidated view ([2c164b4](2c164b4))
* bank account no fieldname mismatch ([frappe#41778](https://github.com/NovigoTechnology/erpnext/issues/41778)) ([d163dbe](d163dbe))
* **Company:** Allow Equity type account in unrealised exchange gain/loss account ([frappe#41740](https://github.com/NovigoTechnology/erpnext/issues/41740)) ([d30c797](d30c797))
* completed DC will not appear in a delivery trip ([frappe#41655](https://github.com/NovigoTechnology/erpnext/issues/41655)) ([4f0214d](4f0214d))
* convert percentage from str to float ([frappe#41766](https://github.com/NovigoTechnology/erpnext/issues/41766)) ([71f5470](71f5470))
* Copy depreciation schedule on asset split only if it exists ([frappe#41775](https://github.com/NovigoTechnology/erpnext/issues/41775)) ([689e1cf](689e1cf))
* correcting balance sheet calculation for zero liabilities and equity ([frappe#41497](https://github.com/NovigoTechnology/erpnext/issues/41497)) ([3c33135](3c33135))
* Do no apply pricing rule on qty change for mapped docs ([2b12421](2b12421))
* get assets received but not billed account only if any asset item is received (backport [frappe#41734](https://github.com/NovigoTechnology/erpnext/issues/41734)) ([frappe#41750](https://github.com/NovigoTechnology/erpnext/issues/41750)) ([c3ae5bc](c3ae5bc))
* Ignore disabling default currency field while creating new company ([frappe#41699](https://github.com/NovigoTechnology/erpnext/issues/41699)) ([80f6228](80f6228))
* incorrect accumulated depr amount in asset depr ledger ([frappe#41654](https://github.com/NovigoTechnology/erpnext/issues/41654)) ([a8fc32d](a8fc32d))
* incorrect batch selection while sales return ([frappe#41768](https://github.com/NovigoTechnology/erpnext/issues/41768)) ([cb6d8af](cb6d8af))
* link opportunity in prospect after creating opportunity from prospect ([frappe#41769](https://github.com/NovigoTechnology/erpnext/issues/41769)) ([12e48f0](12e48f0))
* local var referenced before assignment ([frappe#41780](https://github.com/NovigoTechnology/erpnext/issues/41780)) ([4ff3e6c](4ff3e6c))
* **minor:** corrected wrong filter condition ([frappe#41755](https://github.com/NovigoTechnology/erpnext/issues/41755)) ([60eb03a](60eb03a))
* payment term when creating PO from SO ([frappe#41376](https://github.com/NovigoTechnology/erpnext/issues/41376)) ([441596f](441596f))
* Select both account number and company in the account form ([frappe#41731](https://github.com/NovigoTechnology/erpnext/issues/41731)) ([5a75c84](5a75c84))
* set expense account as Assets RBNB only if it is booked in linked PR (backport [frappe#41368](https://github.com/NovigoTechnology/erpnext/issues/41368)) ([frappe#41733](https://github.com/NovigoTechnology/erpnext/issues/41733)) ([a2039ba](a2039ba))
* **stock settings:** Allowed any number in stock frozen upto days field ([frappe#41736](https://github.com/NovigoTechnology/erpnext/issues/41736)) ([740c495](740c495))
* TypeError: 'float' object is not iterable ([frappe#41758](https://github.com/NovigoTechnology/erpnext/issues/41758)) ([cf508ce](cf508ce))
* Use full name instead of abbreviation ([frappe#41738](https://github.com/NovigoTechnology/erpnext/issues/41738)) ([9a3569f](9a3569f))
* **Vehicle:** allow doc renaming and add test ([frappe#41729](https://github.com/NovigoTechnology/erpnext/issues/41729)) ([c76f466](c76f466))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport develop instructs mergify to frontport PR to develop branch backport version-15-hotfix needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants