file name is actually reversed.
In [1]: from premailer import Premailer
...:
...: from frappe.utils.jinja_globals import bundled_asset
...:
...: # get email css files from hooks
...: css_files = frappe.get_hooks("email_css")
...: css_files = [frappe.utils.jinja_globals.bundled_asset(path) for path in
...: css_files]
...: css_files = [path.lstrip("/") for path in css_files]
In [2]: css_files
Out[2]:
['assets/frappe/dist/css/email.bundle.ELTO33N3.css',
'email_erpnext.bundle.css',
'assets/css/email.css']
In [3]: css_files = [css_file for css_file in css_files if os.path.exists(os.pat
...: h.abspath(css_file))]
In [4]: css_files
Out[4]: ['assets/frappe/dist/css/email.bundle.ELTO33N3.css', 'assets/css/email.css']
'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>
fix: reposting not fixing valuation rate for sales return using movin… (#38895)
fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe96)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: allow to set rate manually for service item in BOM (#38880)
(cherry picked from commit c2f692a4e4)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
