[Feature] Shipping Rule Calculation based on Net Weight (#11770)

* [new] Calculate shipping tax based on weight

* [fix] Change field name weight to weight_per_unit in SI Item

* [new] Shipping Rule based tax for selling module

* [new] Shipping rule based on weight added to Buying module

* [fix] Conflict in jsons

* [fix] Removed Redudant add_fetch

* [fix] Codacy fixed

* [fix] Print hide added
This commit is contained in:
Vishal Dhayagude
2017-11-29 16:09:59 +05:30
committed by Nabin Hait
parent 2d1cbd0b2e
commit d42242df22
24 changed files with 32124 additions and 30853 deletions

View File

@@ -1499,6 +1499,36 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "total_net_weight",
"fieldtype": "Float",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Total Net Weight",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -3611,7 +3641,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2017-11-15 01:03:14.856512",
"modified": "2017-11-29 14:13:32.770027",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",

View File

@@ -934,7 +934,7 @@
"columns": 0,
"depends_on": "is_stock_item",
"description": "",
"fieldname": "net_weight",
"fieldname": "weight_per_unit",
"fieldtype": "Float",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -943,7 +943,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Net Weight",
"label": "Weight Per Unit",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -3360,7 +3360,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 1,
"modified": "2017-11-13 15:49:13.213990",
"modified": "2017-11-20 12:18:07.259756",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",

File diff suppressed because it is too large Load Diff

View File

@@ -242,7 +242,9 @@ def get_basic_details(args, item):
"supplier": item.default_supplier,
"update_stock": args.get("update_stock") if args.get('doctype') in ['Sales Invoice', 'Purchase Invoice'] else 0,
"delivered_by_supplier": item.delivered_by_supplier if args.get("doctype") in ["Sales Order", "Sales Invoice"] else 0,
"is_fixed_asset": item.is_fixed_asset
"is_fixed_asset": item.is_fixed_asset,
"weight_per_unit":item.weight_per_unit,
"weight_uom":item.weight_uom,
})
# calculate conversion factor