Jalali period #43498
Closed
Jalali period #43498
+10,447
−6,005
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
ahmadsmdn
commented
Oct 4, 2024
ahmadsmdn
commented
…otfix/pr-37845 chore: add std permissions for Process Payment Reconciilation log (copy frappe#37845)
(cherry picked from commit 0104897)
…kport frappe#37826) (frappe#37855) fix: standard submit perm in repost ledger for editable invoices (frappe#37826) * fix: ignore perm while reposting ledger * fix: use flag in save * fix: remove unnecessary save (cherry picked from commit 1b808e1) Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
…fix/pr-37849 fix: remove voucher type and no for Item and Warehouse based reposting (backport frappe#37849)
…appe#37863) fix: Add index to supplier invoice field (frappe#37861) * fix: Add index to supplier invoice field * chore: remove unintetional changes (cherry picked from commit c37e374) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…appe#37842) * fix: `TypeError` in PR for non-stock item (cherry picked from commit 028b3e2) # Conflicts: # erpnext/stock/doctype/purchase_receipt/purchase_receipt.py * chore: `conflicts` --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit 23beb46)
…fix/pr-37869 refactor: 'group only by voucher' flag in AR/AP report (backport frappe#37869)
(cherry picked from commit 539f025)
(cherry picked from commit 639f427)
…fix/pr-37852 refactor: better ledger comparision report (backport frappe#37852)
…backport frappe#37864) (frappe#37871) fix: permission error while creating Supplier Quotation from Portal (cherry picked from commit e019d43) Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
… (frappe#37883) perf: index return against for purchase invoice (frappe#37881) (cherry picked from commit 469ae2c) Co-authored-by: Ankush Menat <ankush@frappe.io>
…d_on_num_days_in_month [dev] (backport frappe#37893) (frappe#37896) chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (frappe#37893) * chore: rename daily_depreciation to depreciation_based_on_num_days_in_month * chore: add patch * chore: remove unnecessary files * chore: add amount in field name * chore: add amount in label (cherry picked from commit 568d5bf) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
…_prorata_based [dev] (copy frappe#37897) (frappe#37899) chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based (cherry picked from commit 7c49b27) Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
(cherry picked from commit f14d1eb)
…ckport frappe#37754) (frappe#37906) * fix: consider reserved serial nos while cancelling a stock transaction (cherry picked from commit d9e2843) * fix: consider reserved batches while cancelling a stock transaction (cherry picked from commit e1a87a8) * feat: add field `reserved_stock` in Bin (cherry picked from commit 98d6cdd) * feat: maintain `Reserved Stock` in Bin (cherry picked from commit f52916a) * fix: consider reserved stock while cancelling a stock transaction (cherry picked from commit 73b65ac) * fix(test): `test_stock_reservation_against_sales_order` (cherry picked from commit 1024223) * chore: patch to set reserved stock in Bin (cherry picked from commit 1f88b1e) * fix: qty based check for stock reservation of serial-batch items based on qty (cherry picked from commit 9231706) * test: add test case for stock stock reservation (cherry picked from commit 54b323e) --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
… to case sensitivity (backport frappe#37499) (frappe#37917) fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (frappe#37499) * fix: account for case-insensitive database primary key for parameter names * chore: linting (cherry picked from commit b099590) Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
fix: list index out of range (frappe#37890) * fix: list index out of range * fix: solve linter test failing (cherry picked from commit e5bc8fc) Co-authored-by: viralkansodiya15 <98073516+viralpatel15@users.noreply.github.com>
fix: POS change amount gl entry with no amount (frappe#37799) (cherry picked from commit 2b02ef0) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit a3191f1)
(cherry picked from commit 0c5bdbd)
…fix/pr-37879 refactor: flag to toggle billed amy update in DN for Credit Note (backport frappe#37879)
) (frappe#37927) feat: reserved production plan sub assembly items (frappe#37884) (cherry picked from commit 34d3eb8) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
…et in PO (backport frappe#37928) (frappe#37937) fix: make `Material Request Item` required if `Material Request` is set in PO (cherry picked from commit a9d9118) Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
…backport frappe#37935) (frappe#37941) * fix: don't reset rate if greater than zero in standalone debit note (cherry picked from commit 5cce522) * fix(test): `test_gl_entries_for_standalone_debit_note` (cherry picked from commit f9fc6c9) --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
…rappe#37944) * fix: link between parent and child procedure (cherry picked from commit 05f24ed) * chore: add missing filters for `Parent Procedure` (cherry picked from commit 8fbd4ce) * test: add test case for Quality Procedure` (cherry picked from commit 30c6b83) --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: add translation wrapper (cherry picked from commit 8722318) Co-authored-by: hyaray <hyaray@vip.qq.com>
(cherry picked from commit 67e74d0)
(cherry picked from commit 23b0b8b)
…fix/pr-38398 fix(CRM): create contact if existing customer doesn't have contact (backport frappe#38398)
fix: no fstring in translation (frappe#38381) (cherry picked from commit 8f00481) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
chore: release v15
# [15.4.0](frappe/erpnext@v15.3.0...v15.4.0) (2023-11-28) ### Bug Fixes * allow on submit for child table fields ([ac7615a](frappe@ac7615a)) * annual income and expenses in digest ([ca2ad17](frappe@ca2ad17)) * check reposting settings before allowing editable si ([25bf475](frappe@25bf475)) * condition in other bundle utils ([e4d9ef1](frappe@e4d9ef1)) * create contact if existing customer doesn't have contact ([b1b065d](frappe@b1b065d)) * display all item rate stop messages (backport [frappe#38289](frappe#38289)) ([frappe#38307](frappe#38307)) ([99c1fbf](frappe@99c1fbf)) * do not set repost flag without validating voucher ([6a3c3b4](frappe@6a3c3b4)) * don't depreciate assets with no schedule on scrapping (backport [frappe#38276](frappe#38276)) ([frappe#38293](frappe#38293)) ([18613c5](frappe@18613c5)) * filter bundle items based on disabled check ([fb517e8](frappe@fb517e8)) * fiscal year using future date ([b9a1fac](frappe@b9a1fac)) * has_product_bundle util to only check for enabled bundles ([5c12872](frappe@5c12872)) * job card overlap validation (backport [frappe#38345](frappe#38345)) ([frappe#38348](frappe#38348)) ([d6fe7eb](frappe@d6fe7eb)) * make parameters of `create_subscription_process` optional (and other minor fixes) ([frappe#38360](frappe#38360)) ([721b429](frappe@721b429)) * Negative Qty and Rates in SO/PO (backport [frappe#38252](frappe#38252)) ([frappe#38357](frappe#38357)) ([14174df](frappe@14174df)) * no fstring in translation (backport [frappe#38381](frappe#38381)) ([frappe#38387](frappe#38387)) ([c101855](frappe@c101855)) * patch - Duplicate entry quality inspection parameter (backport [frappe#38262](frappe#38262)) ([frappe#38264](frappe#38264)) ([4c9890a](frappe@4c9890a)) * Payment Reco Issue and chart of account importer ([4699887](frappe@4699887)) * serial no status (backport [frappe#38391](frappe#38391)) ([frappe#38397](frappe#38397)) ([b65c225](frappe@b65c225)) * Server Error while creating Product Bundle (backport [frappe#38377](frappe#38377)) ([frappe#38380](frappe#38380)) ([922aef6](frappe@922aef6)) * skip disabled bundles for non-report utils ([3d46b32](frappe@3d46b32)) * skip fixed assets in parent ([314a91a](frappe@314a91a)) * Supplier `Primary Contact` (backport [frappe#38268](frappe#38268)) ([frappe#38286](frappe#38286)) ([37d1f1a](frappe@37d1f1a)) * **ux:** Sales Order Stock Reservation Dialog (backport [frappe#38261](frappe#38261)) ([frappe#38344](frappe#38344)) ([3cbe599](frappe@3cbe599)) * validation for existing bundles ([c0de9c0](frappe@c0de9c0)) ### Features * add Bank Transaction to connections in Journal and Payment Entry (backport [frappe#38297](frappe#38297)) ([frappe#38301](frappe#38301)) ([72647b8](frappe@72647b8)) * add disabled field in product bundle ([fcd53be](frappe@fcd53be)) * new Report "Lost Quotations" ([frappe#38309](frappe#38309)) ([ea2c348](frappe@ea2c348)) ### Performance Improvements * optimize total_purchase_cost update ([deed9f5](frappe@deed9f5))
…applying it to different reports
ahmadsmdn
requested review from
deepeshgarg007,
rohitwaghchaure,
s-aga-r and
ruthra-kumar
as code owners
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.