mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-02 08:03:21 +00:00
* feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase (cherry picked from commit61eb9b6c68) * to enable selection of SO irrespective of customer,removed validation for customer (cherry picked from commit466df6bdb7) * fixed spacings (cherry picked from commitf33a725a9e) * added new field - Picked Qty, in Sales Order Item (cherry picked from commita68213d82e) * Added new field in SO - % Picked (cherry picked from commit9f7fee7a4f) * removed semicolon for break statement (cherry picked from commite970616b51) * as per review comments - changed for loop (cherry picked from commit0211f27e83) * corrected spacing (cherry picked from commita12895ec03) Co-authored-by: Krithi Ramani <krithi.ramani@gmail.com>
This commit is contained in:
@@ -130,6 +130,7 @@
|
||||
"per_delivered",
|
||||
"column_break_81",
|
||||
"per_billed",
|
||||
"per_picked",
|
||||
"billing_status",
|
||||
"sales_team_section_break",
|
||||
"sales_partner",
|
||||
@@ -1514,13 +1515,19 @@
|
||||
"fieldtype": "Currency",
|
||||
"label": "Amount Eligible for Commission",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "per_picked",
|
||||
"fieldtype": "Percent",
|
||||
"label": "% Picked",
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"icon": "fa fa-file-text",
|
||||
"idx": 105,
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2021-10-05 12:16:40.775704",
|
||||
"modified": "2022-03-15 21:38:31.437586",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Selling",
|
||||
"name": "Sales Order",
|
||||
@@ -1594,6 +1601,7 @@
|
||||
"show_name_in_global_search": 1,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"states": [],
|
||||
"timeline_field": "customer",
|
||||
"title_field": "customer_name",
|
||||
"track_changes": 1,
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
"quantity_and_rate",
|
||||
"qty",
|
||||
"stock_uom",
|
||||
"picked_qty",
|
||||
"col_break2",
|
||||
"uom",
|
||||
"conversion_factor",
|
||||
@@ -798,12 +799,17 @@
|
||||
"fieldtype": "Check",
|
||||
"label": "Grant Commission",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "picked_qty",
|
||||
"fieldtype": "Float",
|
||||
"label": "Picked Qty"
|
||||
}
|
||||
],
|
||||
"idx": 1,
|
||||
"istable": 1,
|
||||
"links": [],
|
||||
"modified": "2022-02-24 14:41:57.325799",
|
||||
"modified": "2022-03-15 20:17:33.984799",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Selling",
|
||||
"name": "Sales Order Item",
|
||||
|
||||
Reference in New Issue
Block a user