mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-21 10:19:57 +00:00
Resolve 4 conflicts from Phase 7 service/mapper extraction vs upstream: - asset.py: take extraction; repoint dangling make_asset_movement JS to mapper - job_card: port upstream field_no_map(naming_series) into mapper.make_subcontracting_po - sales_order: port upstream rows-index fix into mapper.make_delivery_note - sales_invoice (Phase 7): take service delegations; port upstream SQL->QB/ORM changes for get_warehouse, get_all_mode_of_payments, get_discounting_status, clear_unallocated_mode_of_payments, and set_pos_fields(POS DN skip) into services