schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into link-to-mr

Browse Source
This commit is contained in:
Marica
2020-12-04 16:30:40 +05:30
committed by GitHub
parent 6bbdc58d56 c1885046d3
commit afc517b8bf
409 changed files with 10122 additions and 3764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,8 +218,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
var is_negative_qty = false;
for(var i = 0; i<fieldnames.length; i++) {
if(item[fieldnames[i]] < 0){
frappe.msgprint(__("Row #{0}: {1} can not be negative for item {2}",
[item.idx,__(frappe.meta.get_label(cdt, fieldnames[i], cdn)), item.item_code]));
frappe.msgprint(__("Row #{0}: {1} can not be negative for item {2}", [item.idx,__(frappe.meta.get_label(cdt, fieldnames[i], cdn)), item.item_code]));
is_negative_qty = true;
break;
}
@@ -276,7 +275,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(){