Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 8 commits into from Nov 29, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
294e651
[new] Calculate shipping tax based on weight
vishdha Nov 21, 2017
18f544e
[fix] Change field name weight to weight_per_unit in SI Item
vishdha Nov 22, 2017
2eb2e75
[new] Shipping Rule based tax for selling module
vishdha Nov 22, 2017
6bfb50c
[new] Shipping rule based on weight added to Buying module
vishdha Nov 22, 2017
789b4ad
[fix] Conflict in jsons
vishdha Nov 23, 2017
d7d98ad
[fix] Removed Redudant add_fetch
vishdha Nov 29, 2017
fc60f96
[fix] Codacy fixed
vishdha Nov 29, 2017
78f2051
[fix] Print hide added
vishdha Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7,784 changes: 3,907 additions & 3,877 deletions erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View file
Open in desktop

Large diffs are not rendered by default.

4,078 changes: 2,132 additions & 1,946 deletions erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View file
Open in desktop
Expand Up @@ -158,7 +158,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
})
}, __("Get items from"));
},

quotation_btn: function() {
var me = this;
this.$quotation_btn = this.frm.add_custom_button(__('Quotation'),
Expand Down