Vishakh Desai
3a9dca0563
Merge pull request #46812 from vishakhdesai/fix-taxes-and-totals
...
fix: revert resetting `rounding_adjustment`
2025-03-31 10:23:13 +00:00
Vishakh Desai
f25bf6dbd2
fix: improved rounding adjustment when applying discount ( #46720 )
...
* fix: rounding adjustment in apply_discount_amount taxes_and_totals
* refactor: minor changes
* fix: set the rounding difference while calculating tax total in the last tax row and add test case
* fix: failing test case
* fix: made changes in get_total_for_discount_amount in taxes_and_totals
* fix: failing test cases
* fix: changes as per review
* refactor: remove unnecessary use of flt
* refactor: improve logic
* refactor: minor change
* refactor: minor changes
* fix: add a test case for applying discount with previous row total in taxes
* fix: failing test case
* refactor: flatter code, remove `flt` usage for accuracy
---------
Co-authored-by: Sagar Vora <sagar@resilient.tech >
2025-03-31 09:25:09 +00:00
rohitwaghchaure
1e780945e8
Merge pull request #46806 from rohitwaghchaure/fixed-suupport-35020
...
feat: option to recreate Stock Ledger Entries against stock transactions
2025-03-31 14:13:35 +05:30
Marc Ramser
21b8ad6aa5
feat(regional): Address Template for Germany & Add Switzerland Template ( #46737 )
...
* Add Address template for Switzerland
* Fix address template for germany
If an ERPNext instance is set to German and used by a business outside Germany (e.g., in Switzerland or Austria), customer addresses in Germany are displayed in their national format. However, for postal services, the international format (including the country) is required.".
This is just a workaround. IMHO the correct fix would be to check where the company is located and based on that use the national or the international template.
2025-03-31 10:32:36 +02:00
Rohit Waghchaure
218dbd6911
feat: option to recreate Stock Ledger Entries against stock transactions
2025-03-31 13:48:21 +05:30
Vishakh Desai
646cf54679
fix: multiple Bank Reconciliation Tool issues ( #46644 )
...
* fix: bank reconciliation tool issue
* refactor: separate Bank Transaction linking from other logic
* fix: delink old pe on update_after_submit in bank transaction
* fix: failing test case fixed
* fix: changes as per review
* refactor: rename `gles` to `gl_entries`
---------
Co-authored-by: Sagar Vora <sagar@resilient.tech >
2025-03-31 05:55:41 +00:00
rohitwaghchaure
9aff191bb1
Merge pull request #46801 from rohitwaghchaure/fixed-ux-for-job-card
...
fix: UX for partial job card completion
2025-03-30 22:51:30 +05:30
Rohit Waghchaure
8e8a724d82
fix: UX for partial job card completion
2025-03-30 19:01:15 +05:30
Frappe PR Bot
6df932f789
chore: update POT file ( #46798 )
2025-03-30 13:25:09 +02:00
rohitwaghchaure
f55e8d1f4a
Merge pull request #46777 from rohitwaghchaure/fixed-support-33851-1
...
fix: incorrect condition
2025-03-28 23:48:07 +05:30
rohitwaghchaure
b93957197e
Merge pull request #46775 from rohitwaghchaure/fixed-support-34440
...
fix: for deadlock issue keep status as In Progress
2025-03-28 23:45:25 +05:30
rohitwaghchaure
dc75a385b7
Merge pull request #46760 from rohitwaghchaure/fixed-support-29324
...
fix: valuation rate not updating for raw materials
2025-03-28 23:44:42 +05:30
Rohit Waghchaure
0c1a8e9c58
fix: incorrect condition
2025-03-28 23:43:25 +05:30
Abdeali Chharchhodawala
8c9d630ee4
Merge pull request #46683 from Abdeali099/set-employee-contact-details
...
fix: Set complete contact details for `Employee` in PE
2025-03-28 18:17:47 +05:30
Rohit Waghchaure
e6ff7f0e9f
fix: for deadlock issue keep status as In Progress
2025-03-28 13:10:12 +05:30
Diptanil Saha
45b45efee5
fix: pos button and on hover color ( #46762 )
...
* fix: pos button and on hover color
Changed the POS 'New Order' button color to frappe's color scheme and fixed the on hover text color on 'Toggle Recent Orders'
* fix: on hover text unreadable in dark mode
2025-03-28 08:54:51 +05:30
Rohit Waghchaure
5af8378471
fix: valuation rate not updating for raw materials
2025-03-27 21:32:38 +05:30
ruthra kumar
11800e3cd8
Merge pull request #46719 from ljain112/fix-val-contact
...
fix: do not use self object for setting party and party type
2025-03-27 11:07:41 +05:30
rohitwaghchaure
6275b236ee
Merge pull request #46739 from rohitwaghchaure/fixed-support-34851
...
fix: slow query
2025-03-26 22:08:53 +05:30
Rohit Waghchaure
5ddb36af87
fix: slow query
2025-03-26 21:50:18 +05:30
Frappe PR Bot
d35ae3ef5e
fix: sync translations from crowdin ( #46738 )
...
* fix: French translations
* fix: Chinese Simplified translations
2025-03-26 16:43:53 +01:00
rohitwaghchaure
b9d70e2ea4
Merge pull request #46732 from rohitwaghchaure/fixed-job-card-hours-issue
...
fix: not able to set hours manually in job card
2025-03-26 15:54:31 +05:30
rohitwaghchaure
cf2d67f145
Merge pull request #46733 from rohitwaghchaure/fixed-support-34788
...
fix: decimal values causing incorrect batch picking
2025-03-26 15:42:47 +05:30
Rohit Waghchaure
338b09debb
fix: not able to set hours manually in job card
2025-03-26 15:38:44 +05:30
Rohit Waghchaure
7bfe703b04
fix: decimal values causing incorrect batch picking
2025-03-26 15:20:21 +05:30
rohitwaghchaure
1d8c252ee7
Merge pull request #46710 from rohitwaghchaure/fixed-support-34516
...
fix: expense account in the stock entry
2025-03-26 11:59:14 +05:30
Frappe PR Bot
9d2f9ad4c0
fix: sync translations from crowdin ( #46724 )
...
* fix: Swedish translations
* fix: Chinese Simplified translations
2025-03-25 18:21:18 +01:00
ljain112
80b746d4dd
fix: do not use self object for setting party and party type
2025-03-25 17:51:41 +05:30
rohitwaghchaure
e2412072d9
Merge pull request #46718 from rohitwaghchaure/fixed-github-46708
...
fix: disable use multi level BOM for track Semi Finished Goods
2025-03-25 17:29:08 +05:30
Rohit Waghchaure
bf3b0d607f
fix: disable use multi level BOM for track Semi Finished Goods
2025-03-25 17:24:48 +05:30
ruthra kumar
435bb1c7b0
Merge pull request #46616 from ljain112/conversion-rate
...
fix: do not validate if conversion rate is 1 for different currency
2025-03-25 14:11:21 +05:30
Rohit Waghchaure
89569d4b32
fix: expense account in the stock entry
2025-03-25 13:41:27 +05:30
ruthra kumar
a88259591b
Merge pull request #46617 from ljain112/fix-ui-sales
...
refactor: removed redundant message display for each item row cost center update
2025-03-25 12:15:43 +05:30
ruthra kumar
a8ed8b26f1
Merge pull request #46622 from ljain112/feat-pr-acc-repost
...
feat: repost accounting ledger for purchase receipt
2025-03-25 11:48:33 +05:30
Frappe PR Bot
9af130598a
fix: sync translations from crowdin ( #46698 )
...
* fix: French translations
* fix: Spanish translations
* fix: Arabic translations
* fix: Hungarian translations
* fix: Polish translations
* fix: Russian translations
* fix: Swedish translations
* fix: Turkish translations
* fix: Chinese Simplified translations
* fix: Persian translations
* fix: Bosnian translations
* fix: German translations
* fix: Esperanto translations
* fix: Portuguese, Brazilian translations
* fix: Thai translations
* fix: Croatian translations
2025-03-24 16:54:40 +01:00
Raffael Meyer
eb350012b0
ci: apply label "skip-release-notes" based on PR title ( #46694 )
...
Workflow copied from frappe/frappe
2025-03-24 15:22:17 +00:00
Raffael Meyer
70d9db7557
ci: invert language mapping ( #46693 )
...
* ci: invert language mapping
* ci: add skip-release-notes on crowdin PRs
2025-03-24 16:17:51 +01:00
barredterra
56a0c4642f
ci: add skip-release-notes on crowdin PRs
2025-03-24 16:05:13 +01:00
barredterra
41f2b136d5
ci: invert language mapping
2025-03-24 16:04:17 +01:00
Raffael Meyer
9a8f0f3aef
ci: fix language code mapping ( #46692 )
...
* ci: fix language code mapping
Keys are expected to be not the locale_with_underscore but the codes according to https://support.crowdin.com/developer/language-codes/
* chore: remove redundant translation files
2025-03-24 13:35:35 +00:00
Sagar Vora
d35a533d8b
Merge pull request #46669 from vishakhdesai/bank-clearance-fix
...
fix: don't filter payment entries on Bank Account in Payment Clearance
2025-03-24 17:49:02 +05:30
ruthra kumar
ea224e131c
Merge pull request #46577 from ljain112/jv-ccl
...
fix: customer credit limit check based on `bypass_credit_limit_check` in Journal Entry
2025-03-24 13:30:42 +05:30
ruthra kumar
8f647b4172
Merge pull request #46574 from ljain112/fix-order-payment-reco
...
fix: correct invoice order in payment reconcillaiton
2025-03-24 12:23:22 +05:30
ruthra kumar
9c82f4bb0f
Merge pull request #46440 from aerele/payable-receivable-report
...
fix: add base_outstanding and base_paid_amount in payment schedule table
2025-03-24 11:43:57 +05:30
vishakhdesai
fa2fd5bf88
fix: don't filter payment entries on Bank Account in Payment Clearance
2025-03-24 11:23:53 +05:30
ruthra kumar
eda0e2152d
Merge pull request #46569 from barredterra/language_map
...
ci: configure language mapping for crowdin
2025-03-24 10:39:34 +05:30
ruthra kumar
becb53ba5d
Merge pull request #46518 from barredterra/so-set-deliver_date
...
fix(Sales Order): make `set_missing_values` set delivery date in item rows
2025-03-24 10:09:40 +05:30
ruthra kumar
03fde2c039
Merge pull request #46386 from FHenry/dev_whitelist_getchart
...
feat(accounting/regional): allow chart_of_account.get_chart to be whilelist
2025-03-24 09:59:07 +05:30
Khushi Rawat
eec2e7e833
fix: correct accumulated depreciation calculation for disposed assets ( #46660 )
2025-03-23 18:38:06 +05:30
Frappe PR Bot
93bd9a40cd
chore: update POT file ( #46659 )
2025-03-23 11:05:00 +01:00
