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

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi 2015-08-14 12:21:37 +05:30
commit e7a3c7c5ab
7 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '5.6.1' __version__ = '5.6.2'

2
erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
View File

@ -18,7 +18,7 @@ def execute(filters=None):
data = [] data = []
for d in entries: for d in entries:
against_date = invoice_posting_date_map[d.reference_name] or "" against_date = invoice_posting_date_map.get(d.reference_name) or ""
if d.reference_type=="Purchase Invoice": if d.reference_type=="Purchase Invoice":
payment_amount = flt(d.debit) or -1 * flt(d.credit) payment_amount = flt(d.debit) or -1 * flt(d.credit)
else: else:

2
erpnext/hooks.py
View File

@ -27,7 +27,7 @@ blogs.
""" """
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "5.6.1" app_version = "5.6.2"
github_link = "https://github.com/frappe/erpnext" github_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

2
erpnext/patches.txt
View File

@ -190,5 +190,5 @@ erpnext.patches.v5_4.fix_invoice_outstanding
execute:frappe.db.sql("update `tabStock Ledger Entry` set stock_queue = '[]' where voucher_type = 'Stock Reconciliation' and ifnull(qty_after_transaction, 0) = 0") execute:frappe.db.sql("update `tabStock Ledger Entry` set stock_queue = '[]' where voucher_type = 'Stock Reconciliation' and ifnull(qty_after_transaction, 0) = 0")
erpnext.patches.v5_4.fix_missing_item_images erpnext.patches.v5_4.fix_missing_item_images
erpnext.patches.v5_4.stock_entry_additional_costs erpnext.patches.v5_4.stock_entry_additional_costs
erpnext.patches.v5_4.cleanup_journal_entry erpnext.patches.v5_4.cleanup_journal_entry #2015-08-14
execute:frappe.db.sql("update `tabProduction Order` pro set description = (select description from tabItem where name=pro.production_item) where ifnull(description, '') = ''") execute:frappe.db.sql("update `tabProduction Order` pro set description = (select description from tabItem where name=pro.production_item) where ifnull(description, '') = ''")

7
erpnext/patches/v5_4/cleanup_journal_entry.py
View File

@ -1,4 +1,5 @@
import frappe import frappe
from MySQLdb import OperationalError
def execute(): def execute():
frappe.reload_doctype("Journal Entry Account") frappe.reload_doctype("Journal Entry Account")
@ -10,6 +11,10 @@ def execute():
("Journal Entry", "against_jv"), ("Journal Entry", "against_jv"),
("Expense Claim", "against_expense_claim"), ("Expense Claim", "against_expense_claim"),
): ):
try:
frappe.db.sql("""update `tabJournal Entry Account` frappe.db.sql("""update `tabJournal Entry Account`
set reference_type=%s and reference_name={0} where ifnull({0}, '') != '' set reference_type=%s, reference_name={0} where ifnull({0}, '') != ''
""".format(fieldname), doctype) """.format(fieldname), doctype)
except OperationalError:
# column not found
pass

2
erpnext/translations/es.csv
View File

@ -3306,7 +3306,7 @@ apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Pleas
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sales Order {0} already exists against same Purchase Order number,Advertencia: Orden de Venta {0} ya existe contra el mismo número de Orden de Compra apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sales Order {0} already exists against same Purchase Order number,Advertencia: Orden de Venta {0} ya existe contra el mismo número de Orden de Compra
DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
DocType: Notification Control,Purchase,Compra DocType: Notification Control,Purchase,Compra
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},Situación de {0} {1} { 2 es ahora } apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},Situación de {0} {1} es ahora {2}
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Cantidad en Balance apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Cantidad en Balance
DocType: Item Group,Parent Item Group,Grupo Principal de Artículos DocType: Item Group,Parent Item Group,Grupo Principal de Artículos
apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1} apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}

1 DocType: Employee Salary Mode Modo de Salario
3306 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28 Expected Delivery Date cannot be before Purchase Order Date Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
3307 DocType: Appraisal Appraisal Template Plantilla de Evaluación
3308 DocType: Communication Email Correo Electronico
3309 DocType: Item Group Item Classification Clasificación de Artículos
3310 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89 Business Development Manager Gerente de Desarrollo de Negocios
3311 DocType: Maintenance Visit Purpose Maintenance Visit Purpose Propósito de la Visita de Mantenimiento
3312 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15 Period Período

2
setup.py
View File

@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = "5.6.1" version = "5.6.2"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()