Raffael Meyer
7d12e9afd4
fix: make message translatable ( #46863 )
2025-04-05 15:56:33 +02:00
Frappe PR Bot
27deed6d94
fix: sync translations from crowdin ( #46858 )
...
* fix: Arabic translations
* fix: Hungarian translations
* fix: Polish translations
* fix: Russian translations
* fix: Swedish translations
* fix: Chinese Simplified translations
* fix: Bosnian translations
* fix: Esperanto translations
* fix: Portuguese, Brazilian translations
* fix: Thai translations
* fix: Croatian translations
2025-04-05 12:33:37 +02:00
ruthra kumar
ae1f6912f8
Merge pull request #46625 from Abdeali099/bank-transaction-entries
...
refactor: Update Bank Transaction `set_query` implemetation
2025-04-05 07:04:26 +05:30
Rohit Waghchaure
544ceb93cd
fix: stock entry repack amount calculation
2025-04-04 13:38:45 +05:30
Frappe PR Bot
89f58f7822
fix: sync translations from crowdin ( #46849 )
...
* fix: Spanish translations
* fix: French translations
* fix: Swedish translations
* fix: Turkish translations
* fix: Persian translations
* fix: Bosnian translations
* fix: German translations
* fix: Croatian translations
2025-04-04 00:45:09 +02:00
ruthra kumar
4cb6b70048
Merge pull request #46818 from cogk/fix-translate-unreconcile-dialog
...
fix: Translate UnReconcile dialog title
2025-04-03 06:51:59 +05:30
Md Hussain Nagaria
ef4f662c31
chore: update links to Frappe School ( #46823 )
2025-04-02 12:15:10 +05:30
rohitwaghchaure
7b5406b940
Merge pull request #46832 from rohitwaghchaure/fixed-support-33851-3
...
fix: set draft QC in purchase document on creation of qc
2025-04-01 19:46:36 +05:30
ljain112
038355f87b
fix: correct function name
2025-04-01 17:43:11 +05:30
ljain112
fca46e0b2d
fix: child values for tree doctypes and query refactor
2025-04-01 17:18:01 +05:30
Rohit Waghchaure
2553dea78e
fix: set draft QC in purchase document on creation of qc
2025-04-01 15:11:03 +05:30
Mihir Kandoi
22ffdb9e77
fix: remove all serial/batch fields when use button is unselected
2025-04-01 14:15:47 +05:30
rohitwaghchaure
8dae5047c2
Merge pull request #46831 from rohitwaghchaure/fixed-support-35187
...
fix: current batch qty showing zero in the stock reconciliation
2025-04-01 14:08:54 +05:30
Sagar Vora
db0c5ae48d
Merge pull request #46829 from vishakhdesai/gt-diff
...
fix: use `grand_total_diff` instead of `rounding_adjustment` in `taxes_and_totals`
2025-04-01 13:30:48 +05:30
Rohit Waghchaure
a5c62f8623
fix: current batch qty showing zero in the stock reconciliation
2025-04-01 13:15:06 +05:30
vishakhdesai
fd252da6b1
fix: use grand_total_diff instead of rounding_adjustment in taxes_and_totals
2025-04-01 12:43:34 +05:30
Diptanil Saha
5d5b6acc79
fix: pos checking opened entry closed or not ( #46726 )
...
* fix: pos checking opened entry closed or not
* fix: linter issue
* fix: linter issue
2025-04-01 12:40:47 +05:30
Abdeali Chharchhoda
4ae11d4384
chore: formatting
2025-04-01 12:12:37 +05:30
Abdeali Chharchhoda
fb054d4904
Merge branch 'develop' into bank-transaction-entries
2025-04-01 12:12:07 +05:30
rohitwaghchaure
63ef0a5a99
Merge pull request #46808 from rohitwaghchaure/fixed-support-34914
...
fix: condition to update the last purchase rate
2025-03-31 20:44:28 +05:30
ljain112
f49adfdd98
fix: removed customer_group query in customer.js
2025-03-31 18:06:33 +05:30
Corentin Forler
665645721b
fix: Fix fieldtype in UnReconcile dialog
2025-03-31 13:54:51 +02:00
Corentin Forler
f2cfb03c2c
fix: Translate UnReconcile dialog title
2025-03-31 13:51:47 +02:00
rohitwaghchaure
c7db13c275
Merge pull request #46815 from rohitwaghchaure/fixed-support-35177
...
feat: allow UOMs to select for which conversion rate defined in item
2025-03-31 16:22:17 +05:30
Rohit Waghchaure
b1dfbbe85e
feat: allow UOMs to select for which converstion rate defined in item master
2025-03-31 15:53:55 +05:30
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
Rohit Waghchaure
bad901e7da
fix: condition to update the last puurchase rate
2025-03-31 14:23:47 +05:30
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
ljain112
aadda9f606
fix: update outstanding with precision
2025-03-31 12:37:28 +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
iamkhanraheel
19279dffea
fix: change cur_frm to frm
2025-03-29 16:41:28 +05:30
Sugesh393
a393195866
test: add unit test to validate tax values in Purchase Order from Sales Order
2025-03-29 15:35:01 +05:30
Sugesh393
1e18569be7
fix: map tax table while creating purchase order from sales order
2025-03-29 15:34:22 +05:30
MohsinAli
732e950265
fix: correct mapping(schedule_date) sales order to material request
2025-03-29 11:03:24 +05:30
iamkhanraheel
4284701442
refactor: remove print func
2025-03-29 06:15:22 +05:30
iamkhanraheel
3a4ba0c790
fix: fetch customer related data in making payment entry from customer
2025-03-29 03:59:57 +05:30
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
Corentin Forler
bb864c8345
feat: Show past events and todos in crm_activities
2025-03-28 14:07:45 +01:00
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
ljain112
c2bdd30e6d
fix: correct outstanding amount for invoice in dunning
2025-03-28 13:26:28 +05:30
Rohit Waghchaure
e6ff7f0e9f
fix: for deadlock issue keep status as In Progress
2025-03-28 13:10:12 +05:30
