nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n

Browse Source
This commit is contained in:
Nabin Hait
2013-10-24 11:40:32 +05:30
parent 3eb901f47d 8833c52c02
commit ca8ad210d2
112 changed files with 677 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
selling/sales_common.js
View File

@@ -71,7 +71,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
this.frm.set_query("batch_no", this.fname, function(doc, cdt, cdn) {
var item = wn.model.get_doc(cdt, cdn);
if(!item.item_code) {
wn.throw("Please enter Item Code to get batch no");
wn.throw(wn._("Please enter Item Code to get batch no"));
} else {
filters = {
'item_code': item.item_code,
@@ -625,12 +625,12 @@ var set_sales_bom_help = function(doc) {
$(cur_frm.fields_dict.packing_list.row.wrapper).toggle(true);
if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
help_msg = "<div class='alert alert-warning'> \
For 'Sales BOM' items, warehouse, serial no and batch no \
help_msg = "<div class='alert alert-warning'>" +
wn._("For 'Sales BOM' items, warehouse, serial no and batch no \
will be considered from the 'Packing List' table. \
If warehouse and batch no are same for all packing items for any 'Sales BOM' item, \
those values can be entered in the main item table, values will be copied to 'Packing List' table. \
</div>";
those values can be entered in the main item table, values will be copied to 'Packing List' table.")+
"</div>";
wn.meta.get_docfield(doc.doctype, 'sales_bom_help', doc.name).options = help_msg;
}
} else {