Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove linebreaks for translation strings (js)

Browse Source
This commit is contained in:
Pratik Vyas 2014-04-15 10:50:36 +05:30
parent 13c92e3ad5
commit e1eeb22f1e
6 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/selling/doctype/sales_bom/sales_bom.js
View File

@ -15,12 +15,11 @@ cur_frm.fields_dict.new_item_code.get_query = function() {
query: "selling.doctype.sales_bom.sales_bom.get_new_item_code"
}
}
cur_frm.fields_dict.new_item_code.query_description = __('Select Item where "Is Stock Item" is "No"')+
__('and "Is Sales Item" is "Yes" and there is no other Sales BOM');
cur_frm.fields_dict.new_item_code.query_description = __('Please select Item where "Is Stock Item" is "No" and "Is Sales Item" is "Yes" and there is no other Sales BOM');
cur_frm.cscript.item_code = function(doc, dt, dn) {
var d = locals[dt][dn];
if (d.item_code){
return get_server_fields('get_item_details', d.item_code, 'sales_bom_items', doc ,dt, dn, 1);
}
}
}

5
erpnext/selling/sales_common.js
View File

@ -570,10 +570,7 @@ var set_sales_bom_help = function(doc) {
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 \
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.")+
__("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>";
frappe.meta.get_docfield(doc.doctype, 'sales_bom_help', doc.name).options = help_msg;
}

5
erpnext/setup/doctype/backup_manager/backup_manager.js
View File

@ -7,8 +7,7 @@ $.extend(cur_frm.cscript, {
if(!(cint(cur_frm.doc.dropbox_access_allowed) ||
cint(cur_frm.doc.gdrive_access_allowed))) {
cur_frm.set_intro(__("You can start by selecting backup frequency and \
granting access for sync"));
cur_frm.set_intro(__("You can start by selecting backup frequency and granting access for sync"));
} else {
var services = {
"dropbox": __("Dropbox"),
@ -90,4 +89,4 @@ $.extend(cur_frm.cscript, {
// upload_backups_to_gdrive: function() {
// cur_frm.save();
// },
});
});

2
erpnext/setup/doctype/email_digest/email_digest.js
View File

@ -3,7 +3,7 @@
cur_frm.cscript.refresh = function(doc, dt, dn) {
doc = locals[dt][dn];
var save_msg = __("You must ")+ "<b>"+__("Save ")+"</b>"+__("the form before proceeding");
var save_msg = __("You must Save the form before proceeding");
var err_msg = __("There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.")
cur_frm.add_custom_button(__('View Now'), function() {

8
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
View File

@ -77,10 +77,8 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
this.title = __("Stock Reconcilation Template");
frappe.tools.downloadify([[__("Stock Reconciliation")],
["----"],
[__("Stock Reconciliation can be used to update the stock on a particular date, ")
+ __("usually as per physical inventory.")],
[__("When submitted, the system creates difference entries ")
+ __("to set the given stock and valuation on this date.")],
[__("Stock Reconciliation can be used to update the stock on a particular date, usually as per physical inventory.")],
[__("When submitted, the system creates difference entries to set the given stock and valuation on this date.")],
[__("It can also be used to create opening stock entries and to fix stock value.")],
["----"],
[__("Notes:")],
@ -158,4 +156,4 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
},
});
cur_frm.cscript = new erpnext.stock.StockReconciliation({frm: cur_frm});
cur_frm.cscript = new erpnext.stock.StockReconciliation({frm: cur_frm});

3
erpnext/stock/page/stock_level/stock_level.js
View File

@ -38,8 +38,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
+ Ordered Qty - Reserved Qty </li> \
<ul> \
<li>"+__("Actual Qty: Quantity available in the warehouse.") +"</li>"+
"<li>"+__("Planned Qty: Quantity, for which, Production Order has been raised,")+
__("but is pending to be manufactured.")+ "</li> " +
"<li>"+__("Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.")+ "</li> " +
"<li>"+__("Requested Qty: Quantity requested for purchase, but not ordered.") + "</li>" +
"<li>" + __("Ordered Qty: Quantity ordered for purchase, but not received.")+ "</li>" +
"<li>" + __("Reserved Qty: Quantity ordered for sale, but not delivered.") + "</li>" +