From 3d65d9602ee6dc7cdbfa2efe5241d77ecfdc7ff2 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 28 Nov 2014 14:56:10 +0530 Subject: [PATCH] [error-reports] --- erpnext/accounts/doctype/sales_invoice/pos.js | 5 +++++ erpnext/hr/doctype/leave_application/leave_application.py | 6 +++--- erpnext/translations/es.csv | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/pos.js b/erpnext/accounts/doctype/sales_invoice/pos.js index 8c6e3cdb82..d9ef6d8562 100644 --- a/erpnext/accounts/doctype/sales_invoice/pos.js +++ b/erpnext/accounts/doctype/sales_invoice/pos.js @@ -233,6 +233,11 @@ erpnext.POS = Class.extend({ }, make_item_list: function() { var me = this; + if(!this.price_list) { + msgprint(__("Price List not found or disabled")); + return; + } + me.item_timeout = null; frappe.call({ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_items', diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 63eb7961c4..e6742bb71f 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -203,15 +203,15 @@ class LeaveApplication(Document): def get_holidays(leave_app): tot_hol = frappe.db.sql("""select count(*) from `tabHoliday` h1, `tabHoliday List` h2, `tabEmployee` e1 where e1.name = %s and h1.parent = h2.name and e1.holiday_list = h2.name - and h1.holiday_date between %s and %s""", (leave_app.employee, leave_app.from_date, leave_app.to_date)) + and h1.holiday_date between %s and %s""", (leave_app.employee, leave_app.from_date, + leave_app.to_date)) # below line is needed. If an employee hasn't been assigned with any holiday list then above will return 0 rows. - tot_hol=tot_hol and flt(tot_hol[0][0]) or 0 if not tot_hol: tot_hol = frappe.db.sql("""select count(*) from `tabHoliday` h1, `tabHoliday List` h2 where h1.parent = h2.name and h1.holiday_date between %s and %s and ifnull(h2.is_default,0) = 1 and h2.fiscal_year = %s""", (leave_app.from_date, leave_app.to_date, leave_app.fiscal_year)) - return tot_hol and flt(tot_hol[0][0]) or 0 + return tot_hol and tot_hol[0][0] or 0 @frappe.whitelist() def get_total_leave_days(leave_app): diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv index 0011fd1232..d6add66959 100644 --- a/erpnext/translations/es.csv +++ b/erpnext/translations/es.csv @@ -31,7 +31,7 @@ 1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent,"1 moneda = [?] Fracción Por ejemplo, 1 USD = 100 Cent" 1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . Para mantener el código del artículo sabia cliente y para efectuar búsquedas en ellos en función de su uso de código de esta opción "Add / Edit"," Añadir / Editar < / a>" -"Add / Edit"," Añadir / Editar < / a>" +"Add / Edit"," Añadir / Editar < / a>" "Add / Edit"," Añadir / Editar < / a>" "

Default Template

Uses Jinja Templating and all the fields of Address (including Custom Fields if any) will be available

{{ address_line1 }}<br>{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}{{ city }}<br>{% if state %}{{ state }}<br>{% endif -%}{% if pincode %} PIN:  {{ pincode }}<br>{% endif -%}{{ country }}<br>{% if phone %}Phone: {{ phone }}<br>{% endif -%}{% if fax %}Fax: {{ fax }}<br>{% endif -%}{% if email_id %}Email: {{ email_id }}<br>{% endif -%}
","

defecto plantilla

Usos Jinja plantillas y todos los campos de la Dirección ( incluyendo campos personalizados en su caso) estará disponible 

  {{}} address_line1 
  {% if address_line2%} {{}} address_line2 
 { endif% -%}  {{city}} 
  {% if estado%} {{Estado}} {% endif 
 -%}  {% if%} pincode PIN: {{pincode}} {% endif 
 -%}  {{país}} 
  {% if%} de teléfono Teléfono: {{phone}} {
 endif% -%}  {% if%} fax Fax: {{fax}} {% endif 
 -%}  {% if%} email_ID Email: {{}} email_ID 
 ; {% endif -%}   "
 A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe un Grupo de Clientes con el mismo nombre, por favor cambie el nombre del Cliente o cambie el nombre del Grupo de Clientes"
@@ -2745,7 +2745,7 @@ Statement of Account,Estado de cuenta
 Static Parameters,Parámetros estáticos
 Status,estado
 Status must be one of {0},Estado debe ser uno de {0}
-Status of {0} {1} is now {2},Situación de {0} {1} { 2 es ahora }
+Status of {0} {1} is now {2},Situación de {0} {1} {2} es ahora
 Status updated to {0},Estado actualizado a {0}
 Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
 Stay Updated,Manténgase actualizado