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
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
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
venkat102
7bf1a39861
fix: update payment amount if automatically_fetch_payment_terms is enabled
2025-03-27 22:28:20 +05:30
Rohit Waghchaure
5af8378471
fix: valuation rate not updating for raw materials
2025-03-27 21:32:38 +05:30
Mihir Kandoi
036af54d54
refactor: split and clean execute function to be more readable
2025-03-27 21:10:03 +05:30
Mihir Kandoi
668fdc8f92
fix: remove incorrect default field
2025-03-27 20:56:05 +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
venkat102
35fbbc2057
fix: include auto_reconcile_vouchers flag in background job
2025-03-27 01:04:38 +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
Mihir Kandoi
26de902496
perf: take query out of loop
2025-03-26 14:39:45 +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
Dany Robert
d04dbd8ed9
fix: update posting date before running validations
2025-03-26 11:37:35 +05:30
rethik
31e59354c9
fix: use docstatus for status filter
2025-03-26 11:10:08 +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
