nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 02:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue

Browse Source
This commit is contained in:
Suraj Shetty
2020-11-09 19:16:23 +05:30
committed by GitHub
parent 5b02d32826 d038a80c43
commit e3fe8ff195
135 changed files with 8336 additions and 2235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/controllers/buying.js
View File

@@ -276,7 +276,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
var me = this;
this.frm.add_custom_button(__("Product Bundle"), function() {
erpnext.buying.get_items_from_product_bundle(me.frm);
}, __("Get items from"));
}, __("Get Items From"));
},
shipping_address: function(){

2
erpnext/public/js/utils.js
View File

@@ -539,7 +539,7 @@ erpnext.utils.update_child_items = function(opts) {
fieldtype: "Table",
label: "Items",
cannot_add_rows: cannot_add_row,
in_place_edit: true,
in_place_edit: false,
reqd: 1,
data: this.data,
get_data: () => {