Merge branch 'develop' into subcontracting
This commit is contained in:
commit
6589c5f5e9
@ -128,6 +128,7 @@ class ReceivablePayableReport(object):
|
||||
credit_note_in_account_currency=0.0,
|
||||
outstanding_in_account_currency=0.0,
|
||||
)
|
||||
self.get_invoices(ple)
|
||||
|
||||
if self.filters.get("group_by_party"):
|
||||
self.init_subtotal_row(ple.party)
|
||||
|
@ -455,7 +455,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
|
||||
company: me.frm.doc.company
|
||||
},
|
||||
allow_child_item_selection: true,
|
||||
child_fielname: "items",
|
||||
child_fieldname: "items",
|
||||
child_columns: ["item_code", "qty"]
|
||||
})
|
||||
}, __("Get Items From"));
|
||||
|
@ -717,7 +717,7 @@ erpnext.utils.map_current_doc = function(opts) {
|
||||
get_query: opts.get_query,
|
||||
add_filters_group: 1,
|
||||
allow_child_item_selection: opts.allow_child_item_selection,
|
||||
child_fieldname: opts.child_fielname,
|
||||
child_fieldname: opts.child_fieldname,
|
||||
child_columns: opts.child_columns,
|
||||
size: opts.size,
|
||||
action: function(selections, args) {
|
||||
|
@ -260,6 +260,16 @@ erpnext.stock.move_item = function (item, source, target, actual_qty, rate, call
|
||||
}
|
||||
|
||||
dialog.set_primary_action(__('Create Stock Entry'), function () {
|
||||
if (source && (dialog.get_value("qty") == 0 || dialog.get_value("qty") > actual_qty)) {
|
||||
frappe.msgprint(__("Quantity must be greater than zero, and less or equal to {0}", [actual_qty]));
|
||||
return;
|
||||
}
|
||||
|
||||
if (dialog.get_value("source") === dialog.get_value("target")) {
|
||||
frappe.msgprint(__("Source and target warehouse must be different"));
|
||||
return;
|
||||
}
|
||||
|
||||
frappe.model.with_doctype('Stock Entry', function () {
|
||||
let doc = frappe.model.get_new_doc('Stock Entry');
|
||||
doc.from_warehouse = dialog.get_value('source');
|
||||
|
Loading…
x
Reference in New Issue
Block a user