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(UX): record reason for skipping attendance or marking absent for auto attendance #30846

Merged

Conversation

ruchamahabal
Copy link
Member

Manual port of: #30844

@ruchamahabal ruchamahabal merged commit f7bf4a3 into frappe:version-13-hotfix Apr 29, 2022
frappe-pr-bot pushed a commit that referenced this pull request May 3, 2022
# [13.28.0](v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](5df5058))
* convert default_item_manufacturer to link field ([#30835](#30835)) ([#30866](#30866)) ([37fad7e](37fad7e))
* Cost center filter on payment reconciliation ([22e7f03](22e7f03))
* filters not working in Shift Assignment Calendar view ([#30822](#30822)) ([3cdbb65](3cdbb65))
* Ignore custom field validation while setup ([ee54bf7](ee54bf7))
* **india:** e-invoice generation for registered composition gst category type ([#30814](#30814)) ([#30877](#30877)) ([246869d](246869d))
* Multi currency opening invoices ([2e62d51](2e62d51))
* payment days calculation for employees joining/leaving mid-month ([#30863](#30863)) ([#30883](#30883)) ([a1b0813](a1b0813))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([#30865](#30865)) ([5a5b49b](5a5b49b))
* **pos:** number pad translations ([b01f855](b01f855))
* **pos:** search field doesn't reset on checkout ([edbf551](edbf551))
* Supply type for overseas invoices with payment of tax ([fdcc591](fdcc591))
* supply type for sez invoices with payment of tax ([cf08710](cf08710))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](93482f3))
* **UX:** misleading stock entry lables ([#30870](#30870)) ([#30871](#30871)) ([57b03f0](57b03f0))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([#30846](#30846)) ([f7bf4a3](f7bf4a3))
* Vat Audit report fixes ([d5319a4](d5319a4))

### Features

* Copy task color from project template (backport [#30857](#30857)) ([#30859](#30859)) ([7ee18e8](7ee18e8))
* support product bundles in picklist (backport [#30762](#30762)) ([#30826](#30826)) ([645ee2d](645ee2d))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.28.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

deepeshgarg007 pushed a commit to deepeshgarg007/erpnext that referenced this pull request May 13, 2022
# [13.28.0](frappe/erpnext@v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](frappe@5df5058))
* convert default_item_manufacturer to link field ([frappe#30835](frappe#30835)) ([frappe#30866](frappe#30866)) ([37fad7e](frappe@37fad7e))
* Cost center filter on payment reconciliation ([22e7f03](frappe@22e7f03))
* filters not working in Shift Assignment Calendar view ([frappe#30822](frappe#30822)) ([3cdbb65](frappe@3cdbb65))
* Ignore custom field validation while setup ([ee54bf7](frappe@ee54bf7))
* **india:** e-invoice generation for registered composition gst category type ([frappe#30814](frappe#30814)) ([frappe#30877](frappe#30877)) ([246869d](frappe@246869d))
* Multi currency opening invoices ([2e62d51](frappe@2e62d51))
* payment days calculation for employees joining/leaving mid-month ([frappe#30863](frappe#30863)) ([frappe#30883](frappe#30883)) ([a1b0813](frappe@a1b0813))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([frappe#30865](frappe#30865)) ([5a5b49b](frappe@5a5b49b))
* **pos:** number pad translations ([b01f855](frappe@b01f855))
* **pos:** search field doesn't reset on checkout ([edbf551](frappe@edbf551))
* Supply type for overseas invoices with payment of tax ([fdcc591](frappe@fdcc591))
* supply type for sez invoices with payment of tax ([cf08710](frappe@cf08710))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](frappe@93482f3))
* **UX:** misleading stock entry lables ([frappe#30870](frappe#30870)) ([frappe#30871](frappe#30871)) ([57b03f0](frappe@57b03f0))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([frappe#30846](frappe#30846)) ([f7bf4a3](frappe@f7bf4a3))
* Vat Audit report fixes ([d5319a4](frappe@d5319a4))

### Features

* Copy task color from project template (backport [frappe#30857](frappe#30857)) ([frappe#30859](frappe#30859)) ([7ee18e8](frappe@7ee18e8))
* support product bundles in picklist (backport [frappe#30762](frappe#30762)) ([frappe#30826](frappe#30826)) ([645ee2d](frappe@645ee2d))
mergify bot pushed a commit that referenced this pull request May 15, 2022
# [13.28.0](v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](5df5058))
* convert default_item_manufacturer to link field ([#30835](#30835)) ([#30866](#30866)) ([37fad7e](37fad7e))
* Cost center filter on payment reconciliation ([22e7f03](22e7f03))
* filters not working in Shift Assignment Calendar view ([#30822](#30822)) ([3cdbb65](3cdbb65))
* Ignore custom field validation while setup ([ee54bf7](ee54bf7))
* **india:** e-invoice generation for registered composition gst category type ([#30814](#30814)) ([#30877](#30877)) ([246869d](246869d))
* Multi currency opening invoices ([2e62d51](2e62d51))
* payment days calculation for employees joining/leaving mid-month ([#30863](#30863)) ([#30883](#30883)) ([a1b0813](a1b0813))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([#30865](#30865)) ([5a5b49b](5a5b49b))
* **pos:** number pad translations ([b01f855](b01f855))
* **pos:** search field doesn't reset on checkout ([edbf551](edbf551))
* Supply type for overseas invoices with payment of tax ([fdcc591](fdcc591))
* supply type for sez invoices with payment of tax ([cf08710](cf08710))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](93482f3))
* **UX:** misleading stock entry lables ([#30870](#30870)) ([#30871](#30871)) ([57b03f0](57b03f0))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([#30846](#30846)) ([f7bf4a3](f7bf4a3))
* Vat Audit report fixes ([d5319a4](d5319a4))

### Features

* Copy task color from project template (backport [#30857](#30857)) ([#30859](#30859)) ([7ee18e8](7ee18e8))
* support product bundles in picklist (backport [#30762](#30762)) ([#30826](#30826)) ([645ee2d](645ee2d))

(cherry picked from commit 8cc2ea0)

# Conflicts:
#	erpnext/__init__.py
hrwX pushed a commit to hrwX/erpnext that referenced this pull request May 20, 2022
# [13.28.0](frappe/erpnext@v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](frappe@5df5058))
* convert default_item_manufacturer to link field ([frappe#30835](frappe#30835)) ([frappe#30866](frappe#30866)) ([37fad7e](frappe@37fad7e))
* Cost center filter on payment reconciliation ([22e7f03](frappe@22e7f03))
* filters not working in Shift Assignment Calendar view ([frappe#30822](frappe#30822)) ([3cdbb65](frappe@3cdbb65))
* Ignore custom field validation while setup ([ee54bf7](frappe@ee54bf7))
* **india:** e-invoice generation for registered composition gst category type ([frappe#30814](frappe#30814)) ([frappe#30877](frappe#30877)) ([246869d](frappe@246869d))
* Multi currency opening invoices ([2e62d51](frappe@2e62d51))
* payment days calculation for employees joining/leaving mid-month ([frappe#30863](frappe#30863)) ([frappe#30883](frappe#30883)) ([a1b0813](frappe@a1b0813))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([frappe#30865](frappe#30865)) ([5a5b49b](frappe@5a5b49b))
* **pos:** number pad translations ([b01f855](frappe@b01f855))
* **pos:** search field doesn't reset on checkout ([edbf551](frappe@edbf551))
* Supply type for overseas invoices with payment of tax ([fdcc591](frappe@fdcc591))
* supply type for sez invoices with payment of tax ([cf08710](frappe@cf08710))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](frappe@93482f3))
* **UX:** misleading stock entry lables ([frappe#30870](frappe#30870)) ([frappe#30871](frappe#30871)) ([57b03f0](frappe@57b03f0))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([frappe#30846](frappe#30846)) ([f7bf4a3](frappe@f7bf4a3))
* Vat Audit report fixes ([d5319a4](frappe@d5319a4))

### Features

* Copy task color from project template (backport [frappe#30857](frappe#30857)) ([frappe#30859](frappe#30859)) ([7ee18e8](frappe@7ee18e8))
* support product bundles in picklist (backport [frappe#30762](frappe#30762)) ([frappe#30826](frappe#30826)) ([645ee2d](frappe@645ee2d))

(cherry picked from commit 8cc2ea0)

# Conflicts:
#	erpnext/__init__.py
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants