From ea7181e1b5a81af5df34367c439612f6df46f08a Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 25 Apr 2016 19:21:39 +0530 Subject: [PATCH 1/4] Fixed arabic translation --- erpnext/translations/ar.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv index 4409bd8edc..db951578ea 100644 --- a/erpnext/translations/ar.csv +++ b/erpnext/translations/ar.csv @@ -503,7 +503,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writin apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,شخص آخر مبيعات {0} موجود مع نفس الرقم الوظيفي apps/erpnext/erpnext/config/accounts.py +70,Masters,الماجستير apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,تواريخ عملية البنك التحديث -apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطأ الأسهم السلبية ( { } 6 ) القطعة ل {0} في {1} في معرض النماذج ثلاثية على {2} {3} {4} في {5} +apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطأ الأسهم السلبية ( {6} ) القطعة ل {0} في {1} في معرض النماذج ثلاثية على {2} {3} {4} في {5} apps/erpnext/erpnext/config/projects.py +30,Time Tracking,تتبع الوقت DocType: Fiscal Year Company,Fiscal Year Company,الشركة السنة المالية DocType: Packing Slip Item,DN Detail,DN التفاصيل From 9be40ee7c3e1b574164997571e66f5085c2e14ff Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 20 Apr 2016 18:09:15 +0530 Subject: [PATCH 2/4] [fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found --- erpnext/accounts/doctype/fiscal_year/fiscal_year.py | 5 +++++ erpnext/hr/doctype/process_payroll/process_payroll.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py index 9456924a87..8ff209a835 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py @@ -40,6 +40,11 @@ class FiscalYear(Document): def on_update(self): check_duplicate_fiscal_year(self) + + def on_trash(self): + global_defaults = frappe.get_doc("Global Defaults") + if global_defaults.current_fiscal_year == self.name: + frappe.throw(_("You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings").format(self.name)) @frappe.whitelist() def check_duplicate_fiscal_year(doc): diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py index a71200cb57..51e3740ed6 100644 --- a/erpnext/hr/doctype/process_payroll/process_payroll.py +++ b/erpnext/hr/doctype/process_payroll/process_payroll.py @@ -206,3 +206,5 @@ def get_month_details(year, month): 'month_end_date': med, 'month_days': month_days }) + else: + frappe.throw(_("Fiscal Year {0} not found").format(year)) \ No newline at end of file From 4c95ed49ed1156640ca40f9deaa80ce91d87bef8 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 25 Apr 2016 17:18:52 +0530 Subject: [PATCH 3/4] Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports --- .../report/trial_balance/trial_balance.py | 18 ++++++++++++++- .../trial_balance_for_party.py | 22 +++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index e53d47e353..a51e9b02eb 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -161,6 +161,8 @@ def accumulate_values_into_parents(accounts, accounts_by_name): def prepare_data(accounts, filters, total_row, parent_children_map): data = [] + company_currency = frappe.db.get_value("Company", filters.company, "default_currency") + for d in accounts: has_value = False row = { @@ -169,7 +171,8 @@ def prepare_data(accounts, filters, total_row, parent_children_map): "parent_account": d.parent_account, "indent": d.indent, "from_date": filters.from_date, - "to_date": filters.to_date + "to_date": filters.to_date, + "currency": company_currency } prepare_opening_and_closing(d) @@ -201,37 +204,50 @@ def get_columns(): "fieldname": "opening_debit", "label": _("Opening (Dr)"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "opening_credit", "label": _("Opening (Cr)"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "debit", "label": _("Debit"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "credit", "label": _("Credit"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "closing_debit", "label": _("Closing (Dr)"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "closing_credit", "label": _("Closing (Cr)"), "fieldtype": "Currency", + "options": "currency", "width": 120 + }, + { + "fieldname": "currency", + "label": _("Currency"), + "fieldtype": "Link", + "options": "Currency", + "hidden": 1 } ] diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py index ceabaab74e..58222ac0d5 100644 --- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py @@ -21,7 +21,7 @@ def execute(filters=None): def get_data(filters, show_party_name): party_name_field = "customer_name" if filters.get("party_type")=="Customer" else "supplier_name" parties = frappe.get_all(filters.get("party_type"), fields = ["name", party_name_field], order_by="name") - + company_currency = frappe.db.get_value("Company", filters.company, "default_currency") opening_balances = get_opening_balances(filters) balances_within_period = get_balances_within_period(filters) @@ -57,6 +57,10 @@ def get_data(filters, show_party_name): "closing_credit": closing_credit }) + row.update({ + "currency": company_currency + }) + has_value = False if (opening_debit or opening_credit or debit or credit or closing_debit or closing_credit): has_value =True @@ -69,7 +73,8 @@ def get_data(filters, show_party_name): data.append({ "party": "'" + _("Totals") + "'", "debit": total_debit, - "credit": total_credit + "credit": total_credit, + "currency": company_currency }) return data @@ -138,37 +143,50 @@ def get_columns(filters, show_party_name): "fieldname": "opening_debit", "label": _("Opening (Dr)"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "opening_credit", "label": _("Opening (Cr)"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "debit", "label": _("Debit"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "credit", "label": _("Credit"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "closing_debit", "label": _("Closing (Dr)"), "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "fieldname": "closing_credit", "label": _("Closing (Cr)"), "fieldtype": "Currency", + "options": "currency", "width": 120 + }, + { + "fieldname": "currency", + "label": _("Currency"), + "fieldtype": "Link", + "options": "Currency", + "hidden": 1 } ] From 08de396d46a9c2c7e33cf5a4b8d1c2ce05381342 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 27 Apr 2016 16:13:21 +0600 Subject: [PATCH 4/4] bumped to version 6.27.12 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 93ce6d86a9..56face85d4 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.27.11' +__version__ = '6.27.12' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index c02dd641df..1cb99c5c56 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.27.11" +app_version = "6.27.12" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index de74510327..1866b87309 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.27.11" +version = "6.27.12" requirements = parse_requirements("requirements.txt", session="") setup(