* fix: incorrect calculation in get_range_age
* fix: remove serial numbers not in stock from fifo_queue
* refactor: make serial_no condition explicit
* refactor: reduce code duplication
Co-authored-by: Dany Robert <rtdany10@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 5fd04101d4)
* feat: (consistency) Add Primary Address and Contact section in Supplier
- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry
* fix: Popup stale build and data consistency
- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry) in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)
* fix: Indentation and removed f-strings
- Sider: fixed indentation in js
- Dont use f-strings in queries
* feat(healthcare): Added Treatment Plan Template feature (#26557)
* feat: Added doctypes for treatment plan template
* feat: Added child doctype
* feat: Added validations for patient age
* chore: Clean up treatment plan template
* fix: Limit plan items to templates
* Added multiselectdialogbox for treatment plan template
* Add template name as autoname
* Clean up code
* Cleanup lint issues
* Clean up code
* Added tests for tpt filters
* Added test records
* Fix order of fields
* Added tests for care plan template
* Added age property for patient
* Clean up code
* Clean up list view
* Clean up code
* Fix lint issues
* Clean up test records
* Code cleanup
no-docs
* chore: Code cleanup
* chore: Use ORM instead of raw sql
* fix: Make treatment plan item fields mandatory
* fix: Added healthcare roles in permissions rules
* fix: Added filters for symptoms, diagnosis
* fix: Show applicable treatment plans button only if patient is present
* fix: Fix key error issues
* fix: Fix issues with filters in plan templates
* chore: Fix age filters
* refactor: appending treatment plan items
* fix: treatment plan test
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit f1b77360ee)
# Conflicts:
# erpnext/healthcare/doctype/patient/patient.py
* chore: Fix merge conflicts
Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
* fix: operation time auto set to zero (#27188)
(cherry picked from commit e6799d78ef)
# Conflicts:
# erpnext/patches.txt
* Update patches.txt
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* chore: remove deprecated and empty QUnit tests
* ci: fix UI test config
Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
(cherry picked from commit ae55eab599)
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
* fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
* fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset
* fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets
* fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset
* fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
* fix(Sales Invoice): Reset disposal_date on returning the Asset
* fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain
* fix: Make functions more readable
* fix: Let create_item() make items that are fixed assets
* fix: Test GL Entries made when an Asset is returned
* fix: Create asset data
* fix: Test
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
* fix: cannot reconcile bank transactions against internal transfer payment entries (#26932)
* fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled
* fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction
* fix: indentation and args
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 842ceb1301)
# Conflicts:
# erpnext/patches.txt
* fix: merge conflict
* fixed patches
Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* refactor: bom recursion checking
* fix: dont allow bom recursion
if same item_code is added in child items at any level, it shouldn't be allowed.
* test: add test for bom recursion
* test: fix broken prodplan test using recursive bom
* test: fix recursive bom in tests
(cherry picked from commit c07dce940e)
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
* test: negative stock validation on SR cancel
* fix: negative stock setting ignored in stock reco
In stock reconcilation cancellation negative stock setting is ignored as
`db.get_value` is returning string `'0'` which is not casted to int/bool
for further logic. This causes negative qty, which evantually gets
caught by reposting but by design this should stop cancellation.
* test: typo and minor refactor
(cherry picked from commit e7109c18db)
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
* fix: Fee Validity fixes (#27156)
* chore: update Fee Validity form labels
* fix: first appointment should not be considered for Fee Validity
* fix: Fee Validity test cases
* fix: appointment test case
(cherry picked from commit 642b4c805c)
* fix: overlapping appointments
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
* fix: Dont create inward SLE against SI unless is internal customer enabled
- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal
* test: Use internal customer for delivery of bundle items to target warehouse
- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
(cherry picked from commit f4dc9ee2aa)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
