fix: Modified Number system for Nepal #23613
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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)
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)
ajiragroup
requested review from
a team and
shariquerik
and removed request for
a team
ankush
requested changes
Dec 5, 2023
ankush
reviewed
Dec 6, 2023
|
@ajiragroup please setup https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#linting to auto-format code |
ankush
changed the title
ankush
added
backport version-14-hotfix
mergify bot
pushed a commit
that referenced
this pull request
Dec 6, 2023
* 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 bot
pushed a commit
that referenced
this pull request
Dec 6, 2023
* 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)
This was referenced Dec 6, 2023
ankush
pushed a commit
that referenced
this pull request
Dec 6, 2023
* 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) Co-authored-by: ajiragroup <108009061+ajiragroup@users.noreply.github.com>
ankush
pushed a commit
that referenced
this pull request
Dec 6, 2023
* 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) Co-authored-by: ajiragroup <108009061+ajiragroup@users.noreply.github.com>
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
pushed a commit
that referenced
this pull request
Dec 12, 2023
# [14.59.0](v14.58.0...v14.59.0) (2023-12-12) ### Bug Fixes * Add filter in Workspace Card Links Block (backport [#23578](#23578)) ([#23685](#23685)) ([29bcf7b](29bcf7b)) * Avoid duplicate contact names ([#23731](#23731)) ([#23733](#23733)) ([78aecd7](78aecd7)) * correct error message ([#23746](#23746)) ([#23747](#23747)) ([7b608e2](7b608e2)) * dont stop next unattached file from being attached if file_url of first file is invalid ([e6dacf0](e6dacf0)) * dont stop next unattached file from being unattached ([394fd77](394fd77)) * ecsape search string ([#23717](#23717)) ([#23719](#23719)) ([6d670fd](6d670fd)) * escape username on avatar control ([#23713](#23713)) ([#23715](#23715)) ([2bc4261](2bc4261)) * german translations for navbar toggles (backport [#23478](#23478)) ([#23502](#23502)) ([da4606c](da4606c)) * get users for leaderboard ([#23739](#23739)) ([33b7066](33b7066)) * ignore if controller doesn't have `get_list` attr ([#23736](#23736)) ([#23741](#23741)) ([649876c](649876c)) * ignore rtlcss for cropperjs ([bf784f9](bf784f9)) * Modified Number system for Nepal ([#23613](#23613)) ([#23633](#23633)) ([fd6cc46](fd6cc46)) * only update primary action if it is new action is provided ([06f5611](06f5611)) * pass filter to formatter to handle custom logic ([eda3dd2](eda3dd2)) * prioritize link_title if value != link_title ([268a2d7](268a2d7)) * remove redundant breadcrumbs ([#23654](#23654)) ([0c4288d](0c4288d)) * **Report View:** clear checked items ([293cd3c](293cd3c)) * undefined variable name fixed in dark.scss (backport [#23646](#23646)) ([#23694](#23694)) ([c2daee6](c2daee6)) * use encoded filename for arabic (latin) language while exporting ([df165dd](df165dd)) * **Virtual DocType:** don't call db get_value in link field validation ([#23620](#23620)) ([1d240a2](1d240a2)) ### Features * add sender_name_field ([eec8e1e](eec8e1e)) * **minor:** child table field as standard filter in list view ([#23625](#23625)) ([40b32ab](40b32ab)) * **minor:** child table field as standard filter in list view (backport [#23625](#23625)) ([#23687](#23687)) ([7342b6d](7342b6d)) * set sender_name_field in reference doc ([5de64d8](5de64d8))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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)
Made changes in two files.