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: Modified Number system for Nepal (backport #23613) #23634

Merged
merged 1 commit into from
Dec 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2023

This is an automatic backport of pull request #23613 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Update utils.js

Further refined number system for Nepal. Numbering in Nepal does not continue as 100 Crores/1000 Crores as in India, but it proceeds as:
-> 1 Arba  for 100 Crore
-> 1 Kharba for 100 Arba (10,000 Cr)

* Update number_systems.js

Added number system for Nepal.
 Numbering in Nepal does not continue as 100 Crores/1000 Crores as in India, but it proceeds as:
-> 1 Arba  for 100 Crore
-> 1 Kharba for 100 Arba (10,000 Cr)

* chore: simpler condition

* style: format

---------

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 8a2b940)
@mergify mergify bot requested review from a team and surajshetty3416 and removed request for a team December 6, 2023 09:52
@ankush ankush merged commit 29ef929 into version-15-hotfix Dec 6, 2023
16 of 20 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-23613 branch December 6, 2023 11:09
frappe-pr-bot pushed a commit that referenced this pull request Dec 12, 2023
# [15.5.0](v15.4.1...v15.5.0) (2023-12-12)

### Bug Fixes

* Add filter in Workspace Card Links Block (backport [#23578](#23578)) ([#23686](#23686)) ([8709738](8709738))
* Avoid duplicate contact names ([#23731](#23731)) ([#23734](#23734)) ([5fb8302](5fb8302))
* change webhook header types to small text ([#23722](#23722)) ([#23727](#23727)) ([b433165](b433165))
* Color indicator style ([709e6eb](709e6eb))
* correct error message ([#23746](#23746)) ([#23748](#23748)) ([4c7124c](4c7124c))
* Correct fallback for social login key ([045d059](045d059))
* ecsape search string ([#23717](#23717)) ([#23720](#23720)) ([d6fbdc9](d6fbdc9))
* escape username on avatar control ([#23713](#23713)) ([#23716](#23716)) ([980dae7](980dae7))
* get users for leaderboard ([#23740](#23740)) ([8234d79](8234d79))
* ignore duplicate contact creation ([#23423](#23423)) ([#23730](#23730)) ([cd50875](cd50875))
* ignore if controller doesn't have `get_list` attr ([#23736](#23736)) ([#23742](#23742)) ([0248c07](0248c07))
* Modified Number system for Nepal ([#23613](#23613)) ([#23634](#23634)) ([29ef929](29ef929))
* only update primary action if it is new action is provided ([0de2b28](0de2b28))
* pass filter to formatter to handle custom logic ([b6e53d4](b6e53d4))
* prioritize link_title if value != link_title ([4efd750](4efd750))
* remove redundant breadcrumbs ([#23653](#23653)) ([4be06db](4be06db))
* **Report View:** clear checked items ([049e066](049e066))
* **sentry:** set the user's name correctly ([859fd74](859fd74))
* set correct sentry tags ([cc04b63](cc04b63))
* Show server script name in traceback ([#23676](#23676)) ([132ac1d](132ac1d))
* undefined variable name fixed in dark.scss (backport [#23646](#23646)) ([#23695](#23695)) ([0fbe079](0fbe079))
* use encoded filename for arabic (latin) language while exporting ([82027ab](82027ab))
* **UX:** Add group by information in report view URLs ([#23547](#23547)) ([#23745](#23745)) ([07ade2c](07ade2c))
* **Virtual DocType:** don't call db get_value in link field validation ([#23620](#23620)) ([e019f13](e019f13))

### Features

* **minor:** child table field as standard filter in list view ([#23625](#23625)) ([ec7aedc](ec7aedc))

### Reverts

* Revert "feat: wkhtmltopdf logging (#19935)" ([52621d9](52621d9)), closes [#19935](#19935)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.5.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 27, 2023
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.

None yet

3 participants