fix: incorrect indicator title for portal sales order (#39247)
(cherry picked from commit 2d2ff7cf52)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: BOM replace tool does not update exploded items of root (#39244)
(cherry picked from commit 5e0d017497)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: don't set rate for non-stock item in Internal Transfer
(cherry picked from commit e1b0fffd0c)
* test: internal transfer for non-stock item
(cherry picked from commit 57b6a98703)
# Conflicts:
# erpnext/stock/doctype/delivery_note/test_delivery_note.py
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: Ignore UP on "allowed to transact with" (#39103)
If a customer is allowed to transact with some company it usually
doesn't imply that customer is somehow "linked with" that company.
(cherry picked from commit 6401908f41)
Co-authored-by: Ankush Menat <ankush@frappe.io>
'Budget' and 'Budget Account' doesn't have support for dynamic
dimension. It only supports hard-coded ones - Project and Cost Center
(cherry picked from commit 92bc962f60)
# Conflicts:
# erpnext/accounts/report/profitability_analysis/profitability_analysis.js
fix: take quantity into account when setting asset's gross purchase amt (#39056)
fix: take quantity into account when setting asset's gross purchase amount
(cherry picked from commit 0346f47c1d)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
* feat: fetch payments and journals
* refactor: use single qb query for PE and PI
* feat: fetch PE along with SI
* refactor: move repeating code to common controller
* fix: fetch cost center for PE
* feat: fetch JV with PE
* fix: validate party filter for fetching payments
* fix: linting issues
* refactor: use qb to fetch PE JV and Inv
* refactor: move fn to fetch advance taxes to utils & use qb
* fix: filtering through accounting dimensions
* chore: remove debugging print statements
* fix: modify rows and columns for ledger view
* refactor: filter accounting dimensions using qb
* fix: show additional table cols from india compliance api call
* chore: fix typo
* test: purchase register and ledger view
* fix: filter by party in opening row calculation
* fix: exclude cancelled gl entries for opening balance
* chore: change column format for report
* fix: check gl entry status using is_cancelled
* fix: running balance after sorting
* fix: gst itemised registers for india compliance api call
* fix: additional query cols for gst itemised registers
* fix: additional query cols for sales register
* fix: PE in sales register
* fix: tax accounts in sales register
* fix: Sales/Purchase register showing duplicate records
* fix: avoid fetching advance account for party
* refactor: remove unnecessary condition
* fix: remove checking for advance accounts in payments
---------
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: remove bad defaults (#38986)
Child tables can't have a default.
(cherry picked from commit b71b0d5997)
Co-authored-by: Ankush Menat <ankush@frappe.io>
* fix(Org Chart): check if company is set before loading children
* refactor: avoid assigning undefined values, use empty strings, null instead
* fix: returning to org chart view from employee master does not render chart
- the check for company field is truthy from the employee doctype, so it does not render company field again. Explicitly check for company field on the same page
* fix(Org Chart Mobile): check if company is set before loading children
* fix : correct logic for overlap error
* fix :
Updated as per lintels
* fix :
changes as per linters
* fix : correct logic for overlap error
fixing overlap error logic with taking care of sequential time job cards in overlap job card list
Added Provision if time_logs list is empty
* fix: min order qty optional in production plan (#38956)
* fix: min order qty optional in production plan
* fix: test cases
(cherry picked from commit b09c9354fb)
# Conflicts:
# erpnext/manufacturing/doctype/bom/bom.json
# erpnext/manufacturing/doctype/production_plan/production_plan.py
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix(ux): make PI Item rate field editable
(cherry picked from commit eb5bb9f9a9)
* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit cb9114442b)
* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit b1ba210332)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
