Commit Graph

50842 Commits

Author SHA1 Message Date
Deepesh Garg
ed231abb54 fix: Ledger repost support for extending app doctypes 2024-12-19 17:06:54 +05:30
rohitwaghchaure
024c442087 fix: not able to make PO for returned qty from material request (#44540) 2024-12-05 15:29:34 +05:30
rohitwaghchaure
7249cf0001 fix: update qty in SABB if qty changed in stock reco (#44542) 2024-12-05 15:28:38 +05:30
Khushi Rawat
322c788760 Merge pull request #44537 from mahsem/patch-9
fix: add title for translation in  asset.js
2024-12-05 15:12:39 +05:30
mahsem
61439132a4 fix: add title for translation in asset.js 2024-12-05 08:37:43 +01:00
rohitwaghchaure
14f2b0ab0e fix: consider zero valuation rate for serial nos (#44532) 2024-12-05 12:50:27 +05:30
rohitwaghchaure
5413cf9f1f fix: incorrect stock UOM for BOM raw materials (#44528)
fix: incorrect stock uom for BOM raw materials
2024-12-05 11:00:11 +05:30
ruthra kumar
707d8eddc5 Merge pull request #44503 from mahsem/patch-7
fix: add strings for translation in pos_item_cart.js
2024-12-05 10:18:10 +05:30
ruthra kumar
abd2314894 Merge pull request #44511 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-05 10:13:24 +05:30
ruthra kumar
fb5cbc43a2 Merge pull request #44512 from mahsem/patch-8
fix: add label strings for translation in pos_controller.js
2024-12-05 10:11:40 +05:30
ruthra kumar
31efaf6dbf chore: linter fix 2024-12-05 10:10:34 +05:30
ruthra kumar
2f38390b48 Merge pull request #44501 from mahsem/patch-5
fix: strings for translation in pos_past_order_summary.js
2024-12-05 10:00:17 +05:30
mahsem
138ffc4e93 refactor: translatable label on pos payments (#42081)
* Use better description in pos_payment.js 

Use Change Amount instead of Change and To Be Paid in pos_payment.js and be consistent with other strings

* change_amount_pos_payment.js
2024-12-05 09:59:43 +05:30
ruthra kumar
ba8ba79335 Merge pull request #44500 from mahsem/patch-4
fix: add labels for translation in sales_order.js
2024-12-05 09:58:05 +05:30
rohitwaghchaure
353610ce61 fix: inv dimensions fields not creating for standard doctype (#44504) 2024-12-04 21:26:15 +05:30
mahsem
bd77a5557d fix: add label strings for translation in pos_controller.js 2024-12-04 15:40:55 +01:00
Frappe PR Bot
163ff71ece fix: Persian translations 2024-12-04 19:48:36 +05:30
Frappe PR Bot
6a9a4f10f0 fix: Turkish translations 2024-12-04 19:48:28 +05:30
Frappe PR Bot
663b66ca1d fix: Swedish translations 2024-12-04 19:48:24 +05:30
David Arnold
029dc948fe fix: client-side taxes calculation (#44510)
closes: #44328
2024-12-04 13:08:50 +00:00
rohitwaghchaure
4001166ecc fix: required by date in the reorder material request (#44497) 2024-12-04 17:45:07 +05:30
rohitwaghchaure
b4534e56e4 fix: duplicate required items in the CSV (#44498) 2024-12-04 17:43:51 +05:30
mahsem
4b72b60f1a fix: add strings for translation in pos_item_cart.js 2024-12-04 10:12:34 +01:00
mahsem
23c846d4b9 fix: strings for translation in pos_past_order_summary.js 2024-12-04 09:07:09 +01:00
mahsem
d544328ffe fix: add labels for translation in sales_order.js 2024-12-04 08:58:16 +01:00
mahsem
6585fabdb1 fix: add strings for translation in timesheet.js (#44496) 2024-12-04 13:05:48 +05:30
ruthra kumar
e6be1021f9 Merge pull request #44453 from n-traore/vf_ohada_charts_accounts
feat: Create Syscohada charts of accounts
2024-12-04 11:44:05 +05:30
Frappe PR Bot
f74c99be9d fix: sync translations from crowdin (#44486)
fix: Turkish translations
2024-12-03 21:09:01 +01:00
Raffael Meyer
032ef62b14 fix: if-block + indentation (#44494) 2024-12-03 20:06:50 +00:00
Raffael Meyer
657c85638c fix: get value from dict (#44492)
`doc.taxes` is not always a `frappe._dict`, it can also be a regular `dict`. Resolves #44328
2024-12-03 19:03:57 +00:00
ruthra kumar
483fd124fc Merge pull request #44339 from vishakhdesai/hd-ticket-20084
fix: move `validate_total_debit_and_credit` from`validate` to`on_submit` in Journal Entry
2024-12-03 18:08:59 +05:30
ruthra kumar
c3ace82db8 refactor: validate debit and credit on before_submit 2024-12-03 17:42:11 +05:30
ruthra kumar
88b0af1696 Merge pull request #44467 from ljain112/fix-multi-gp
fix: Multiple Fixes in Gross Profit Report
2024-12-03 17:29:31 +05:30
ruthra kumar
fc0122ce76 chore: fix typo 2024-12-03 15:39:30 +05:30
ruthra kumar
d0c522ee46 Merge pull request #44450 from aerele/payment-request-partial-payment-pr
fix: calculate submitted payment entry amount for grand total
2024-12-03 14:51:47 +05:30
ruthra kumar
f11eab06c3 Merge pull request #44415 from ljain112/fix-incoming-rate
fix: adjusted incoming rate for zero rated item in purchase receipt
2024-12-03 14:24:33 +05:30
ruthra kumar
9bbb953e26 Merge pull request #44373 from Ninad1306/valuation_rate_fix
fix: Always Calculate `sales_incoming_rate` for Internal Transfers
2024-12-03 14:17:04 +05:30
ruthra kumar
f21283d829 Merge pull request #44470 from ruthra-kumar/rearrange_fields_in_company
refactor(UI): Rearranging fields under new sections
2024-12-03 10:29:25 +05:30
ruthra kumar
94de5c4e7e Merge pull request #44473 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-03 10:16:39 +05:30
Frappe PR Bot
dc645b3906 fix: Persian translations 2024-12-02 17:26:34 +05:30
Frappe PR Bot
f758dfcbe1 fix: Swedish translations 2024-12-02 17:26:22 +05:30
Frappe PR Bot
fdfd51c0fd fix: Spanish translations 2024-12-02 17:26:07 +05:30
ruthra kumar
7244754d28 refactor(UI): Rearranging fields under new sections 2024-12-02 15:37:38 +05:30
ljain112
4e6a5893e7 fix: correct buying amount for product bundel 2024-12-02 15:20:20 +05:30
Sagar Vora
7cc111f790 fix: set correct unallocated amount in Payment Entry (#43958)
* fix: set correct unallocated amount in Payment Entry

* fix: add checkbox and other logic fix

* fix: patch to set is_exchange_gain_loss in Payment Entry deductions

* fix: consider deductions except exch. gain/loss

* fix: set exchange gain loss in payment entry

* fix: separate function to set exchange gain loss

* fix: failing test cases

* fix: add cash disc. row first

* fix: review changes

* fix: changes as per review

* fix: failing test cases

* fix: review

* fix: wait for request to complete before updating exchange gain loss

* fix: review

---------

Co-authored-by: vishakhdesai <vishakhdesai@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2024-12-02 14:54:29 +05:30
rohitwaghchaure
7de9c14a2c fix: incorrect Gross Margin on project (#44461) 2024-12-02 14:22:41 +05:30
ljain112
a86b223aed fix: remove queries 2024-12-02 14:08:21 +05:30
ruthra kumar
810a2c8fc1 Merge pull request #44412 from ljain112/fix-common-party
fix: handle multi currency in common party journal entry
2024-12-02 12:38:34 +05:30
ruthra kumar
6b6798bee6 Merge pull request #44437 from Abdeali099/report-data-trnslation
fix: Added translation for `Account` column
2024-12-02 12:22:38 +05:30
Abdeali Chharchhoda
e355b18c0c Merge branch 'develop' into report-data-trnslation 2024-12-02 11:33:00 +05:30